nss: update to 3.33

1 files changed, 55 insertions, 65 deletions

diff --git a/abs/extra/nss/PKGBUILD b/abs/extra/nss/PKGBUILD
index 4bf9a60..4e84761 100644
--- a/abs/extra/nss/PKGBUILD
+++ b/abs/extra/nss/PKGBUILD
@@ -3,43 +3,48 @@
 
 pkgbase=nss
 pkgname=(nss ca-certificates-mozilla)
-pkgver=3.20
-pkgrel=1
-pkgdesc="Mozilla Network Security Services"
+pkgver=3.33
+pkgrel=2
+pkgdesc="Network Security Services"
+url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/security/pki/nss/"
-license=('MPL' 'GPL')
-_nsprver=4.10.8
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
-makedepends=('perl' 'python2')
-options=('!strip' '!makeflags' 'staticlibs')
-source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz"
-        certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch)
-sha256sums=('5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c'
-            '2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc'
-            '045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
-            'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
+license=(MPL GPL)
+_nsprver=4.15
+depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
+makedepends=(perl python2 xmlto docbook-xsl gyp)
+options=(!strip !makeflags staticlibs)
+source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
+        certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml enable-libpkix.patch no-plt.diff bug1400603.patch)
+sha256sums=('98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4'
+            '512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
+            '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
+            'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
             'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
-            '22330fcde2dac5fa4733f7d77bffbbd31d91cbaa338738afdc2a8ebfccb61184')
+            '98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1'
+            '0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30'
+            'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
+            'c2a477710a53738e91712a7a203b84d65a514af62d8efffaa977070843a7794a')
 
 prepare() {
-  mkdir certs
+  mkdir certs path
 
-  cd nss-$pkgver
+  ln -s /usr/bin/python2 path/python
+
+  echo -n "$(date +"%e %B %Y")" >date.xml
+  echo -n "$pkgver" >version.xml
+  xmlto man nss-config.xml
 
-  # FS#45479: Reenable two weak Verisign certificates used by login.live.com
-  # Otherwise, accessing this site via Epiphany (GnuTLS) or Skype (OpenSSL) fails
-  # Also see https://gist.github.com/grawity/15eabf67191e17080241
-  patch nss/lib/ckfw/builtins/certdata.txt ../legacy-certs.patch
+  cd nss-$pkgver
 
-  # Respect LDFLAGS
-  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
-      -i nss/coreconf/rules.mk
+  patch -Np1 -i ../enable-libpkix.patch
+  patch -Np2 -i ../no-plt.diff
 
   ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
   ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
-}
 
+  cd nss
+  patch -Np0 -i ../../bug1400603.patch
+}
 
 build() {
   cd certs
@@ -49,29 +54,15 @@ build() {
   sh bundle.sh
 
   cd nss-$pkgver/nss
-  export BUILD_OPT=1
-  export NSS_USE_SYSTEM_SQLITE=1
-  export NSS_ENABLE_ECC=1
-  export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
-  export NSPR_LIB_DIR="`nspr-config --libdir`"
-  export XCFLAGS="${CFLAGS}"
-
-  [ "$CARCH" = "x86_64" ] && export USE_64=1
-
-  make -C coreconf
-  make -C lib/dbm
-  make
+  PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
+    --opt --system-sqlite --system-nspr --disable-tests
 }
 
 package_nss() {
-  install=nss.install
-
   cd nss-$pkgver
-  install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
 
-  NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}')
-  NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}')
-  NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}')
+  { read _vmajor; read _vminor; read _vpatch; } \
+    < <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h)
 
   sed ../nss.pc.in \
     -e "s,%libdir%,/usr/lib,g" \
@@ -79,8 +70,8 @@ package_nss() {
     -e "s,%exec_prefix%,/usr/bin,g" \
     -e "s,%includedir%,/usr/include/nss,g" \
     -e "s,%NSPR_VERSION%,${_nsprver},g" \
-    -e "s,%NSS_VERSION%,${pkgver},g" \
-    > "$pkgdir/usr/lib/pkgconfig/nss.pc"
+    -e "s,%NSS_VERSION%,${pkgver},g" |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/pkgconfig/nss.pc"
   ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
 
   sed ../nss-config.in \
@@ -88,33 +79,32 @@ package_nss() {
     -e "s,@prefix@,/usr/bin,g" \
     -e "s,@exec_prefix@,/usr/bin,g" \
     -e "s,@includedir@,/usr/include/nss,g" \
-    -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"
-  chmod 755 "$pkgdir/usr/bin/nss-config"
+    -e "s,@MOD_MAJOR_VERSION@,${_vmajor},g" \
+    -e "s,@MOD_MINOR_VERSION@,${_vminor},g" \
+    -e "s,@MOD_PATCH_VERSION@,${_vpatch},g" |
+    install -D /dev/stdin "$pkgdir/usr/bin/nss-config"
+  install -Dt "$pkgdir/usr/share/man/man1" -m644 ../nss-config.1
 
-  cd dist/*.OBJ/bin
-  install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap
+  cd nss/doc/nroff
+  install -Dt "$pkgdir/usr/share/man/man1" -m644 *util.1 signtool.1 signver.1 ssltap.1
 
-  cd ../lib
-  install -t "$pkgdir/usr/lib" *.so
-  install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk
+  cd ../../../dist
+  install -Dt "$pkgdir/usr/include/nss" -m644 public/nss/*.h
 
-  cd ../../public/nss
-  install -t "$pkgdir/usr/include/nss" -m644 *.h
+  cd Release/bin
+  install -Dt "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap
+
+  cd ../lib
+  install -Dt "$pkgdir/usr/lib" *.so
+  install -Dt "$pkgdir/usr/lib" -m644 *.chk
 
-  rm "$pkgdir/usr/lib/libnssckbi.so"
-  ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
+  ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
 }
 
 package_ca-certificates-mozilla() {
   pkgdesc="Mozilla's set of trusted CA certificates"
   depends=(ca-certificates-utils)
-  install=ca-certificates-mozilla.install
 
-  local _certdir="$pkgdir/usr/share/ca-certificates/trust-source"
-  install -Dm644 ca-bundle.trust.crt "$_certdir/mozilla.trust.crt"
-  install -Dm644 ca-bundle.neutral-trust.crt "$_certdir/mozilla.neutral-trust.crt"
-  install -Dm644 ca-bundle.supplement.p11-kit "$_certdir/mozilla.supplement.p11-kit"
+  install -Dm644 ca-bundle.trust.p11-kit \
+    "$pkgdir/usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit"
 }