diff --git a/core/nss/PKGBUILD b/core/nss/PKGBUILD index 447908832..b061ec93e 100644 --- a/core/nss/PKGBUILD +++ b/core/nss/PKGBUILD @@ -7,7 +7,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/" @@ -66,8 +66,6 @@ build() { } package_nss() { - install=nss.install - cd nss-$pkgver install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig} @@ -113,7 +111,6 @@ package_nss() { 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" diff --git a/core/nss/ca-certificates-mozilla.install b/core/nss/ca-certificates-mozilla.install deleted file mode 100644 index 433c35a5e..000000000 --- a/core/nss/ca-certificates-mozilla.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/update-ca-trust -} - -post_upgrade() { - post_install -} - -pre_remove() { - post_install -} diff --git a/core/nss/nss.install b/core/nss/nss.install deleted file mode 100644 index 24f9ec611..000000000 --- a/core/nss/nss.install +++ /dev/null @@ -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 -}