[arch-commits] Commit in nss/repos (16 files)
Jan de Groot
jgc at nymeria.archlinux.org
Fri May 9 18:25:12 UTC 2014
Date: Friday, May 9, 2014 @ 20:25:11
Author: jgc
Revision: 212172
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
nss/repos/extra-i686/PKGBUILD
(from rev 212171, nss/trunk/PKGBUILD)
nss/repos/extra-i686/nss-config.in
(from rev 212171, nss/trunk/nss-config.in)
nss/repos/extra-i686/nss.pc.in
(from rev 212171, nss/trunk/nss.pc.in)
nss/repos/extra-i686/ssl-renegotiate-transitional.patch
(from rev 212171, nss/trunk/ssl-renegotiate-transitional.patch)
nss/repos/extra-x86_64/PKGBUILD
(from rev 212171, nss/trunk/PKGBUILD)
nss/repos/extra-x86_64/nss-config.in
(from rev 212171, nss/trunk/nss-config.in)
nss/repos/extra-x86_64/nss.pc.in
(from rev 212171, nss/trunk/nss.pc.in)
nss/repos/extra-x86_64/ssl-renegotiate-transitional.patch
(from rev 212171, nss/trunk/ssl-renegotiate-transitional.patch)
Deleted:
nss/repos/extra-i686/PKGBUILD
nss/repos/extra-i686/nss-config.in
nss/repos/extra-i686/nss.pc.in
nss/repos/extra-i686/ssl-renegotiate-transitional.patch
nss/repos/extra-x86_64/PKGBUILD
nss/repos/extra-x86_64/nss-config.in
nss/repos/extra-x86_64/nss.pc.in
nss/repos/extra-x86_64/ssl-renegotiate-transitional.patch
-------------------------------------------------+
/PKGBUILD | 182 +++++++++++++
/nss-config.in | 290 ++++++++++++++++++++++
/nss.pc.in | 22 +
/ssl-renegotiate-transitional.patch | 42 +++
extra-i686/PKGBUILD | 91 ------
extra-i686/nss-config.in | 145 -----------
extra-i686/nss.pc.in | 11
extra-i686/ssl-renegotiate-transitional.patch | 21 -
extra-x86_64/PKGBUILD | 91 ------
extra-x86_64/nss-config.in | 145 -----------
extra-x86_64/nss.pc.in | 11
extra-x86_64/ssl-renegotiate-transitional.patch | 21 -
12 files changed, 536 insertions(+), 536 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-05-09 18:25:02 UTC (rev 212171)
+++ extra-i686/PKGBUILD 2014-05-09 18:25:11 UTC (rev 212172)
@@ -1,91 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=nss
-pkgver=3.16
-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.4
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
-makedepends=('perl')
-options=('!strip' '!makeflags' 'staticlibs')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
- nss.pc.in
- nss-config.in
- ssl-renegotiate-transitional.patch)
-sha1sums=('981dc6ef2f1e69ec7e2b277ce27c7005e9837f95'
- 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
- 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
- '8a964a744ba098711b80c0d279a2993524e8eb92')
-
-prepare() {
- cd $pkgname-$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
-}
-
-
-build() {
- cd $pkgname-$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() {
- cd $pkgname-$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
-}
Copied: nss/repos/extra-i686/PKGBUILD (from rev 212171, nss/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-05-09 18:25:11 UTC (rev 212172)
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=nss
+pkgver=3.16.1
+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.5
+depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
+makedepends=('perl')
+options=('!strip' '!makeflags' 'staticlibs')
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
+ nss.pc.in
+ nss-config.in
+ ssl-renegotiate-transitional.patch)
+sha1sums=('450a88dde8c7e4533507ac8340dbf94be28a759b'
+ 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
+ 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
+ '8a964a744ba098711b80c0d279a2993524e8eb92')
+
+prepare() {
+ cd $pkgname-$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
+}
+
+
+build() {
+ cd $pkgname-$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() {
+ cd $pkgname-$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
+}
Deleted: extra-i686/nss-config.in
===================================================================
--- extra-i686/nss-config.in 2014-05-09 18:25:02 UTC (rev 212171)
+++ extra-i686/nss-config.in 2014-05-09 18:25:11 UTC (rev 212172)
@@ -1,145 +0,0 @@
-#!/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/extra-i686/nss-config.in (from rev 212171, nss/trunk/nss-config.in)
===================================================================
--- extra-i686/nss-config.in (rev 0)
+++ extra-i686/nss-config.in 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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
+
Deleted: extra-i686/nss.pc.in
===================================================================
--- extra-i686/nss.pc.in 2014-05-09 18:25:02 UTC (rev 212171)
+++ extra-i686/nss.pc.in 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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: nss/repos/extra-i686/nss.pc.in (from rev 212171, nss/trunk/nss.pc.in)
===================================================================
--- extra-i686/nss.pc.in (rev 0)
+++ extra-i686/nss.pc.in 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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: extra-i686/ssl-renegotiate-transitional.patch
===================================================================
--- extra-i686/ssl-renegotiate-transitional.patch 2014-05-09 18:25:02 UTC (rev 212171)
+++ extra-i686/ssl-renegotiate-transitional.patch 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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: nss/repos/extra-i686/ssl-renegotiate-transitional.patch (from rev 212171, nss/trunk/ssl-renegotiate-transitional.patch)
===================================================================
--- extra-i686/ssl-renegotiate-transitional.patch (rev 0)
+++ extra-i686/ssl-renegotiate-transitional.patch 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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 */
+ };
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-05-09 18:25:02 UTC (rev 212171)
+++ extra-x86_64/PKGBUILD 2014-05-09 18:25:11 UTC (rev 212172)
@@ -1,91 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=nss
-pkgver=3.16
-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.4
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
-makedepends=('perl')
-options=('!strip' '!makeflags' 'staticlibs')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
- nss.pc.in
- nss-config.in
- ssl-renegotiate-transitional.patch)
-sha1sums=('981dc6ef2f1e69ec7e2b277ce27c7005e9837f95'
- 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
- 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
- '8a964a744ba098711b80c0d279a2993524e8eb92')
-
-prepare() {
- cd $pkgname-$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
-}
-
-
-build() {
- cd $pkgname-$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() {
- cd $pkgname-$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
-}
Copied: nss/repos/extra-x86_64/PKGBUILD (from rev 212171, nss/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-05-09 18:25:11 UTC (rev 212172)
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=nss
+pkgver=3.16.1
+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.5
+depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
+makedepends=('perl')
+options=('!strip' '!makeflags' 'staticlibs')
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
+ nss.pc.in
+ nss-config.in
+ ssl-renegotiate-transitional.patch)
+sha1sums=('450a88dde8c7e4533507ac8340dbf94be28a759b'
+ 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
+ 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
+ '8a964a744ba098711b80c0d279a2993524e8eb92')
+
+prepare() {
+ cd $pkgname-$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
+}
+
+
+build() {
+ cd $pkgname-$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() {
+ cd $pkgname-$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
+}
Deleted: extra-x86_64/nss-config.in
===================================================================
--- extra-x86_64/nss-config.in 2014-05-09 18:25:02 UTC (rev 212171)
+++ extra-x86_64/nss-config.in 2014-05-09 18:25:11 UTC (rev 212172)
@@ -1,145 +0,0 @@
-#!/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/extra-x86_64/nss-config.in (from rev 212171, nss/trunk/nss-config.in)
===================================================================
--- extra-x86_64/nss-config.in (rev 0)
+++ extra-x86_64/nss-config.in 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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
+
Deleted: extra-x86_64/nss.pc.in
===================================================================
--- extra-x86_64/nss.pc.in 2014-05-09 18:25:02 UTC (rev 212171)
+++ extra-x86_64/nss.pc.in 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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: nss/repos/extra-x86_64/nss.pc.in (from rev 212171, nss/trunk/nss.pc.in)
===================================================================
--- extra-x86_64/nss.pc.in (rev 0)
+++ extra-x86_64/nss.pc.in 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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: extra-x86_64/ssl-renegotiate-transitional.patch
===================================================================
--- extra-x86_64/ssl-renegotiate-transitional.patch 2014-05-09 18:25:02 UTC (rev 212171)
+++ extra-x86_64/ssl-renegotiate-transitional.patch 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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: nss/repos/extra-x86_64/ssl-renegotiate-transitional.patch (from rev 212171, nss/trunk/ssl-renegotiate-transitional.patch)
===================================================================
--- extra-x86_64/ssl-renegotiate-transitional.patch (rev 0)
+++ extra-x86_64/ssl-renegotiate-transitional.patch 2014-05-09 18:25:11 UTC (rev 212172)
@@ -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