Sat Sep 17 23:14:43 UTC 2011

1 files changed, 27 insertions, 26 deletions

diff --git a/multilib/lib32-nss/PKGBUILD b/multilib/lib32-nss/PKGBUILD
index 1663f1c25..b747e1a31 100644
--- a/multilib/lib32-nss/PKGBUILD
+++ b/multilib/lib32-nss/PKGBUILD
@@ -1,42 +1,47 @@
-# $Id: PKGBUILD 35060 2010-12-15 09:33:55Z heftig $
+# $Id: PKGBUILD 55628 2011-09-16 13:40:10Z bluewind $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 _pkgbasename=nss
 pkgname=lib32-$_pkgbasename
-pkgver=3.12.8
+pkgver=3.12.11
 pkgrel=1
-pkgdesc="Mozilla's Netscape Security Services Library that implements PKI support (32-bit)"
+pkgdesc="Mozilla Network Security Services (32-bit)"
 arch=('x86_64')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.8.6
+_nsprver=4.8.9
 depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.6.17' "$_pkgbasename" 'lib32-zlib')
 makedepends=('gcc-multilib' 'perl')
+options=('!strip')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
         nss-no-rpath.patch
         nss.pc.in
+        distrust-diginotar.patch
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
-options=('!strip')
-md5sums=('40bf1bb0c7567827d3768d1fc6081100'
+md5sums=('ca0ca058380be200cf247ea2496b5352'
          'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
-         '7f39c19b1dfd62d7db7d8bf19f156fed'
+         'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf'
+         'ba2357c5b9881bfd7d54b037954ba0ff'
          'd83c7b61abb7e9f8f7bcd157183d1ade')
 
 build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  cd "${srcdir}/${_pkgbasename}-${pkgver}/mozilla"
+  # Distrust DigiNotar root CA - backported from CVS (https://bugzilla.mozilla.org/show_bug.cgi?id=682927)
+  patch -Np0 -i "${srcdir}/distrust-diginotar.patch"
   # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian
-  patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
+  patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
   # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch"
+  patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
   # Removes rpath
-  patch -Np0 -i "${srcdir}/nss-no-rpath.patch"
+  patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
+
+  # Respect LDFLAGS
+  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
+      -i security/coreconf/rules.mk
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
 
-  make -C mozilla/security/nss/lib/ckfw/builtins generate
-  
-  unset CFLAGS
-  unset CXXFLAGS
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
   export BUILD_OPT=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
@@ -44,28 +49,24 @@ build() {
   export NSS_USE_SYSTEM_SQLITE=1
   export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
   export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
+  export XCFLAGS="${CFLAGS}"
 
   make -j 1 -C mozilla/security/coreconf
   make -j 1 -C mozilla/security/dbm
   make -j 1 -C mozilla/security/nss
+}
 
-  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
+package() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
 
   sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib32,g" \
   				-e "s,%prefix%,/usr,g" \
 				-e "s,%exec_prefix%,/usr/bin,g" \
 				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${_nsprver},g" \
+				-e "s,%NSPR_VERSION%,${pkgver},g" \
 				-e "s,%NSS_VERSION%,${pkgver},g" > \
-			"${srcdir}/nss.pc"
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-  install -m644 "${srcdir}"/nss.pc "${pkgdir}/usr/lib32/pkgconfig/nss.pc"
+			"${pkgdir}/usr/lib32/pkgconfig/nss.pc"
   ln -sf nss.pc "${pkgdir}/usr/lib32/pkgconfig/mozilla-nss.pc"
   chmod 644 ${pkgdir}/usr/lib32/pkgconfig/*.pc