[arch-commits] Commit in lib32-nss/trunk (PKGBUILD enable-libpkix.patch nss.pc.in)
Date: Friday, June 9, 2017 @ 17:53:56 Author: heftig Revision: 235670 3.31-3 Added: lib32-nss/trunk/enable-libpkix.patch Modified: lib32-nss/trunk/PKGBUILD lib32-nss/trunk/nss.pc.in --+ PKGBUILD | 66 +++-- enable-libpkix.patch | 12 nss.pc.in|2 - 3 files changed, 39 insertions(+), 41 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-06-09 17:52:51 UTC (rev 235669) +++ PKGBUILD2017-06-09 17:53:56 UTC (rev 235670) @@ -3,56 +3,43 @@ # Contributor: kfgz # Contributor: Ionut Biru -_pkgbasename=nss -pkgname=lib32-${_pkgbasename} -pkgver=3.30.2 -pkgrel=1 +pkgname=lib32-nss +pkgver=3.31 +pkgrel=3 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.12 -depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite' 'lib32-zlib' 'lib32-p11-kit' "${_pkgbasename}") -makedepends=('gcc-multilib' 'perl') -options=('!strip' '!makeflags' 'staticlibs') -source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz"; -nss.pc.in) -sha256sums=('0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24' -'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd') +license=(MPL GPL) +_nsprver=4.15 +depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss) +makedepends=(gcc-multilib perl gyp) +options=(!strip !makeflags staticlibs) +source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"; +nss.pc.in enable-libpkix.patch) +sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d' +'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf' +'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30') prepare() { + mkdir path + + ln -s /usr/bin/python2 path/python + cd nss-$pkgver - # Respect LDFLAGS - sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \ - -i nss/coreconf/rules.mk + patch -Np1 -i ../enable-libpkix.patch } build() { - cd nss-$pkgver/nss 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`" - export XCFLAGS="${CFLAGS}" - make -C coreconf - make -C lib/dbm - make + cd nss-$pkgver/nss + PATH="$srcdir/path:$PATH" ./build.sh --m32 --opt --system-sqlite --system-nspr --disable-tests } package() { cd nss-$pkgver - install -d "$pkgdir"/usr/lib32/pkgconfig - - NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}') - NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}') - NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}') - sed ../nss.pc.in \ -e "s,%libdir%,/usr/lib32,g" \ -e "s,%prefix%,/usr,g" \ @@ -59,14 +46,13 @@ -e "s,%exec_prefix%,/usr/bin,g" \ -e "s,%includedir%,/usr/include/nss,g" \ -e "s,%NSPR_VERSION%,${_nsprver},g" \ --e "s,%NSS_VERSION%,${pkgver},g" \ -> "$pkgdir/usr/lib32/pkgconfig/nss.pc" +-e "s,%NSS_VERSION%,${pkgver},g" | +install -Dm644 /dev/stdin "$pkgdir/usr/lib32/pkgconfig/nss.pc" ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc" - cd dist/*.OBJ/lib - install -t "$pkgdir/usr/lib32" *.so - install -t "$pkgdir/usr/lib32" -m644 libcrmf.a *.chk + cd dist/Release/lib + install -Dt "$pkgdir/usr/lib32" *.so + install -Dt "$pkgdir/usr/lib32" -m644 *.chk - rm "$pkgdir/usr/lib32/libnssckbi.so" - ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so" + ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so" } Added: enable-libpkix.patch === --- enable-libpkix.patch(rev 0) +++ enable-libpkix.patch2017-06-09 17:53:56 UTC (rev 235670) @@ -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.0 +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=() + Modified: nss.pc.in === --- nss.pc.in 2017-06-09 17:52:51 UTC (rev 235669) +++ nss.pc.in 2017-06-09 17:53:56 UTC (rev 235670) @@ -7,5 +7,5 @@ Description: Network Security Services Version: %NSS_VERSION% Requires: nspr >= %NSPR_VERSION% -Libs: -l
[arch-commits] Commit in lib32-nss/trunk (PKGBUILD enable-libpkix.patch nss.pc.in)
Date: Saturday, May 19, 2018 @ 15:15:34 Author: heftig Revision: 324665 3.37-1 Modified: lib32-nss/trunk/PKGBUILD Deleted: lib32-nss/trunk/enable-libpkix.patch lib32-nss/trunk/nss.pc.in --+ PKGBUILD | 24 +++- enable-libpkix.patch | 12 nss.pc.in| 11 --- 3 files changed, 11 insertions(+), 36 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-05-19 15:14:41 UTC (rev 324664) +++ PKGBUILD2018-05-19 15:15:34 UTC (rev 324665) @@ -4,21 +4,19 @@ # Contributor: Ionut Biru pkgname=lib32-nss -pkgver=3.36.1 +pkgver=3.37 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.15 +_nsprver=4.19 depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss) -makedepends=(gcc-multilib perl gyp) +makedepends=(perl python2 gyp) options=(!strip !makeflags staticlibs) source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"; -nss.pc.in enable-libpkix.patch no-plt.diff) -sha256sums=('6025441d528ff6a7f1a4b673b6ee7d3540731ada3f78d5acd5c3b3736b222bff' -'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf' -'0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30' +no-plt.diff) +sha256sums=('5821969e85d241833e96cb82bd4211ddea6d87003f2e25e0eab4aefa6268' 'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa') prepare() { @@ -27,8 +25,6 @@ ln -s /usr/bin/python2 path/python cd nss-$pkgver - - patch -Np1 -i ../enable-libpkix.patch patch -Np2 -i ../no-plt.diff } @@ -37,20 +33,21 @@ cd nss-$pkgver/nss PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \ ---m32 --opt --system-sqlite --system-nspr --disable-tests +--m32 --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests } package() { cd nss-$pkgver - sed ../nss.pc.in \ + sed nss/pkg/pkg-config/nss.pc.in \ -e "s,%libdir%,/usr/lib32,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,%NSS_VERSION%,${pkgver},g" | +-e "s,%NSPR_VERSION%,$_nsprver,g" \ +-e "s,%NSS_VERSION%,$pkgver,g" | install -Dm644 /dev/stdin "$pkgdir/usr/lib32/pkgconfig/nss.pc" + ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc" cd dist/Release/lib @@ -57,5 +54,6 @@ install -Dt "$pkgdir/usr/lib32" *.so install -Dt "$pkgdir/usr/lib32" -m644 *.chk + # Replace built-in trust with p11-kit connection ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so" } Deleted: enable-libpkix.patch === --- enable-libpkix.patch2018-05-19 15:14:41 UTC (rev 324664) +++ enable-libpkix.patch2018-05-19 15:15:34 UTC (rev 324665) @@ -1,12 +0,0 @@ -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.0 +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=() - Deleted: nss.pc.in === --- nss.pc.in 2018-05-19 15:14:41 UTC (rev 324664) +++ nss.pc.in 2018-05-19 15:15:34 UTC (rev 324665) @@ -1,11 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -Cflags: -I${includedir}