From 9aa770beb80cd39568e6777056b57ec8fc2fc5b1 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 4 Jul 2016 20:13:38 +0000 Subject: [PATCH] core/nss to 3.25-1 --- core/nss/PKGBUILD | 41 ++++++++----- core/nss/nss-config.xml | 132 ++++++++++++++++++++++++++++++++++++++++ core/nss/nss.pc.in | 2 +- 3 files changed, 159 insertions(+), 16 deletions(-) create mode 100644 core/nss/nss-config.xml diff --git a/core/nss/PKGBUILD b/core/nss/PKGBUILD index 76b1655e0..5e7fe0027 100644 --- a/core/nss/PKGBUILD +++ b/core/nss/PKGBUILD @@ -6,28 +6,32 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) -pkgver=3.24 +pkgver=3.25 pkgrel=1 -pkgdesc="Mozilla Network Security Services" +pkgdesc="Network Security Services" +url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" arch=(i686 x86_64) -url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') _nsprver=4.12 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit') -makedepends=('perl' 'python2') +makedepends=('perl' 'python2' 'xmlto' 'docbook-xsl') options=('!strip' '!makeflags' 'staticlibs') source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz" - certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch) -sha256sums=('2f0841492f91cca473b73dec6cab9cf765a485e032d48d2e8ae7261e54c419ed' + certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml legacy-certs.patch) +sha256sums=('5d1ad475da19d0c033a716350dc5f8a747999d3eba5ac07ee0368c5bad6e2359' '2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc' '045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180' - 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd' + 'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf' 'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9' + '98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1' '5f793af9c8558324e4188163862e0e70a5b069a44ad9e7817e0767093739f2a0') prepare() { mkdir certs + echo -n "$(date +"%e %B %Y")" >date.xml + echo -n "$pkgver" >version.xml + cd nss-$pkgver # Still needed - Evolution (Camel) and Telepathy-Gabble (Wocky) use @@ -44,6 +48,8 @@ prepare() { build() { + xmlto man nss-config.xml + cd certs python2 ../certdata2pem.py @@ -53,21 +59,24 @@ build() { cd nss-$pkgver/nss 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}" - [ "$CARCH" = "x86_64" -o "$CARCH" = "aarch64" ] && export USE_64=1 + [[ $CARCH == x86_64 || $CARCH == aarch64 ]] && export USE_64=1 make -C coreconf make -C lib/dbm make + make clean_docs build_docs } package_nss() { cd nss-$pkgver - install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig} + + install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig,share/man/man1} 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}') @@ -94,15 +103,17 @@ package_nss() { > "$pkgdir/usr/bin/nss-config" chmod 755 "$pkgdir/usr/bin/nss-config" - cd dist/*.OBJ/bin - install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap + install -t "$pkgdir/usr/share/man/man1" -m644 nss/doc/nroff/*.1 ../nss-config.1 + + cd dist + install -t "$pkgdir/usr/include/nss" -m644 public/nss/*.h + + cd *.OBJ/bin + install -t "$pkgdir/usr/bin" *util derdump pp shlibsign signtool signver ssltap vfychain vfyserv cd ../lib install -t "$pkgdir/usr/lib" *.so - install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk - - cd ../../public/nss - install -t "$pkgdir/usr/include/nss" -m644 *.h + install -t "$pkgdir/usr/lib" -m644 *.chk libcrmf.a rm "$pkgdir/usr/lib/libnssckbi.so" ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so" diff --git a/core/nss/nss-config.xml b/core/nss/nss-config.xml new file mode 100644 index 000000000..f9518c9e7 --- /dev/null +++ b/core/nss/nss-config.xml @@ -0,0 +1,132 @@ + + + +]> + + + + + &date; + Network Security Services + nss + &version; + + + + nss-config + 1 + + + + nss-config + Return meta information about nss libraries + + + + + nss-config + + + + + + + + + + + + Description + + nss-config is a shell scrip + tool which can be used to obtain gcc options for building client pacakges of nspt. + + + + + Options + + + + + Returns the top level system directory under which the nss libraries are installed. + + + + + returns the top level system directory under which any nss binaries would be installed. + + + + count + returns the path to the directory were the nss libraries are installed. + + + + + returns the upstream version of nss in the form major_version-minor_version-patch_version. + + + + + returns the compiler linking flags. + + + + + returns the compiler include flags. + + + + + returns the path to the directory were the nss libraries are installed. + + + + + + + Examples + + The following example will query for both include path and linkage flags: + + + /usr/bin/nss-config --cflags --libs + + + + + + + + + Files + + /usr/bin/nss-config + + + + + See also + pkg-config(1) + + + + Authors + The nss liraries were written and maintained by developers with Netscape, Red Hat, Sun, Oracle, Mozilla, and Google. + + Authors: Elio Maldonado <emaldona@redhat.com>. + + + + + + LICENSE + Licensed under the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. + + + + + diff --git a/core/nss/nss.pc.in b/core/nss/nss.pc.in index d47b9e146..42cca9ff8 100644 --- a/core/nss/nss.pc.in +++ b/core/nss/nss.pc.in @@ -7,5 +7,5 @@ Name: NSS Description: Network Security Services Version: %NSS_VERSION% Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 Cflags: -I${includedir}