nss: upgrade

1 files changed, 49 insertions, 35 deletions

diff --git a/abs/extra/nss/PKGBUILD b/abs/extra/nss/PKGBUILD
index 8e7d434..998cd1c 100644
--- a/abs/extra/nss/PKGBUILD
+++ b/abs/extra/nss/PKGBUILD
@@ -1,43 +1,57 @@
-# $Id: PKGBUILD 22037 2008-12-21 11:44:41Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 91903 2010-09-28 12:13:33Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=nss
-pkgver=3.12.3
-_pkgver=3_12_3
-_nssver=3.12.3.0
-pkgrel=2
+pkgver=3.12.8
+pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.8
-depends=("nspr>=${_nsprver}" 'sqlite3>=3.6.7')
+_nsprver=4.8.6
+depends=("nspr>=${_nsprver}" 'sqlite3>=3.6.17' 'zlib')
+makedepends=('perl')
 replaces=('nss-nspr')
-source=(https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${_pkgver}_RTM/src/nss-${pkgver}.tar.bz2
-	nss-nolocalsql.patch
-	nss.pc.in
-	nss-config.in)
-md5sums=('ecb7079ba4ebcf29b7716775384f1f18'
-         '1837781eed35bfb6f826cfb3efcd6409'
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
+        nss-no-rpath.patch
+        nss.pc.in
+        nss-config.in
+        add_spi+cacert_ca_certs.patch
+        ssl-renegotiate-transitional.patch)
+options=('!strip')
+md5sums=('40bf1bb0c7567827d3768d1fc6081100'
+         'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
-         '46bee81908f1e5b26d6a7a2e14c64d9f')
+         '46bee81908f1e5b26d6a7a2e14c64d9f'
+         '7f39c19b1dfd62d7db7d8bf19f156fed'
+         'd83c7b61abb7e9f8f7bcd157183d1ade')
 
 build() {
-  cd ${srcdir}/nss-${pkgver}
-  patch -Np0 -i "${srcdir}/nss-nolocalsql.patch" || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian
+  patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
+  # Adds transitional SSL renegotiate support - patch from Debian
+  patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch"
+  # Removes rpath
+  patch -Np0 -i "${srcdir}/nss-no-rpath.patch"
+
+  cd mozilla/security/nss/lib/ckfw/builtins
+  make generate
+
+  cd "${srcdir}/${pkgname}-${pkgver}"
   unset CFLAGS
   unset CXXFLAGS
   export BUILD_OPT=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
   export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+  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.//'`
 
   [ "$CARCH" = "x86_64" ] && export USE_64=1
 
-  make -j 1 -C mozilla/security/coreconf || return 1
-  make -j 1 -C mozilla/security/dbm || return 1
-  make -j 1 -C mozilla/security/nss || return 1
+  make -j 1 -C mozilla/security/coreconf
+  make -j 1 -C mozilla/security/dbm
+  make -j 1 -C mozilla/security/nss
 
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m755 -d "${pkgdir}/usr/bin"
@@ -51,11 +65,11 @@ build() {
   				-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,%NSS_VERSION%,${_nssver},g" > \
-			"${pkgdir}/usr/lib/pkgconfig/nss.pc" || return 1
-  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" || return 1
-  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc || return 1
+				-e "s,%NSPR_VERSION%,${pkgver},g" \
+				-e "s,%NSS_VERSION%,${pkgver},g" > \
+			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
+  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
+  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
 
   sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \
   				    -e "s,@prefix@,/usr/bin,g" \
@@ -64,21 +78,21 @@ build() {
 				    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
 				    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
 				    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > "${pkgdir}/usr/bin/nss-config" || return 1
-  chmod 755 "${pkgdir}/usr/bin/nss-config" || return 1
+			    > "${pkgdir}/usr/bin/nss-config"
+  chmod 755 "${pkgdir}/usr/bin/nss-config"
 
   for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
               libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
   do
-    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" || return 1
-  done
-  for file in libcrmf.a libnssb.a libnssckfw.a; do
-    install -m644 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" || return 1
+    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/"
   done
 
-  for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" || return 1
+  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
+  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
+
+  for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
+    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
   done
 
-  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" || return 1
+  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
 }