[gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/, dev-libs/nss/

[Ian Stakenvicius]

commit:     3dcd25bb2c1043eda056694be9e7669b6f506b3a
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 17:45:08 2013 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 17:45:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=3dcd25bb

synced nss with updates from the portage tree

---
 .../nss/files/nss-3.15.1-fipstest-warnings.patch   | 26 ++++++++++++++++++++++
 .../{nss-3.15.1.ebuild => nss-3.15.1-r2.ebuild}    | 23 ++++++-------------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/dev-libs/nss/files/nss-3.15.1-fipstest-warnings.patch b/dev-libs/nss/files/nss-3.15.1-fipstest-warnings.patch
new file mode 100644
index 0000000..cf2fd86
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.15.1-fipstest-warnings.patch
@@ -0,0 +1,26 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=920899
+
+diff -r 279078670022 security/nss/cmd/fipstest/fipstest.c
+--- a/security/nss/cmd/fipstest/fipstest.c	Wed Mar 27 17:03:34 2013 -0400
++++ b/security/nss/cmd/fipstest/fipstest.c	Thu Sep 26 00:58:04 2013 -0400
+@@ -3616,10 +3616,10 @@ void hmac_test(char *reqfn)
+         goto loser;
+     }      
+     msg = PORT_ZAlloc(msgLen);
+-    memset(msg, 0, msgLen);
+     if (msg == NULL) {
+         goto loser;
+     } 
++    memset(msg, 0, msgLen);
+ 
+     req = fopen(reqfn, "r");
+     resp = stdout;
+@@ -3677,7 +3677,7 @@ void hmac_test(char *reqfn)
+             keyLen = 0; 
+             TLen = 0;
+             memset(key, 0, sizeof key);     
+-            memset(msg, 0, sizeof msg);  
++            memset(msg, 0, msgLen);
+             memset(HMAC, 0, sizeof HMAC);
+             continue;
+         }

diff --git a/dev-libs/nss/nss-3.15.1.ebuild b/dev-libs/nss/nss-3.15.1-r2.ebuild
similarity index 92%
rename from dev-libs/nss/nss-3.15.1.ebuild
rename to dev-libs/nss/nss-3.15.1-r2.ebuild
index 8779c22..f0f29c8 100644
--- a/dev-libs/nss/nss-3.15.1.ebuild
+++ b/dev-libs/nss/nss-3.15.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.1.ebuild,v 1.1 2013/07/24 05:58:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.1-r2.ebuild,v 1.1 2013/09/26 06:02:24 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -26,6 +26,8 @@ RDEPEND=">=dev-libs/nspr-${NSPR_VER}
 	>=dev-db/sqlite-3.5
 	sys-libs/zlib"
 
+RESTRICT="test"
+
 S="${WORKDIR}/${P}/${PN}"
 
 src_setup() {
@@ -39,6 +41,7 @@ src_prepare() {
 	epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
 	epatch "${DISTDIR}/${PN}-3.15-pem-support-20130617.patch.xz"
 	epatch "${FILESDIR}/${PN}-3.15-x32.patch"
+	epatch "${FILESDIR}/${PN}-3.15.1-fipstest-warnings.patch"
 	cd coreconf
 	# hack nspr paths
 	echo 'INCLUDES += -I$(DIST)/include/dbm' \
@@ -198,7 +201,6 @@ cleanup_chk() {
 }
 
 src_install() {
-	MINOR_VERSION=12
 	cd "${S}"/dist
 
 	dodir /usr/$(get_libdir)
@@ -216,16 +218,6 @@ src_install() {
 	# all the include files
 	insinto /usr/include/nss
 	doins public/nss/*.h
-	cd "${ED}"/usr/$(get_libdir)
-	local n file
-	for file in *$(get_libname); do
-		n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
-		mv ${file} ${n}
-		ln -s ${n} ${file}
-		if [[ ${CHOST} == *-darwin* ]]; then
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
-		fi
-	done
 
 	local f nssutils
 	# Always enabled because we need it for chk generation.
@@ -247,13 +239,12 @@ src_install() {
 
 	# Prelink breaks the CHK files. We don't have any reliable way to run
 	# shlibsign after prelink.
-	local l libs=()
+	local l libs=() liblist
 	for l in ${NSS_CHK_SIGN_LIBS} ; do
 		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
 	done
-	OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}"
-	echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss"
-	unset libs liblist
+	liblist=$(printf '%s:' "${libs[@]}")
+	echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss"
 	doenvd "${T}/90nss"
 }