From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RkqM9-0002H5-Er for garchives@archives.gentoo.org; Wed, 11 Jan 2012 05:04:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1ACBA21C061; Wed, 11 Jan 2012 05:04:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C5B2621C061 for ; Wed, 11 Jan 2012 05:04:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 319E31B4012 for ; Wed, 11 Jan 2012 05:04:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5459D80044 for ; Wed, 11 Jan 2012 05:04:02 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <2e0ea6c347f4c422549cc7524c540523897fd2ed.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nss/Manifest dev-libs/nss/nss-3.13.1-r1.ebuild dev-libs/nss/nss-3.13.1-r2.ebuild X-VCS-Directories: dev-libs/nss/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 2e0ea6c347f4c422549cc7524c540523897fd2ed Date: Wed, 11 Jan 2012 05:04:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4889f103-7d99-423a-8b6a-d2f82e62f261 X-Archives-Hash: 81ddfb6d149cda94c594806672fd7144 commit: 2e0ea6c347f4c422549cc7524c540523897fd2ed Author: Jory A. Pratt gentoo org> AuthorDate: Wed Jan 11 05:03:09 2012 +0000 Commit: Jory Pratt gentoo org> CommitDate: Wed Jan 11 05:03:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D2e0ea6c3 update for security, also include support for ca certs. --- dev-libs/nss/Manifest | 5 +- .../{nss-3.13.1-r1.ebuild =3D> nss-3.13.1-r2.ebuild} | 62 ++++++++++--= ------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 2b1c71f..ac62e94 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -2,5 +2,6 @@ AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db72940= 6c62d0e8582e7db18f2f80a AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f= 29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA2= 56 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329 AUX nss-3.13.1-pkcs11n-header-fix.patch 614 RMD160 343142563f7cf53e85cd0= 9ba707fb40cdd0ecb5b SHA1 fe8d58b545e8456f1f5f626526855ed9d5576298 SHA256 = 1792baa694e86a79fb07b8d69bf41665daedaa8692e22b83e327443b15c193ec AUX nss-3.13.1-solaris-gcc.patch 994 RMD160 f6bfc9b34aebf2fd4b47187884fe= 572e446aa2c0 SHA1 37ad83887a91073c94bbed698677b82160392771 SHA256 2633e73= f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b -DIST nss-3.13.1.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86= b360bd SHA1 d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 SHA256 95d933b59be46= 6f19f90f595a35b4b92213fef084caecafeb89f4e2ce7160660 -EBUILD nss-3.13.1-r1.ebuild 6675 RMD160 3165579141151a32c31f4300a7dcfe98= 356f7478 SHA1 342a277d717916a01984d071305bebb73a3b62dd SHA256 06c3b67c157= 603d5f0b364d36016b685526384fab8c6b98af5208d22fdd73b45 +DIST nss-3.13.1-add_cacert_ca_certs.patch 71117 RMD160 1d5a90f1afe3b645a= c75c38540454d011f06985e SHA1 d9fc8c3ba90f4470cfdaeac457d2bc8d073ef5b4 SHA= 256 c9a38ebbafc49ec5eda87af4528e7c91bf13c49c9894b9a37464978c9b8eaf64 +DIST nss-3.13.1.with.ckbi.1.88.tar.gz 6065634 RMD160 20bf77259d92cb054a4= e4c40fbd931da335fc58c SHA1 ebc0258c8d1a3c2fe80941bd991b766552464fc6 SHA25= 6 456fd2ad036976660ae7e4e24edddc49f2f47e7ca490c1c5372771bbb5207879 +EBUILD nss-3.13.1-r2.ebuild 7061 RMD160 1228a0271d51d5c0a7386cefa3bc3e3a= 6f5c064d SHA1 7652fef21248fc9cbd881afd3bb4ea86982e2dd8 SHA256 1e8535702a7= c4dcaf5b7b6ea8d3e140409462a364f00f603414bd973e4796686 diff --git a/dev-libs/nss/nss-3.13.1-r1.ebuild b/dev-libs/nss/nss-3.13.1-= r2.ebuild similarity index 81% rename from dev-libs/nss/nss-3.13.1-r1.ebuild rename to dev-libs/nss/nss-3.13.1-r2.ebuild index e27853d..d21d892 100644 --- a/dev-libs/nss/nss-3.13.1-r1.ebuild +++ b/dev-libs/nss/nss-3.13.1-r2.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.10.ebuild,v 1.2= 2011/07/31 14:29:19 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild,v 1= .2 2012/01/10 10:21:27 ago Exp $ =20 EAPI=3D3 inherit eutils flag-o-matic multilib toolchain-funcs =20 NSPR_VER=3D"4.8.9" RTM_NAME=3D"NSS_${PV//./_}_RTM" +RTM_NAMECKBI=3D"NSS_${PV//./_}_WITH_CKBI_1_88_RTM" DESCRIPTION=3D"Mozilla's Network Security Services library that implemen= ts PKI support" HOMEPAGE=3D"http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI=3D"ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$= {RTM_NAME}/src/${P}.tar.gz" +SRC_URI=3D"ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$= {RTM_NAMECKBI}/src/${P}.with.ckbi.1.88.tar.gz + http://dev.gentoo.org/~anarchy/patches/nss-3.13.1-add_cacert_ca_certs.p= atch" =20 LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" SLOT=3D"0" @@ -18,37 +20,39 @@ IUSE=3D"utils" =20 DEPEND=3D"dev-util/pkgconfig" RDEPEND=3D">=3Ddev-libs/nspr-${NSPR_VER} - >=3Ddev-db/sqlite-3.5" + >=3Ddev-db/sqlite-3.5 + sys-libs/zlib" =20 src_prepare() { # Custom changes for gentoo epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff" epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" epatch "${FILESDIR}/nss-3.13.1-pkcs11n-header-fix.patch" + epatch "${DISTDIR}/nss-3.13.1-add_cacert_ca_certs.patch" =20 - cd "${S}"/mozilla/security/coreconf + cd "${S}"/mozilla/security/coreconf || die # hack nspr paths echo 'INCLUDES +=3D -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include= /dbm' \ >> headers.mk || die "failed to append include" =20 # modify install path sed -e 's:SOURCE_PREFIX =3D $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX =3D $= (CORE_DEPTH)/dist:' \ - -i source.mk + -i source.mk || die =20 # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || d= ie =20 # Ensure we stay multilib aware sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/co= nfig/Makefile || die "Failed to fix for multilib" =20 # Fix pkgconfig file for Prefix sed -i -e "/^PREFIX =3D/s:=3D /usr:=3D ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile + "${S}"/mozilla/security/nss/config/Makefile || die =20 - epatch ${FILESDIR}/nss-3.13.1-solaris-gcc.patch + epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" =20 # dirty hack - cd "${S}"/mozilla/security/nss + cd "${S}"/mozilla/security/nss || die sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ lib/ssl/config.mk || die sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR= ):" \ @@ -58,8 +62,8 @@ src_prepare() { src_compile() { strip-flags =20 - echo > "${T}"/test.c - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o + echo > "${T}"/test.c || die + $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die case $(file "${T}"/test.o) in *64-bit*|*ppc64*|*x86_64*) export USE_64=3D1;; *32-bit*|*ppc*|*i386*) ;; @@ -76,11 +80,11 @@ src_compile() { export FREEBL_NO_DEPEND=3D1 export ASFLAGS=3D"" =20 - cd "${S}"/mozilla/security/coreconf + cd "${S}"/mozilla/security/coreconf || die emake -j1 CC=3D"$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm + cd "${S}"/mozilla/security/dbm || die emake -j1 CC=3D"$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss + cd "${S}"/mozilla/security/nss || die emake -j1 CC=3D"$(tc-getCC)" || die "nss make failed" } =20 @@ -131,29 +135,29 @@ cleanup_chk() { =20 src_install () { MINOR_VERSION=3D12 - cd "${S}"/mozilla/security/dist + cd "${S}"/mozilla/security/dist || die =20 - dodir /usr/$(get_libdir) + dodir /usr/$(get_libdir) || die cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying s= hared libs failed" # We generate these after stripping the libraries, else they don't matc= h. #cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files = failed" cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs fa= iled" =20 # Install nss-config and pkgconfig file - dodir /usr/bin - cp -L */bin/nss-config "${ED}"/usr/bin - dodir /usr/$(get_libdir)/pkgconfig - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig + dodir /usr/bin || die + cp -L */bin/nss-config "${ED}"/usr/bin || die + dodir /usr/$(get_libdir)/pkgconfig || die + cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die =20 # all the include files insinto /usr/include/nss - doins public/nss/*.h - cd "${ED}"/usr/$(get_libdir) + doins public/nss/*.h || die + cd "${ED}"/usr/$(get_libdir) || die local n=3D for file in *$(get_libname); do n=3D${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} - ln -s ${n} ${file} + mv ${file} ${n} || die + ln -s ${n} ${file} || die if [[ ${CHOST} =3D=3D *-darwin* ]]; then install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die fi @@ -172,9 +176,9 @@ src_install () { pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strscln= t symkeyutil tstclnt vfychain vfyserv" fi - cd "${S}"/mozilla/security/dist/*/bin/ + cd "${S}"/mozilla/security/dist/*/bin/ || die for f in $nssutils; do - dobin ${f} + dobin ${f} || die done =20 # Prelink breaks the CHK files. We don't have any reliable way to run @@ -184,9 +188,9 @@ src_install () { libs+=3D("${EPREFIX}/usr/$(get_libdir)/lib${l}.so") done OLD_IFS=3D"${IFS}" IFS=3D":" ; liblist=3D"${libs[*]}" ; IFS=3D"${OLD_IF= S}" - echo -e "PRELINK_PATH_MASK=3D${liblist}" >"${T}/90nss" + echo -e "PRELINK_PATH_MASK=3D${liblist}" >"${T}/90nss" || die unset libs liblist - doenvd "${T}/90nss" + doenvd "${T}/90nss" || die } =20 pkg_postinst() {