Date: Saturday, April 2, 2016 @ 16:08:19 Author: fyan Revision: 169236
archrelease: copy trunk to multilib-x86_64 Added: lib32-nss/repos/multilib-x86_64/PKGBUILD (from rev 169235, lib32-nss/trunk/PKGBUILD) lib32-nss/repos/multilib-x86_64/lib32-nss.install (from rev 169235, lib32-nss/trunk/lib32-nss.install) lib32-nss/repos/multilib-x86_64/nss.pc.in (from rev 169235, lib32-nss/trunk/nss.pc.in) Deleted: lib32-nss/repos/multilib-x86_64/PKGBUILD lib32-nss/repos/multilib-x86_64/lib32-nss.install lib32-nss/repos/multilib-x86_64/nss.pc.in -------------------+ PKGBUILD | 156 ++++++++++++++++++++++++++-------------------------- lib32-nss.install | 28 ++++----- nss.pc.in | 22 +++---- 3 files changed, 103 insertions(+), 103 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-04-02 14:08:03 UTC (rev 169235) +++ PKGBUILD 2016-04-02 14:08:19 UTC (rev 169236) @@ -1,78 +0,0 @@ -# $Id$ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor: kfgz <kfgz at interia pl> -# Contributor: Ionut Biru <ibiru at archlinux dot org> - -_pkgbasename=nss -pkgname=lib32-${_pkgbasename} -pkgver=3.22.1 -pkgrel=1 -pkgdesc="Mozilla Network Security Services (32-bit)" -arch=('x86_64') -url="http://www.mozilla.org/projects/security/pki/nss/" - -#download_url=ftp://ftp.mozilla.org/pub/security/nss/releases/ -#alternative download link -#ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz - -license=('MPL' 'GPL') -install=lib32-nss.install -_nsprver=4.10.10 -depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite>=3.6.17' "${_pkgbasename}" 'lib32-zlib' 'lib32-p11-kit') -makedepends=('gcc-multilib' 'perl') -options=('!strip' '!makeflags' staticlibs) -source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz - nss.pc.in) -sha256sums=('89e1fc7074e5c325962821289f4cd7d8207ae95af2308ba881215ed9ca68fa4f' - 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd') - -prepare() { - cd "${srcdir}"/${_pkgbasename}-${pkgver}/ - - # Respect LDFLAGS - sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \ - -i nss/coreconf/rules.mk -} - -build(){ - cd "${srcdir}"/${_pkgbasename}-${pkgver}/$_pkgbasename - - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=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 -} - -package() { - cd "${srcdir}"/${_pkgbasename}-${pkgver}/$_pkgbasename - 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 $srcdir/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" \ - > "$pkgdir/usr/lib32/pkgconfig/nss.pc" - ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc" - - - cd "${srcdir}"/${_pkgbasename}-${pkgver}/dist/*.OBJ/lib - install -t "$pkgdir/usr/lib32" *.so - install -t "$pkgdir/usr/lib32" -m644 libcrmf.a *.chk - - rm "$pkgdir/usr/lib32/libnssckbi.so" - ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so" -} Copied: lib32-nss/repos/multilib-x86_64/PKGBUILD (from rev 169235, lib32-nss/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-04-02 14:08:19 UTC (rev 169236) @@ -0,0 +1,78 @@ +# $Id$ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: kfgz <kfgz at interia pl> +# Contributor: Ionut Biru <ibiru at archlinux dot org> + +_pkgbasename=nss +pkgname=lib32-${_pkgbasename} +pkgver=3.23 +pkgrel=1 +pkgdesc="Mozilla Network Security Services (32-bit)" +arch=('x86_64') +url="http://www.mozilla.org/projects/security/pki/nss/" + +#download_url=ftp://ftp.mozilla.org/pub/security/nss/releases/ +#alternative download link +#ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz + +license=('MPL' 'GPL') +install=lib32-nss.install +_nsprver=4.12 +depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite>=3.6.17' "${_pkgbasename}" 'lib32-zlib' 'lib32-p11-kit') +makedepends=('gcc-multilib' 'perl') +options=('!strip' '!makeflags' staticlibs) +source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz + nss.pc.in) +sha256sums=('94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf' + 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd') + +prepare() { + cd "${srcdir}"/${_pkgbasename}-${pkgver}/ + + # Respect LDFLAGS + sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \ + -i nss/coreconf/rules.mk +} + +build(){ + cd "${srcdir}"/${_pkgbasename}-${pkgver}/$_pkgbasename + + export PKG_CONFIG_PATH=/usr/lib32/pkgconfig + export BUILD_OPT=1 + export NSS_USE_SYSTEM_SQLITE=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 +} + +package() { + cd "${srcdir}"/${_pkgbasename}-${pkgver}/$_pkgbasename + 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 $srcdir/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" \ + > "$pkgdir/usr/lib32/pkgconfig/nss.pc" + ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc" + + + cd "${srcdir}"/${_pkgbasename}-${pkgver}/dist/*.OBJ/lib + install -t "$pkgdir/usr/lib32" *.so + install -t "$pkgdir/usr/lib32" -m644 libcrmf.a *.chk + + rm "$pkgdir/usr/lib32/libnssckbi.so" + ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so" +} Deleted: lib32-nss.install =================================================================== --- lib32-nss.install 2016-04-02 14:08:03 UTC (rev 169235) +++ lib32-nss.install 2016-04-02 14:08:19 UTC (rev 169236) @@ -1,14 +0,0 @@ -post_upgrade() { - if (($(vercmp $2 3.18-3) < 0)); then - # This symlink was created by ldconfig because we linked to - # pkcs11/p11-kit-trust.so from libnssckbi.so; the chain was: - # p11-kit-trust.so -> libnssckbi.so -> pkcs11/p11-kit-trust.so - # Now we have: - # libnssckbi.so -> libnssckbi-p11-kit.so - # which no longer creates an incorrect p11-kit-trust.so symlink - if [[ $(readlink usr/lib32/p11-kit-trust.so) == libnssckbi.so ]]; then - rm usr/lib32/p11-kit-trust.so - fi - fi -} - Copied: lib32-nss/repos/multilib-x86_64/lib32-nss.install (from rev 169235, lib32-nss/trunk/lib32-nss.install) =================================================================== --- lib32-nss.install (rev 0) +++ lib32-nss.install 2016-04-02 14:08:19 UTC (rev 169236) @@ -0,0 +1,14 @@ +post_upgrade() { + if (($(vercmp $2 3.18-3) < 0)); then + # This symlink was created by ldconfig because we linked to + # pkcs11/p11-kit-trust.so from libnssckbi.so; the chain was: + # p11-kit-trust.so -> libnssckbi.so -> pkcs11/p11-kit-trust.so + # Now we have: + # libnssckbi.so -> libnssckbi-p11-kit.so + # which no longer creates an incorrect p11-kit-trust.so symlink + if [[ $(readlink usr/lib32/p11-kit-trust.so) == libnssckbi.so ]]; then + rm usr/lib32/p11-kit-trust.so + fi + fi +} + Deleted: nss.pc.in =================================================================== --- nss.pc.in 2016-04-02 14:08:03 UTC (rev 169235) +++ nss.pc.in 2016-04-02 14:08:19 UTC (rev 169236) @@ -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: -lssl3 -lsmime3 -lnss3 -lnssutil3 -Cflags: -I${includedir} Copied: lib32-nss/repos/multilib-x86_64/nss.pc.in (from rev 169235, lib32-nss/trunk/nss.pc.in) =================================================================== --- nss.pc.in (rev 0) +++ nss.pc.in 2016-04-02 14:08:19 UTC (rev 169236) @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir}