[arch-commits] Commit in lib32-nss/repos/multilib-x86_64 (6 files)
Daniel Wallace
dwallace at archlinux.org
Fri Mar 20 01:50:47 UTC 2015
Date: Friday, March 20, 2015 @ 02:50:47
Author: dwallace
Revision: 129604
archrelease: copy trunk to multilib-x86_64
Added:
lib32-nss/repos/multilib-x86_64/PKGBUILD
(from rev 129603, lib32-nss/trunk/PKGBUILD)
lib32-nss/repos/multilib-x86_64/nss.pc.in
(from rev 129603, lib32-nss/trunk/nss.pc.in)
lib32-nss/repos/multilib-x86_64/ssl-renegotiate-transitional.patch
(from rev 129603, lib32-nss/trunk/ssl-renegotiate-transitional.patch)
Deleted:
lib32-nss/repos/multilib-x86_64/PKGBUILD
lib32-nss/repos/multilib-x86_64/nss.pc.in
lib32-nss/repos/multilib-x86_64/ssl-renegotiate-transitional.patch
------------------------------------+
PKGBUILD | 163 +++++++++++++++++------------------
nss.pc.in | 22 ++--
ssl-renegotiate-transitional.patch | 42 ++++-----
3 files changed, 114 insertions(+), 113 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-03-20 01:50:25 UTC (rev 129603)
+++ PKGBUILD 2015-03-20 01:50:47 UTC (rev 129604)
@@ -1,81 +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.17.3
-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')
-_nsprver=4.10.7
-depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite>=3.6.17' "${_pkgbasename}" 'lib32-zlib' 'lib32-p11-kit')
-makedepends=('gcc-multilib' 'perl')
-options=('!strip' '!makeflags' staticlibs)
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
- nss.pc.in
- ssl-renegotiate-transitional.patch)
-sha256sums=('f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5'
- 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
- '12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97')
-
-prepare() {
- cd "${srcdir}"/${_pkgbasename}-${pkgver}/
-
- # Adds transitional SSL renegotiate support - patch from Debian
- patch -Np3 -i "${srcdir}/ssl-renegotiate-transitional.patch"
-
- # 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"
-}
Copied: lib32-nss/repos/multilib-x86_64/PKGBUILD (from rev 129603, lib32-nss/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-03-20 01:50:47 UTC (rev 129604)
@@ -0,0 +1,82 @@
+# $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.17.4
+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')
+_nsprver=4.10.7
+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
+ ssl-renegotiate-transitional.patch)
+sha256sums=('1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79'
+ 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
+ '12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97')
+
+prepare() {
+ cd "${srcdir}"/${_pkgbasename}-${pkgver}/
+
+ # Adds transitional SSL renegotiate support - patch from Debian
+ patch -Np3 -i "${srcdir}/ssl-renegotiate-transitional.patch"
+
+ # 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 pkcs11/p11-kit-trust.so "$pkgdir/usr/lib32/libnssckbi.so"
+}
Deleted: nss.pc.in
===================================================================
--- nss.pc.in 2015-03-20 01:50:25 UTC (rev 129603)
+++ nss.pc.in 2015-03-20 01:50:47 UTC (rev 129604)
@@ -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 129603, lib32-nss/trunk/nss.pc.in)
===================================================================
--- nss.pc.in (rev 0)
+++ nss.pc.in 2015-03-20 01:50:47 UTC (rev 129604)
@@ -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}
Deleted: ssl-renegotiate-transitional.patch
===================================================================
--- ssl-renegotiate-transitional.patch 2015-03-20 01:50:25 UTC (rev 129603)
+++ ssl-renegotiate-transitional.patch 2015-03-20 01:50:47 UTC (rev 129604)
@@ -1,21 +0,0 @@
-Enable transitional scheme for ssl renegotiation:
-
-(from mozilla/security/nss/lib/ssl/ssl.h)
-Disallow unsafe renegotiation in server sockets only, but allow clients
-to continue to renegotiate with vulnerable servers.
-This value should only be used during the transition period when few
-servers have been upgraded.
-
-diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c
-index f1d1921..c074360 100644
---- a/mozilla/security/nss/lib/ssl/sslsock.c
-+++ b/mozilla/security/nss/lib/ssl/sslsock.c
-@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
- PR_FALSE, /* noLocks */
- PR_FALSE, /* enableSessionTickets */
- PR_FALSE, /* enableDeflate */
-- 2, /* enableRenegotiation (default: requires extension) */
-+ 3, /* enableRenegotiation (default: transitional) */
- PR_FALSE, /* requireSafeNegotiation */
- };
-
Copied: lib32-nss/repos/multilib-x86_64/ssl-renegotiate-transitional.patch (from rev 129603, lib32-nss/trunk/ssl-renegotiate-transitional.patch)
===================================================================
--- ssl-renegotiate-transitional.patch (rev 0)
+++ ssl-renegotiate-transitional.patch 2015-03-20 01:50:47 UTC (rev 129604)
@@ -0,0 +1,21 @@
+Enable transitional scheme for ssl renegotiation:
+
+(from mozilla/security/nss/lib/ssl/ssl.h)
+Disallow unsafe renegotiation in server sockets only, but allow clients
+to continue to renegotiate with vulnerable servers.
+This value should only be used during the transition period when few
+servers have been upgraded.
+
+diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c
+index f1d1921..c074360 100644
+--- a/mozilla/security/nss/lib/ssl/sslsock.c
++++ b/mozilla/security/nss/lib/ssl/sslsock.c
+@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
+ PR_FALSE, /* noLocks */
+ PR_FALSE, /* enableSessionTickets */
+ PR_FALSE, /* enableDeflate */
+- 2, /* enableRenegotiation (default: requires extension) */
++ 3, /* enableRenegotiation (default: transitional) */
+ PR_FALSE, /* requireSafeNegotiation */
+ };
+
More information about the arch-commits
mailing list