From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6253E1381F3 for ; Thu, 26 Sep 2013 17:45:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC119E0C9D; Thu, 26 Sep 2013 17:45:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83AD0E0C9D for ; Thu, 26 Sep 2013 17:45:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 712BB33ECFC for ; Thu, 26 Sep 2013 17:45:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 25CEDE5309 for ; Thu, 26 Sep 2013 17:45:41 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1380217508.3dcd25bb2c1043eda056694be9e7669b6f506b3a.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/, dev-libs/nss/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nss/files/nss-3.15.1-fipstest-warnings.patch dev-libs/nss/nss-3.15.1-r2.ebuild dev-libs/nss/nss-3.15.1.ebuild X-VCS-Directories: dev-libs/nss/files/ dev-libs/nss/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 3dcd25bb2c1043eda056694be9e7669b6f506b3a X-VCS-Branch: master Date: Thu, 26 Sep 2013 17:45:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 34cd0f89-1ecc-4a1b-8fc2-4acee8fa5205 X-Archives-Hash: a3bc1c38ebd98f51048d429ed577a4e5 commit: 3dcd25bb2c1043eda056694be9e7669b6f506b3a Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Sep 26 17:45:08 2013 +0000 Commit: Ian Stakenvicius gentoo 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" }