Date: Wednesday, May 20, 2020 @ 01:34:19 Author: heftig Revision: 386975
3.52.1-1 Modified: nss/trunk/PKGBUILD ----------+ PKGBUILD | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-20 01:32:36 UTC (rev 386974) +++ PKGBUILD 2020-05-20 01:34:19 UTC (rev 386975) @@ -1,19 +1,19 @@ -# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> pkgbase=nss pkgname=(nss ca-certificates-mozilla) -pkgver=3.52 +pkgver=3.52.1 pkgrel=1 pkgdesc="Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" arch=(x86_64) license=(MPL GPL) -_nsprver=4.25 -depends=("nspr>=${_nsprver}" sqlite zlib sh 'p11-kit>=0.23.19') +depends=(nspr sqlite zlib sh '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" certdata2pem.py bundle.sh) -sha256sums=('0a0aeb0cdda65ddcb64f746223df58b150f6803f4bfa1a4e876bbe6f9c4c1561' +sha256sums=('bcc81ac33aeb4ecad182dc21e34d2c97bcc148fd7b9e76f85bebb892405a9278' 'd2a1579dae05fd16175fac27ef08b54731ecefdf414085c610179afcf62b096c' '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd') @@ -37,25 +37,29 @@ } package_nss() { - local vmajor vminor vpatch cd nss-$pkgver - { read vmajor; read vminor; read vpatch; } \ - < <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h) - + local libdir=/usr/lib nsprver="$(pkg-config --modversion nspr)" sed nss/pkg/pkg-config/nss.pc.in \ - -e "s,%libdir%,/usr/lib,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/lib/pkgconfig/nss.pc" + install -Dm644 /dev/stdin "$pkgdir$libdir/pkgconfig/nss.pc" - ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc" + ln -s nss.pc "$pkgdir$libdir/pkgconfig/mozilla-nss.pc" + install -Dt "$pkgdir$libdir" dist/Release/lib/*.so + install -Dt "$pkgdir$libdir" -m644 dist/Release/lib/*.chk + + local vmajor vminor vpatch + { read vmajor; read vminor; read vpatch; } \ + < <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h) + sed nss/pkg/pkg-config/nss-config.in \ - -e "s,@libdir@,/usr/lib,g" \ + -e "s,@libdir@,$libdir,g" \ -e "s,@prefix@,/usr/bin,g" \ -e "s,@exec_prefix@,/usr/bin,g" \ -e "s,@includedir@,/usr/include/nss,g" \ @@ -64,22 +68,17 @@ -e "s,@MOD_PATCH_VERSION@,$vpatch,g" | install -D /dev/stdin "$pkgdir/usr/bin/nss-config" - cd nss/doc/nroff - install -Dt "$pkgdir/usr/share/man/man1" -m644 *util.1 signtool.1 signver.1 ssltap.1 + install -Dt "$pkgdir/usr/bin" \ + dist/Release/bin/{*util,shlibsign,signtool,signver,ssltap} - cd ../../../dist - install -Dt "$pkgdir/usr/include/nss" -m644 public/nss/*.h + install -Dt "$pkgdir/usr/include/nss" -m644 dist/public/nss/*.h - cd Release/bin - install -Dt "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap + install -Dt "$pkgdir/usr/share/man/man1" -m644 \ + nss/doc/nroff/{*util,signtool,signver,ssltap}.1 - cd ../lib - install -Dt "$pkgdir/usr/lib" *.so - install -Dt "$pkgdir/usr/lib" -m644 *.chk - # Replace built-in trust with p11-kit connection - ln -s pkcs11/p11-kit-trust.so "$pkgdir/usr/lib/p11-kit-trust.so" - ln -sf p11-kit-trust.so "$pkgdir/usr/lib/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" } package_ca-certificates-mozilla() {