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

[Jan Steffens]

    Date: Wednesday, May 20, 2020 @ 01:34:18
  Author: heftig
Revision: 630364

3.52.1-1

Modified:
  lib32-nss/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-20 01:19:48 UTC (rev 630363)
+++ PKGBUILD	2020-05-20 01:34:18 UTC (rev 630364)
@@ -1,27 +1,23 @@
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: kfgz <kfgz at interia pl>
 # Contributor: Ionut Biru <ibiru at archlinux dot org>
 
 pkgname=lib32-nss
-pkgver=3.52
+pkgver=3.52.1
 pkgrel=1
 pkgdesc="Network Security Services (32-bit)"
 url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 arch=(x86_64)
 license=(MPL GPL)
-_nsprver=4.25
-depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib 'lib32-p11-kit>=0.23.19' nss)
-makedepends=(perl python2 gyp)
+depends=(lib32-nspr lib32-sqlite lib32-zlib 'lib32-p11-kit>=0.23.19')
+makedepends=(perl python gyp)
 source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
         no-plt.diff)
-sha256sums=('0a0aeb0cdda65ddcb64f746223df58b150f6803f4bfa1a4e876bbe6f9c4c1561'
+sha256sums=('bcc81ac33aeb4ecad182dc21e34d2c97bcc148fd7b9e76f85bebb892405a9278'
             'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
 
 prepare() {
-  mkdir path
-
-  ln -s /usr/bin/python2 path/python
-
   cd nss-$pkgver
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
@@ -29,32 +25,32 @@
 }
 
 build() {
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-
   cd nss-$pkgver/nss
-  PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
-    --m32 --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests
+  ./build.sh -v --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests --m32
 }
 
 package() {
+  depends+=(nss)
+
   cd nss-$pkgver
 
+  local libdir=/usr/lib32 nsprver="$(i686-pc-linux-gnu-pkg-config --modversion nspr)"
   sed nss/pkg/pkg-config/nss.pc.in \
-    -e "s,%libdir%,/usr/lib32,g" \
+    -e "s,%libdir%,$libdir,g" \
     -e "s,%prefix%,/usr,g" \
     -e "s,%exec_prefix%,/usr/bin,g" \
     -e "s,%includedir%,/usr/include/nss,g" \
-    -e "s,%NSPR_VERSION%,$_nsprver,g" \
+    -e "s,%NSPR_VERSION%,$nsprver,g" \
     -e "s,%NSS_VERSION%,$pkgver,g" |
-    install -Dm644 /dev/stdin "$pkgdir/usr/lib32/pkgconfig/nss.pc"
+    install -Dm644 /dev/stdin "$pkgdir$libdir/pkgconfig/nss.pc"
 
-  ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc"
+  ln -s nss.pc "$pkgdir$libdir/pkgconfig/mozilla-nss.pc"
 
-  cd dist/Release/lib
-  install -Dt "$pkgdir/usr/lib32" *.so
-  install -Dt "$pkgdir/usr/lib32" -m644 *.chk
+  install -Dt "$pkgdir$libdir" dist/Release/lib/*.so
+  install -Dt "$pkgdir$libdir" -m644 dist/Release/lib/*.chk
 
+
   # Replace built-in trust with p11-kit connection
-  ln -s pkcs11/p11-kit-trust.so "$pkgdir/usr/lib32/p11-kit-trust.so"
-  ln -sf p11-kit-trust.so "$pkgdir/usr/lib32/libnssckbi.so"
+  ln -s pkcs11/p11-kit-trust.so "$pkgdir$libdir/p11-kit-trust.so"
+  ln -sf p11-kit-trust.so "$pkgdir$libdir/libnssckbi.so"
 }