[arch-commits] Commit in lib32-nss/trunk (PKGBUILD lib32-nss.install)

[Daniel Wallace]

    Date: Sunday, April 5, 2015 @ 15:37:42
  Author: dwallace
Revision: 130714

upgpkg: lib32-nss 3.18-1

updpkg: lib32-nss 3.18

Added:
  lib32-nss/trunk/lib32-nss.install
Modified:
  lib32-nss/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    9 +++++----
 lib32-nss.install |   14 ++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-05 13:36:07 UTC (rev 130713)
+++ PKGBUILD	2015-04-05 13:37:42 UTC (rev 130714)
@@ -5,7 +5,7 @@
 
 _pkgbasename=nss
 pkgname=lib32-${_pkgbasename}
-pkgver=3.17.4
+pkgver=3.18
 pkgrel=1
 pkgdesc="Mozilla Network Security Services (32-bit)"
 arch=('x86_64')
@@ -16,7 +16,8 @@
 #ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
 
 license=('MPL' 'GPL')
-_nsprver=4.10.7
+install=lib32-nss.install
+_nsprver=4.10.8
 depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite>=3.6.17' "${_pkgbasename}" 'lib32-zlib' 'lib32-p11-kit')
 makedepends=('gcc-multilib' 'perl')
 options=('!strip' '!makeflags' staticlibs)
@@ -23,7 +24,7 @@
 source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
         nss.pc.in
         ssl-renegotiate-transitional.patch)
-sha256sums=('1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79'
+sha256sums=('618db0fb2af9f6fc165934d509036b65efc78ab0ae118c06c9488bb667f21d40'
             'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
             '12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97')
 
@@ -78,5 +79,5 @@
   install -t "$pkgdir/usr/lib32" -m644 libcrmf.a *.chk
 
   rm "$pkgdir/usr/lib32/libnssckbi.so"
-  ln -s pkcs11/p11-kit-trust.so "$pkgdir/usr/lib32/libnssckbi.so"
+  ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so"
 }

Added: lib32-nss.install
===================================================================
--- lib32-nss.install	                        (rev 0)
+++ lib32-nss.install	2015-04-05 13:37:42 UTC (rev 130714)
@@ -0,0 +1,14 @@
+post_upgrade() {
+  if (($(vercmp $2 3.18-3) < 0)); then
+    # This symlink was created by ldconfig because we linked to
+    # pkcs11/p11-kit-trust.so from libnssckbi.so; the chain was:
+    #   p11-kit-trust.so -> libnssckbi.so -> pkcs11/p11-kit-trust.so
+    # Now we have:
+    #   libnssckbi.so -> libnssckbi-p11-kit.so
+    # which no longer creates an incorrect p11-kit-trust.so symlink
+    if [[ $(readlink usr/lib32/p11-kit-trust.so) == libnssckbi.so ]]; then
+      rm usr/lib32/p11-kit-trust.so
+    fi
+  fi
+}
+