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

[Felix Yan]

    Date: Sunday, July 3, 2016 @ 13:31:23
  Author: felixonmars
Revision: 181833

upgpkg: lib32-nss 3.24-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-03 13:28:19 UTC (rev 181832)
+++ PKGBUILD	2016-07-03 13:31:23 UTC (rev 181833)
@@ -5,7 +5,7 @@
 
 _pkgbasename=nss
 pkgname=lib32-${_pkgbasename}
-pkgver=3.23
+pkgver=3.24
 pkgrel=1
 pkgdesc="Mozilla Network Security Services (32-bit)"
 arch=('x86_64')
@@ -16,7 +16,6 @@
 #ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
 
 license=('MPL' 'GPL')
-install=lib32-nss.install
 _nsprver=4.12
 depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite>=3.6.17' "${_pkgbasename}" 'lib32-zlib' 'lib32-p11-kit')
 makedepends=('gcc-multilib' 'perl')
@@ -23,7 +22,7 @@
 options=('!strip' '!makeflags' staticlibs)
 source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
         nss.pc.in)
-sha256sums=('94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf'
+sha256sums=('2f0841492f91cca473b73dec6cab9cf765a485e032d48d2e8ae7261e54c419ed'
             'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd')
 
 prepare() {
@@ -40,6 +39,7 @@
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
   export BUILD_OPT=1
   export NSS_USE_SYSTEM_SQLITE=1
+  export NSS_ALLOW_SSLKEYLOGFILE=1
   export NSS_ENABLE_ECC=1
   export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
   export NSPR_LIB_DIR="`nspr-config --libdir`"

Deleted: lib32-nss.install
===================================================================
--- lib32-nss.install	2016-07-03 13:28:19 UTC (rev 181832)
+++ lib32-nss.install	2016-07-03 13:31:23 UTC (rev 181833)
@@ -1,14 +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/lib32/p11-kit-trust.so) == libnssckbi.so ]]; then
-      rm usr/lib32/p11-kit-trust.so
-    fi
-  fi
-}
-