[arch-commits] Commit in nss/repos (14 files)
Jan Steffens
heftig at archlinux.org
Sun Aug 24 15:11:41 UTC 2014
Date: Sunday, August 24, 2014 @ 17:11:41
Author: heftig
Revision: 220628
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nss/repos/testing-i686/
nss/repos/testing-i686/PKGBUILD
(from rev 220627, nss/trunk/PKGBUILD)
nss/repos/testing-i686/ca-certificates-mozilla.install
(from rev 220627, nss/trunk/ca-certificates-mozilla.install)
nss/repos/testing-i686/certdata2pem.py-loudness.patch
(from rev 220627, nss/trunk/certdata2pem.py-loudness.patch)
nss/repos/testing-i686/nss-config.in
(from rev 220627, nss/trunk/nss-config.in)
nss/repos/testing-i686/nss.pc.in
(from rev 220627, nss/trunk/nss.pc.in)
nss/repos/testing-i686/ssl-renegotiate-transitional.patch
(from rev 220627, nss/trunk/ssl-renegotiate-transitional.patch)
nss/repos/testing-x86_64/
nss/repos/testing-x86_64/PKGBUILD
(from rev 220627, nss/trunk/PKGBUILD)
nss/repos/testing-x86_64/ca-certificates-mozilla.install
(from rev 220627, nss/trunk/ca-certificates-mozilla.install)
nss/repos/testing-x86_64/certdata2pem.py-loudness.patch
(from rev 220627, nss/trunk/certdata2pem.py-loudness.patch)
nss/repos/testing-x86_64/nss-config.in
(from rev 220627, nss/trunk/nss-config.in)
nss/repos/testing-x86_64/nss.pc.in
(from rev 220627, nss/trunk/nss.pc.in)
nss/repos/testing-x86_64/ssl-renegotiate-transitional.patch
(from rev 220627, nss/trunk/ssl-renegotiate-transitional.patch)
---------------------------------------------------+
testing-i686/PKGBUILD | 122 ++++++++++++++++
testing-i686/ca-certificates-mozilla.install | 11 +
testing-i686/certdata2pem.py-loudness.patch | 13 +
testing-i686/nss-config.in | 145 ++++++++++++++++++++
testing-i686/nss.pc.in | 11 +
testing-i686/ssl-renegotiate-transitional.patch | 21 ++
testing-x86_64/PKGBUILD | 122 ++++++++++++++++
testing-x86_64/ca-certificates-mozilla.install | 11 +
testing-x86_64/certdata2pem.py-loudness.patch | 13 +
testing-x86_64/nss-config.in | 145 ++++++++++++++++++++
testing-x86_64/nss.pc.in | 11 +
testing-x86_64/ssl-renegotiate-transitional.patch | 21 ++
12 files changed, 646 insertions(+)
Copied: nss/repos/testing-i686/PKGBUILD (from rev 220627, nss/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-08-24 15:11:41 UTC (rev 220628)
@@ -0,0 +1,122 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nss
+pkgname=(nss ca-certificates-mozilla)
+pkgver=3.17
+pkgrel=1
+pkgdesc="Mozilla Network Security Services"
+arch=(i686 x86_64)
+url="http://www.mozilla.org/projects/security/pki/nss/"
+license=('MPL' 'GPL')
+_nsprver=4.10.6
+depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
+makedepends=('perl' 'python2')
+options=('!strip' '!makeflags' 'staticlibs')
+source=("ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz"
+ "certdata2pem.py::http://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?id=15470c64b5464d273556a290b1e7b50b32a2e5a0"
+ nss.pc.in
+ nss-config.in
+ ssl-renegotiate-transitional.patch
+ certdata2pem.py-loudness.patch)
+sha256sums=('3b1abcd8f89211dda2cc739bfa76552d080f7ea80482ef2727b006548a7f0c81'
+ '57bd6f309736825fc0edbf7d522726224764520595dfdddd0dba59158839e863'
+ 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
+ 'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
+ '12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97'
+ '90f8e72fbcca9ce907dcf6565bcd95ca23d2da5d87caee64c141ac54680f8703')
+
+prepare() {
+ mkdir certs
+ patch --follow-symlinks certdata2pem.py certdata2pem.py-loudness.patch
+
+ cd nss-$pkgver
+
+ # Adds transitional SSL renegotiate support - patch from Debian
+ patch -Np3 -i ../ssl-renegotiate-transitional.patch
+
+ # Respect LDFLAGS
+ sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
+ -i nss/coreconf/rules.mk
+
+ ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
+}
+
+
+build() {
+ cd certs
+ python2 ../certdata2pem.py
+ printf "mozilla/%s\n" *.crt > mozilla.conf
+ test -s mozilla.conf
+
+ cd ../nss-$pkgver/nss
+ 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}"
+
+ [ "$CARCH" = "x86_64" ] && export USE_64=1
+
+ make -C coreconf
+ make -C lib/dbm
+ make
+}
+
+package_nss() {
+ cd nss-$pkgver
+ install -d "$pkgdir"/usr/{bin,include/nss,lib/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/lib,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/lib/pkgconfig/nss.pc"
+ ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
+
+ sed ../nss-config.in \
+ -e "s, at libdir@,/usr/lib,g" \
+ -e "s, at prefix@,/usr/bin,g" \
+ -e "s, at exec_prefix@,/usr/bin,g" \
+ -e "s, at includedir@,/usr/include/nss,g" \
+ -e "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
+ -e "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
+ -e "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+ > "$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
+
+ 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
+
+ rm "$pkgdir/usr/lib/libnssckbi.so"
+ ln -s p11-kit-proxy.so "$pkgdir/usr/lib/libnssckbi.so"
+}
+
+package_ca-certificates-mozilla() {
+ pkgdesc="Mozilla's set of trusted CA certificates"
+ depends=(ca-certificates-utils)
+ install=ca-certificates-mozilla.install
+
+ cd certs
+
+ local _certdir="$pkgdir/usr/share/ca-certificates/mozilla"
+ install -d "$_certdir"
+ install -t "$_certdir" -m644 *.crt
+
+ install -Dm644 mozilla.conf "$pkgdir/etc/ca-certificates/conf.d/mozilla.conf"
+}
Copied: nss/repos/testing-i686/ca-certificates-mozilla.install (from rev 220627, nss/trunk/ca-certificates-mozilla.install)
===================================================================
--- testing-i686/ca-certificates-mozilla.install (rev 0)
+++ testing-i686/ca-certificates-mozilla.install 2014-08-24 15:11:41 UTC (rev 220628)
@@ -0,0 +1,11 @@
+post_install() {
+ usr/bin/update-ca-certificates --fresh &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ post_install
+}
Copied: nss/repos/testing-i686/certdata2pem.py-loudness.patch (from rev 220627, nss/trunk/certdata2pem.py-loudness.patch)
===================================================================
--- testing-i686/certdata2pem.py-loudness.patch (rev 0)
+++ testing-i686/certdata2pem.py-loudness.patch 2014-08-24 15:11:41 UTC (rev 220628)
@@ -0,0 +1,13 @@
+--- certdata2pem.py 2014-08-24 15:16:24.927192958 +0200
++++ certdata2pem.py.loudness 2014-08-24 15:17:30.193535402 +0200
+@@ -104,9 +104,7 @@
+ trust[obj['CKA_LABEL']] = True
+ elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_UNTRUSTED',
+ 'CKT_NSS_NOT_TRUSTED'):
+- print '!'*74
+- print "UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL']
+- print '!'*74
++ print "Certificate %s untrusted, ignoring." % obj['CKA_LABEL']
+ else:
+ print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \
+ (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'],
Copied: nss/repos/testing-i686/nss-config.in (from rev 220627, nss/trunk/nss-config.in)
===================================================================
--- testing-i686/nss-config.in (rev 0)
+++ testing-i686/nss-config.in 2014-08-24 15:11:41 UTC (rev 220628)
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+ cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--includedir[=DIR]]
+ [--libdir[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Dynamic Libraries:
+ nss
+ nssutil
+ ssl
+ smime
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+lib_nssutil=yes
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --includedir=*)
+ includedir=$optarg
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
+ --libdir=*)
+ libdir=$optarg
+ ;;
+ --libdir)
+ echo_libdir=yes
+ ;;
+ --version)
+ echo ${major_version}.${minor_version}.${patch_version}
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ ssl)
+ lib_ssl=yes
+ ;;
+ smime)
+ lib_smime=yes
+ ;;
+ nss)
+ lib_nss=yes
+ ;;
+ nssutil)
+ lib_nssutil=yes
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+ exec_prefix=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+ includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+ libdir=`pkg-config --variable=libdir nss`
+fi
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+ echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+ echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+ libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+ if test -n "$lib_ssl"; then
+ libdirs="$libdirs -lssl${major_version}"
+ fi
+ if test -n "$lib_smime"; then
+ libdirs="$libdirs -lsmime${major_version}"
+ fi
+ if test -n "$lib_nss"; then
+ libdirs="$libdirs -lnss${major_version}"
+ fi
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
+ echo $libdirs
+fi
+
Copied: nss/repos/testing-i686/nss.pc.in (from rev 220627, nss/trunk/nss.pc.in)
===================================================================
--- testing-i686/nss.pc.in (rev 0)
+++ testing-i686/nss.pc.in 2014-08-24 15:11:41 UTC (rev 220628)
@@ -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}
Copied: nss/repos/testing-i686/ssl-renegotiate-transitional.patch (from rev 220627, nss/trunk/ssl-renegotiate-transitional.patch)
===================================================================
--- testing-i686/ssl-renegotiate-transitional.patch (rev 0)
+++ testing-i686/ssl-renegotiate-transitional.patch 2014-08-24 15:11:41 UTC (rev 220628)
@@ -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 */
+ };
+
Copied: nss/repos/testing-x86_64/PKGBUILD (from rev 220627, nss/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-08-24 15:11:41 UTC (rev 220628)
@@ -0,0 +1,122 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nss
+pkgname=(nss ca-certificates-mozilla)
+pkgver=3.17
+pkgrel=1
+pkgdesc="Mozilla Network Security Services"
+arch=(i686 x86_64)
+url="http://www.mozilla.org/projects/security/pki/nss/"
+license=('MPL' 'GPL')
+_nsprver=4.10.6
+depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
+makedepends=('perl' 'python2')
+options=('!strip' '!makeflags' 'staticlibs')
+source=("ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz"
+ "certdata2pem.py::http://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?id=15470c64b5464d273556a290b1e7b50b32a2e5a0"
+ nss.pc.in
+ nss-config.in
+ ssl-renegotiate-transitional.patch
+ certdata2pem.py-loudness.patch)
+sha256sums=('3b1abcd8f89211dda2cc739bfa76552d080f7ea80482ef2727b006548a7f0c81'
+ '57bd6f309736825fc0edbf7d522726224764520595dfdddd0dba59158839e863'
+ 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
+ 'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9'
+ '12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97'
+ '90f8e72fbcca9ce907dcf6565bcd95ca23d2da5d87caee64c141ac54680f8703')
+
+prepare() {
+ mkdir certs
+ patch --follow-symlinks certdata2pem.py certdata2pem.py-loudness.patch
+
+ cd nss-$pkgver
+
+ # Adds transitional SSL renegotiate support - patch from Debian
+ patch -Np3 -i ../ssl-renegotiate-transitional.patch
+
+ # Respect LDFLAGS
+ sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
+ -i nss/coreconf/rules.mk
+
+ ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
+}
+
+
+build() {
+ cd certs
+ python2 ../certdata2pem.py
+ printf "mozilla/%s\n" *.crt > mozilla.conf
+ test -s mozilla.conf
+
+ cd ../nss-$pkgver/nss
+ 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}"
+
+ [ "$CARCH" = "x86_64" ] && export USE_64=1
+
+ make -C coreconf
+ make -C lib/dbm
+ make
+}
+
+package_nss() {
+ cd nss-$pkgver
+ install -d "$pkgdir"/usr/{bin,include/nss,lib/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/lib,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/lib/pkgconfig/nss.pc"
+ ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
+
+ sed ../nss-config.in \
+ -e "s, at libdir@,/usr/lib,g" \
+ -e "s, at prefix@,/usr/bin,g" \
+ -e "s, at exec_prefix@,/usr/bin,g" \
+ -e "s, at includedir@,/usr/include/nss,g" \
+ -e "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
+ -e "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
+ -e "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+ > "$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
+
+ 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
+
+ rm "$pkgdir/usr/lib/libnssckbi.so"
+ ln -s p11-kit-proxy.so "$pkgdir/usr/lib/libnssckbi.so"
+}
+
+package_ca-certificates-mozilla() {
+ pkgdesc="Mozilla's set of trusted CA certificates"
+ depends=(ca-certificates-utils)
+ install=ca-certificates-mozilla.install
+
+ cd certs
+
+ local _certdir="$pkgdir/usr/share/ca-certificates/mozilla"
+ install -d "$_certdir"
+ install -t "$_certdir" -m644 *.crt
+
+ install -Dm644 mozilla.conf "$pkgdir/etc/ca-certificates/conf.d/mozilla.conf"
+}
Copied: nss/repos/testing-x86_64/ca-certificates-mozilla.install (from rev 220627, nss/trunk/ca-certificates-mozilla.install)
===================================================================
--- testing-x86_64/ca-certificates-mozilla.install (rev 0)
+++ testing-x86_64/ca-certificates-mozilla.install 2014-08-24 15:11:41 UTC (rev 220628)
@@ -0,0 +1,11 @@
+post_install() {
+ usr/bin/update-ca-certificates --fresh &>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ post_install
+}
Copied: nss/repos/testing-x86_64/certdata2pem.py-loudness.patch (from rev 220627, nss/trunk/certdata2pem.py-loudness.patch)
===================================================================
--- testing-x86_64/certdata2pem.py-loudness.patch (rev 0)
+++ testing-x86_64/certdata2pem.py-loudness.patch 2014-08-24 15:11:41 UTC (rev 220628)
@@ -0,0 +1,13 @@
+--- certdata2pem.py 2014-08-24 15:16:24.927192958 +0200
++++ certdata2pem.py.loudness 2014-08-24 15:17:30.193535402 +0200
+@@ -104,9 +104,7 @@
+ trust[obj['CKA_LABEL']] = True
+ elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_UNTRUSTED',
+ 'CKT_NSS_NOT_TRUSTED'):
+- print '!'*74
+- print "UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL']
+- print '!'*74
++ print "Certificate %s untrusted, ignoring." % obj['CKA_LABEL']
+ else:
+ print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \
+ (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'],
Copied: nss/repos/testing-x86_64/nss-config.in (from rev 220627, nss/trunk/nss-config.in)
===================================================================
--- testing-x86_64/nss-config.in (rev 0)
+++ testing-x86_64/nss-config.in 2014-08-24 15:11:41 UTC (rev 220628)
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+ cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+ [--prefix[=DIR]]
+ [--exec-prefix[=DIR]]
+ [--includedir[=DIR]]
+ [--libdir[=DIR]]
+ [--version]
+ [--libs]
+ [--cflags]
+Dynamic Libraries:
+ nss
+ nssutil
+ ssl
+ smime
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+lib_nssutil=yes
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --includedir=*)
+ includedir=$optarg
+ ;;
+ --includedir)
+ echo_includedir=yes
+ ;;
+ --libdir=*)
+ libdir=$optarg
+ ;;
+ --libdir)
+ echo_libdir=yes
+ ;;
+ --version)
+ echo ${major_version}.${minor_version}.${patch_version}
+ ;;
+ --cflags)
+ echo_cflags=yes
+ ;;
+ --libs)
+ echo_libs=yes
+ ;;
+ ssl)
+ lib_ssl=yes
+ ;;
+ smime)
+ lib_smime=yes
+ ;;
+ nss)
+ lib_nss=yes
+ ;;
+ nssutil)
+ lib_nssutil=yes
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+ exec_prefix=`pkg-config --variable=exec_prefix nss`
+fi
+if test -z "$includedir"; then
+ includedir=`pkg-config --variable=includedir nss`
+fi
+if test -z "$libdir"; then
+ libdir=`pkg-config --variable=libdir nss`
+fi
+
+if test "$echo_prefix" = "yes"; then
+ echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+ echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+ echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+ echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+ echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+ libdirs="-Wl,-rpath-link,$libdir -L$libdir"
+ if test -n "$lib_ssl"; then
+ libdirs="$libdirs -lssl${major_version}"
+ fi
+ if test -n "$lib_smime"; then
+ libdirs="$libdirs -lsmime${major_version}"
+ fi
+ if test -n "$lib_nss"; then
+ libdirs="$libdirs -lnss${major_version}"
+ fi
+ if test -n "$lib_nssutil"; then
+ libdirs="$libdirs -lnssutil${major_version}"
+ fi
+ echo $libdirs
+fi
+
Copied: nss/repos/testing-x86_64/nss.pc.in (from rev 220627, nss/trunk/nss.pc.in)
===================================================================
--- testing-x86_64/nss.pc.in (rev 0)
+++ testing-x86_64/nss.pc.in 2014-08-24 15:11:41 UTC (rev 220628)
@@ -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}
Copied: nss/repos/testing-x86_64/ssl-renegotiate-transitional.patch (from rev 220627, nss/trunk/ssl-renegotiate-transitional.patch)
===================================================================
--- testing-x86_64/ssl-renegotiate-transitional.patch (rev 0)
+++ testing-x86_64/ssl-renegotiate-transitional.patch 2014-08-24 15:11:41 UTC (rev 220628)
@@ -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