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 1Rzf5R-0006yV-BB for garchives@archives.gentoo.org; Tue, 21 Feb 2012 02:04:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5DA4E0FD8; Tue, 21 Feb 2012 02:04:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 94A2DE0FD8 for ; Tue, 21 Feb 2012 02:04:05 +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 D0EF81B400D for ; Tue, 21 Feb 2012 02:04:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 66682E53FF for ; Tue, 21 Feb 2012 02: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: <1329789819.2e737b393033ebe4a8dd416770ee67b4a0d0497f.anarchy@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/Manifest dev-libs/nss/files/nss-3.13.1-pkcs11n-header-fix.patch dev-libs/nss/nss-3.13.1-r2.ebuild dev-libs/nss/nss-3.13.2.ebuild X-VCS-Directories: dev-libs/nss/files/ dev-libs/nss/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 2e737b393033ebe4a8dd416770ee67b4a0d0497f X-VCS-Branch: master Date: Tue, 21 Feb 2012 02: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: 82cc2698-7c04-4719-bedc-c19c0f6bc473 X-Archives-Hash: 05522a89d0112adf028b355750fff618 commit: 2e737b393033ebe4a8dd416770ee67b4a0d0497f Author: Jory A. Pratt gentoo org> AuthorDate: Tue Feb 21 02:03:39 2012 +0000 Commit: Jory Pratt gentoo org> CommitDate: Tue Feb 21 02:03:39 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D2e737b39 version bump for nss-3.13.2 --- dev-libs/nss/Manifest | 7 +++---- .../nss/files/nss-3.13.1-pkcs11n-header-fix.patch | 11 ----------- .../{nss-3.13.1-r2.ebuild =3D> nss-3.13.2.ebuild} | 17 +++++-------= ----- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index ac62e94..2229f7e 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,7 +1,6 @@ AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db= 18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593= 640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6 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-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 +DIST nss-3.13.2-add_cacert_ca_certs-ported.patch 70938 RMD160 75e402553d= d80382af2aa5676bf62dda62b733a2 SHA1 c2d342a9bc4690609b0cfe5924bde52e25d6b= 73c SHA256 bd3e14436695c903279c2cf8982c8df0f20ab34cbe1a7f955aaf861f19a3bf= 25 +DIST nss-3.13.2.tar.gz 6082528 RMD160 06efef91bbcff0425000d945dda73234ec= 12aadb SHA1 ad80109b135ebe8467ca2b2c2b9cc4b0bf885505 SHA256 92eafdbb62e30= 71afe71beeaca94c9f33b0b8d11654cbf1797c84aa9f7c1c8e5 +EBUILD nss-3.13.2.ebuild 6662 RMD160 efba66a1ff497af973bc96ea57ed04deadd= 9fcdf SHA1 1abb32d562e4343d10200a876dff39cc96d1b7fc SHA256 4bfc1c5f722ad0= d88ddd56c83d49a00219f52a1e78de5f6c03af526a26024234 diff --git a/dev-libs/nss/files/nss-3.13.1-pkcs11n-header-fix.patch b/dev= -libs/nss/files/nss-3.13.1-pkcs11n-header-fix.patch deleted file mode 100644 index 39bcc9e..0000000 --- a/dev-libs/nss/files/nss-3.13.1-pkcs11n-header-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/mozilla/security/nss/lib/util/pkcs11n.h 2011-12-11 15:18:57.451617= 325 -0600 -+++ a/mozilla/security/nss/lib/util/pkcs11n.h 2011-12-11 15:19:27.652239= 770 -0600 -@@ -362,7 +362,7 @@ - * cast the resulting value to the deprecated type in the #define, thu= s - * producting the warning when the #define is used. - */ --#if (__GNUC__ =3D=3D 4) && (__GNUC_MINOR < 5) -+#if (__GNUC__ =3D=3D 4) && (__GNUC_MINOR__ < 5) - /* The mac doesn't like the friendlier deprecate messages. I'm assuming= this - * is a gcc version issue rather than mac or ppc specific */ - typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated)); diff --git a/dev-libs/nss/nss-3.13.1-r2.ebuild b/dev-libs/nss/nss-3.13.2.= ebuild similarity index 91% rename from dev-libs/nss/nss-3.13.1-r2.ebuild rename to dev-libs/nss/nss-3.13.2.ebuild index d21d892..2d240dc 100644 --- a/dev-libs/nss/nss-3.13.1-r2.ebuild +++ b/dev-libs/nss/nss-3.13.2.ebuild @@ -5,13 +5,13 @@ EAPI=3D3 inherit eutils flag-o-matic multilib toolchain-funcs =20 -NSPR_VER=3D"4.8.9" +NSPR_VER=3D"4.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_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" +SRC_URI=3D"ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$= {RTM_NAME}/src/${P}.tar.gz + http://dev.gentoo.org/~anarchy/patches/nss-3.13.2-add_cacert_ca_certs-p= orted.patch" =20 LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" SLOT=3D"0" @@ -27,8 +27,7 @@ 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" + epatch "${DISTDIR}/nss-3.13.2-add_cacert_ca_certs-ported.patch" =20 cd "${S}"/mozilla/security/coreconf || die # hack nspr paths @@ -194,12 +193,6 @@ src_install () { } =20 pkg_postinst() { - elog "We have reverted back to using upstreams soname." - elog "Please run revdep-rebuild --library libnss3.so.12 , this" - elog "will correct most issues. If you find a binary that does" - elog "not run please re-emerge package to ensure it properly" - elog " links after upgrade." - elog # We must re-sign the libraries AFTER they are stripped. generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir) }