[arch-commits] Commit in nss/trunk (3 files)

[Jan Steffens]

    Date: Saturday, May 7, 2016 @ 03:33:14
  Author: heftig
Revision: 267084

3.23-4: Remove .install

Modified:
  nss/trunk/PKGBUILD
Deleted:
  nss/trunk/ca-certificates-mozilla.install
  nss/trunk/nss.install

---------------------------------+
 PKGBUILD                        |    5 +----
 ca-certificates-mozilla.install |   11 -----------
 nss.install                     |   13 -------------
 3 files changed, 1 insertion(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-07 01:15:16 UTC (rev 267083)
+++ PKGBUILD	2016-05-07 01:33:14 UTC (rev 267084)
@@ -4,7 +4,7 @@
 pkgbase=nss
 pkgname=(nss ca-certificates-mozilla)
 pkgver=3.23
-pkgrel=3
+pkgrel=4
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -63,8 +63,6 @@
 }
 
 package_nss() {
-  install=nss.install
-
   cd nss-$pkgver
   install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
 
@@ -110,7 +108,6 @@
 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"

Deleted: ca-certificates-mozilla.install
===================================================================
--- ca-certificates-mozilla.install	2016-05-07 01:15:16 UTC (rev 267083)
+++ ca-certificates-mozilla.install	2016-05-07 01:33:14 UTC (rev 267084)
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/update-ca-trust
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  post_install
-}

Deleted: nss.install
===================================================================
--- nss.install	2016-05-07 01:15:16 UTC (rev 267083)
+++ nss.install	2016-05-07 01:33:14 UTC (rev 267084)
@@ -1,13 +0,0 @@
-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
-}