diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
commit | b63a03da360e5a18e9044e7058ae69898db5ffb0 (patch) | |
tree | 2901728a2c53e2eb590d577db1531ee2976a2cbf /extra/nss | |
parent | 73346505421c2d923e13e2020dd31ddd764b8fe4 (diff) | |
parent | 26ac5932cb02318206fa6a528ed4bd82ad6af87c (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/blender/PKGBUILD
community/cdfs/PKGBUILD
community/cdfs/cdfs.install
community/mc/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/open-vm-tools-modules/modprobe.conf
community/open-vm-tools-modules/open-vm-tools-modules.install
community/open-vm-tools/PKGBUILD
community/open-vm-tools/open-vm-tools.conf.d
community/open-vm-tools/open-vm-tools.rc.d
community/open-vm-tools/scripts-network-FS19541.patch
community/pekwm/PKGBUILD
community/r8168-lts/PKGBUILD
community/simutrans/PKGBUILD
community/spectrwm/PKGBUILD
community/supertuxkart/PKGBUILD
community/tp_smapi/PKGBUILD
community/tp_smapi/tp_smapi.install
community/vhba-module/PKGBUILD
community/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/fcgi/PKGBUILD
extra/gst-plugins-bad/PKGBUILD
extra/imap/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/lirc/PKGBUILD
extra/lirc/lirc.install
extra/llvm/PKGBUILD
extra/nvidia-304xx-utils/PKGBUILD
extra/ruby/PKGBUILD
extra/xscreensaver/PKGBUILD
Diffstat (limited to 'extra/nss')
-rw-r--r-- | extra/nss/PKGBUILD | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 36e2cd9de..66bae51fb 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 169789 2012-10-29 10:49:49Z jgc $ +# $Id: PKGBUILD 173933 2012-12-28 08:37:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.14 +pkgver=3.14.1 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.3 +_nsprver=4.9.4 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') @@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s nss-config.in ssl-renegotiate-transitional.patch add_spi+cacert_ca_certs.patch) -sha1sums=('ace3642fb2ca67854ea7075d053ca01a6d81e616' +sha1sums=('764773e869aaee314e6f3ca675e04c55075d88a8' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' @@ -36,9 +36,14 @@ build() { sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ -i security/coreconf/rules.mk + + # see https://bugzilla.mozilla.org/show_bug.cgi?id=683266 - this step can be dropped now + # CaCert Wiki page should be updated to reflect these changes how to add the certificates + # for now the first patch should still do it + # Generate certdata.c from certdata.txt - cd security/nss/lib/ckfw/builtins - make generate + # cd security/nss/lib/ckfw/builtins + # make generate cd "${srcdir}/${pkgname}-${pkgver}" export BUILD_OPT=1 |