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 1RZqyt-000142-Kk for garchives@archives.gentoo.org; Sun, 11 Dec 2011 21:30:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E398021C037; Sun, 11 Dec 2011 21:30:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9AC1421C037 for ; Sun, 11 Dec 2011 21:30:39 +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 097901B4013 for ; Sun, 11 Dec 2011 21:30:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 25D9F8004A for ; Sun, 11 Dec 2011 21:30:38 +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: 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-r1.ebuild dev-libs/nss/nss-3.13.1.ebuild X-VCS-Directories: dev-libs/nss/files/ dev-libs/nss/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: dbcac91c5ead282504152ae5c6bca35d6f7a1fd8 Date: Sun, 11 Dec 2011 21:30:38 +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: a7aaf7b7-7ba3-4811-ab6c-789b20519f73 X-Archives-Hash: 29d47266d696b75c7a02ce3711fbf1b5 commit: dbcac91c5ead282504152ae5c6bca35d6f7a1fd8 Author: Jory A. Pratt gentoo org> AuthorDate: Sun Dec 11 21:30:10 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Dec 11 21:30:10 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3Ddbcac91c fix broken pkcs11n.h, reported by slyfox on gentoo-dev channel --- dev-libs/nss/Manifest | 3 ++- .../nss/files/nss-3.13.1-pkcs11n-header-fix.patch | 11 +++++++++++ .../{nss-3.13.1.ebuild =3D> nss-3.13.1-r1.ebuild} | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 60cae33..481b1b9 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,5 +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.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86= b360bd SHA1 d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 SHA256 95d933b59be46= 6f19f90f595a35b4b92213fef084caecafeb89f4e2ce7160660 -EBUILD nss-3.13.1.ebuild 6598 RMD160 6666ded00faecb9137904d4dbd6c868ce79= d6ecd SHA1 355b26254bab843a60abdffddeb7e95ca3bdaf1b SHA256 4fcac6a6009f35= b3341eb07028de2a9755a6c5e47d710b5514709e3573c159ce +EBUILD nss-3.13.1-r1.ebuild 6656 RMD160 a8372ee98745da12fdfe8f1127719543= 2a7a0ae6 SHA1 b3e8c29a348cea751228af4b8a2764a02cd6e9e4 SHA256 6f5cee52f6c= fa6e1d48b2531a9ee0738618a813e1337473f4d749541d9910783 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 new file mode 100644 index 0000000..39bcc9e --- /dev/null +++ b/dev-libs/nss/files/nss-3.13.1-pkcs11n-header-fix.patch @@ -0,0 +1,11 @@ +--- 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.ebuild b/dev-libs/nss/nss-3.13.1-r1.= ebuild similarity index 99% rename from dev-libs/nss/nss-3.13.1.ebuild rename to dev-libs/nss/nss-3.13.1-r1.ebuild index 475cade..30e5251 100644 --- a/dev-libs/nss/nss-3.13.1.ebuild +++ b/dev-libs/nss/nss-3.13.1-r1.ebuild @@ -24,6 +24,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" =20 cd "${S}"/mozilla/security/coreconf # hack nspr paths