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

[Evangelos Foutras]

    Date: Monday, March 30, 2015 @ 16:52:03
  Author: foutrelis
Revision: 235277

upgpkg: nss 3.18-3

Use libnssckbi-p11-kit.so as a libnssckbi.so replacement.

(libnssckbi-p11-kit.so was added in p11-kit 0.23.1-2.)

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

-------------+
 PKGBUILD    |    6 ++++--
 nss.install |   13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-30 14:39:22 UTC (rev 235276)
+++ PKGBUILD	2015-03-30 14:52:03 UTC (rev 235277)
@@ -4,7 +4,7 @@
 pkgbase=nss
 pkgname=(nss ca-certificates-mozilla)
 pkgver=3.18
-pkgrel=2
+pkgrel=3
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -75,6 +75,8 @@
 }
 
 package_nss() {
+  install=nss.install
+
   cd nss-$pkgver
   install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
 
@@ -114,7 +116,7 @@
   install -t "$pkgdir/usr/include/nss" -m644 *.h
 
   rm "$pkgdir/usr/lib/libnssckbi.so"
-  ln -s pkcs11/p11-kit-trust.so "$pkgdir/usr/lib/libnssckbi.so"
+  ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
 }
 
 package_ca-certificates-mozilla() {

Added: nss.install
===================================================================
--- nss.install	                        (rev 0)
+++ nss.install	2015-03-30 14:52:03 UTC (rev 235277)
@@ -0,0 +1,13 @@
+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/lib/p11-kit-trust.so) == libnssckbi.so ]]; then
+      rm usr/lib/p11-kit-trust.so
+    fi
+  fi
+}