Date: Friday, June 9, 2017 @ 17:28:53 Author: heftig Revision: 298497
3.31-3: FS#54387 Fix Chromium Added: nss/trunk/enable-libpkix.patch Modified: nss/trunk/PKGBUILD ----------------------+ PKGBUILD | 19 ++++++++++++------- enable-libpkix.patch | 12 ++++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-09 17:21:04 UTC (rev 298496) +++ PKGBUILD 2017-06-09 17:28:53 UTC (rev 298497) @@ -4,7 +4,7 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) pkgver=3.31 -pkgrel=2 +pkgrel=3 pkgdesc="Network Security Services" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; arch=(i686 x86_64) @@ -14,13 +14,14 @@ makedepends=(perl python2 xmlto docbook-xsl gyp) options=(!strip !makeflags staticlibs) source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz"; - certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml) + certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml enable-libpkix.patch) sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d' '512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a' '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd' 'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf' 'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9' - '98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1') + '98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1' + '0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30') prepare() { mkdir certs path @@ -33,6 +34,8 @@ cd nss-$pkgver + patch -Np1 -i ../enable-libpkix.patch + ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/ ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/ } @@ -46,7 +49,7 @@ sh bundle.sh cd nss-$pkgver/nss - PATH="$srcdir/path:$PATH" ./build.sh --opt --system-sqlite --system-nspr -v + PATH="$srcdir/path:$PATH" ./build.sh --opt --system-sqlite --system-nspr --disable-tests } package_nss() { @@ -74,14 +77,16 @@ -e "s,@MOD_MINOR_VERSION@,${_vminor},g" \ -e "s,@MOD_PATCH_VERSION@,${_vpatch},g" | install -D /dev/stdin "$pkgdir/usr/bin/nss-config" + install -Dt "$pkgdir/usr/share/man/man1" -m644 ../nss-config.1 - install -Dt "$pkgdir/usr/share/man/man1" -m644 nss/doc/nroff/*.1 ../nss-config.1 + cd nss/doc/nroff + install -Dt "$pkgdir/usr/share/man/man1" -m644 *util.1 signtool.1 signver.1 ssltap.1 - cd dist + cd ../../../dist install -Dt "$pkgdir/usr/include/nss" -m644 public/nss/*.h cd Release/bin - install -Dt "$pkgdir/usr/bin" *util derdump pp shlibsign signtool signver ssltap vfychain vfyserv + install -Dt "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap cd ../lib install -Dt "$pkgdir/usr/lib" *.so Added: enable-libpkix.patch =================================================================== --- enable-libpkix.patch (rev 0) +++ enable-libpkix.patch 2017-06-09 17:28:53 UTC (rev 298497) @@ -0,0 +1,12 @@ +diff -u -r nss-3.31/nss/build.sh nss-3.31-libpkix/nss/build.sh +--- nss-3.31/nss/build.sh 2017-06-08 12:53:01.000000000 +0200 ++++ nss-3.31-libpkix/nss/build.sh 2017-06-09 19:11:21.746133040 +0200 +@@ -52,7 +52,7 @@ + no_local_nspr=0 + armhf=0 + +-gyp_params=(--depth="$cwd" --generator-output=".") ++gyp_params=(--depth="$cwd" --generator-output="." -Ddisable_libpkix=0) + nspr_params=() + ninja_params=() +
