Security bump (bug #414963). Removed old

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 42 insertions, 20 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 2d0907f4625f..66f28b99dcac 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.242 2012/05/04 18:35:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.243 2012/05/07 13:37:08 polynomial-c Exp $
+
+*nss-3.13.4 (07 May 2012)
+
+  07 May 2012; Lars Wendler <polynomial-c@gentoo.org> -nss-3.13.1-r2.ebuild,
+  +nss-3.13.4.ebuild:
+  Security bump (bug #414963). Removed old.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> nss-3.12.11-r1.ebuild,
   nss-3.13.1-r2.ebuild, nss-3.13.2.ebuild, nss-3.13.3.ebuild:
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 875eaa9f9818..e2da04af175d 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX nss-3.12.11-CVE-2011-3640.patch 4608 RMD160 02f2c0c428dd40904f8eee5bf6a2d2fc3ecba1ac SHA1 c3f93b6b9996e4abe7a2fa2963cadf24f3c56367 SHA256 d48b2117c52a30c8ef659fc7222f501cce175ead29891ed8dceadd6f7d8bada4
 AUX nss-3.12.4-solaris-gcc.patch 842 RMD160 83324ac0ecde97e1976bf5162e7ce01ab2ca07e6 SHA1 769562dc8fd7ecc85e4f06a88d568433f2f3f5e2 SHA256 cf2695f4d73ad9de267ffd2e47b2f8940bf56d94b51e66d1e36907b5d6368865
 AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6
@@ -6,15 +9,31 @@ AUX nss-3.13-gentoo-fixup.patch 6423 RMD160 335aaab44d35539ec6ae46cb00cc6e7fbb32
 AUX nss-3.13.1-pkcs11n-header-fix.patch 614 RMD160 343142563f7cf53e85cd09ba707fb40cdd0ecb5b SHA1 fe8d58b545e8456f1f5f626526855ed9d5576298 SHA256 1792baa694e86a79fb07b8d69bf41665daedaa8692e22b83e327443b15c193ec
 AUX nss-3.13.1-solaris-gcc.patch 854 RMD160 1b4190cae56a7e4399ac8f4f455346e2ab596353 SHA1 b3676c303de3272fefc8ba3ce91db4cf8f83117d SHA256 5a5406334c9ecd1e338fa91416fed5e8bc19eeb7115511552ba267ed8a25d117
 DIST nss-3.12.11.tar.gz 5944840 RMD160 4528d4be996bce801ff5f4c978457bd17c8e8625 SHA1 187ae83a8368512bb8729c206da2ed34db1725ad SHA256 d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16
-DIST nss-3.13.1-add_cacert_ca_certs.patch 71117 RMD160 1d5a90f1afe3b645ac75c38540454d011f06985e SHA1 d9fc8c3ba90f4470cfdaeac457d2bc8d073ef5b4 SHA256 c9a38ebbafc49ec5eda87af4528e7c91bf13c49c9894b9a37464978c9b8eaf64
-DIST nss-3.13.1.with.ckbi.1.88.tar.gz 6065634 RMD160 20bf77259d92cb054a4e4c40fbd931da335fc58c SHA1 ebc0258c8d1a3c2fe80941bd991b766552464fc6 SHA256 456fd2ad036976660ae7e4e24edddc49f2f47e7ca490c1c5372771bbb5207879
 DIST nss-3.13.2-add_cacert_ca_certs-ported.patch 70938 RMD160 75e402553dd80382af2aa5676bf62dda62b733a2 SHA1 c2d342a9bc4690609b0cfe5924bde52e25d6b73c SHA256 bd3e14436695c903279c2cf8982c8df0f20ab34cbe1a7f955aaf861f19a3bf25
 DIST nss-3.13.2.tar.gz 6082528 RMD160 06efef91bbcff0425000d945dda73234ec12aadb SHA1 ad80109b135ebe8467ca2b2c2b9cc4b0bf885505 SHA256 92eafdbb62e3071afe71beeaca94c9f33b0b8d11654cbf1797c84aa9f7c1c8e5
 DIST nss-3.13.3-add_spi+cacerts_ca_certs.patch 69983 RMD160 be90a26851b8b431ddfcb42718917bebadaad21f SHA1 02d33b60aecc2e2cc85db1737eb17981bf50eb21 SHA256 aa3e4ac057865b6c90718d1c815686867ff96540bb500b9191a632c029d2ad9e
 DIST nss-3.13.3.tar.gz 6083507 RMD160 844958f0cad39d0283d046104fd41349ff4dda4c SHA1 6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6 SHA256 efa10f2c70da4bddabf1a6081964969bb23359b93d6eadbf4739274a77bc3587
+DIST nss-3.13.4.tar.gz 6087584 RMD160 52c2984b3678af34da55c2b4dc50a1274afa7c59 SHA1 c5a829c3bd56aa743457faf21469065f87c2db75 SHA256 a552f56b03c0c716ba950c7eef971d87f717c02a4d9a75ee2fe84bd036830de5
 EBUILD nss-3.12.11-r1.ebuild 7122 RMD160 429b58749c778460a5183fd6cec11880aac9ca24 SHA1 bcf8876a714b2713ad5ddb6090bc460b1c4f3bdf SHA256 d5841f3fcc82b82daec8e8af075ce0da6188eed4138ec55bad35472590917fb1
-EBUILD nss-3.13.1-r2.ebuild 7061 RMD160 c0f9f0f48dd786cff3b255171d0a75e88916eba7 SHA1 d0406a3b4f56bda7b289a627b46260397485b655 SHA256 ec6849cc9840d4d80bee959df039064dc4fbf5da182c49939f76da022ac5cd39
 EBUILD nss-3.13.2.ebuild 6661 RMD160 fb34f7fda31fe92a7957820f6e866469d5eba86d SHA1 24a7d6c28734faf0ec13f86c6ecfa11dec78683c SHA256 893ccc693582e62752fc6647b8609cf1e4b4f2ab6bd373a126a5b9e9224e3c1e
 EBUILD nss-3.13.3.ebuild 6701 RMD160 b9714362b42d2c8bd180c287f6e8d0c8d1cb396e SHA1 efb25159817ff8c48211fface6f44f72293d42df SHA256 8548f900f91d5193a6e81a6424ccbc0ef09e3661983991eb547be6caa9da4d6b
-MISC ChangeLog 30985 RMD160 16d9591935250d18b4c39d82d50a768a591fee75 SHA1 da986101391ad2326ea0f823b87b65c5ba7cbf9b SHA256 40ec4db806872152970de289acf7dc99b04c95ea9c99bc2211b51e4c9255169a
+EBUILD nss-3.13.4.ebuild 6709 RMD160 216d920e8cba01208a59801c02a93926cbc26152 SHA1 cf06651002630faf28bb6802caa9fa91e8e30210 SHA256 14412bde10bf39f9ae43eaa6dd7b05d636ad4132d2a40c0105c3d3cd4d174463
+MISC ChangeLog 31162 RMD160 094a7dd2c86517e609dbdb6966636d23643b4114 SHA1 29851925ec5a2ed514f6a9e52fe87cf375e8217f SHA256 84d17d018779055ff31b5cb9eac630b9b6a9a5f8472e05ab66a02fab32e583db
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPp9AJAAoJEPiazRVxLXTF6rAP/3qELVBmEo6Nmn2m0ef5uliO
+YNZFEvdal84pkDd4eU4s9P5sbTuodgtCuILHzNL+4cPuudzGxKS9gLDDW1138ZM7
+EtS4Bra6cP8Fbe7T8w04InwHc/w8sk5m9i466ECiglZpzfcGSWY7EfXqK8u/7CQq
+LtCiFkO0vvbWz2rB5i9o1tJwJl0qHJ+0u7YqLQGoSyDRknQwWLesLNV59Hr6K+as
+Go/pNelk6L8NDVKje4t4qiL0NWzzCsf39TRtCZY9+KYKLXtkkDmx80fEwLYAbpU/
++eQjFcXnOhoH7fQ58LSeTd1Pnhv7Sx0rh2FLnixriQZzKeFpjunNEk69pUd/Miy5
+7Vw8DeacEMx5veIik1XeCJscSekqTTuSf3+loWo8n5rg9Mfjniw58pewcn/kvTPr
+forEQeMdxcpytv1uYHTZnwV9xgeLiH0Gk2TZ8C6qFYq9A4ajxqs/XxtWJcDzyRx2
+3UcLMWJCfjnCVrVP07jVJKG+6DLOm/TWWEaV5LL7X1KkTvDy2zOIfGk/B0NB6xEo
+GJgg8RLw1QIsJgeChHwu7w6L9CSbfQoyW5o/zw/6znV9Z+wxfR6Yd9jCr5RvXLCD
+l8yn7Z1wLt/Nz0Sj7yBAbt6Fjk8X7p8asNc/0MsyvDxA0k2HB0HSjdexaKo4PLvT
+GoDla1BpgdEB5a3Vdafw
+=5VDR
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/nss-3.13.1-r2.ebuild b/dev-libs/nss/nss-3.13.4.ebuild
index a1d610b419c3..5fcbab766239 100644
--- a/dev-libs/nss/nss-3.13.1-r2.ebuild
+++ b/dev-libs/nss/nss-3.13.4.ebuild
@@ -1,21 +1,21 @@
 # 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.13.1-r2.ebuild,v 1.4 2012/05/04 18:35:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.4.ebuild,v 1.1 2012/05/07 13:37:08 polynomial-c Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
 
-NSPR_VER="4.8.9"
+NSPR_VER="4.9"
 RTM_NAME="NSS_${PV//./_}_RTM"
-RTM_NAMECKBI="NSS_${PV//./_}_WITH_CKBI_1_88_RTM"
+
 DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
 HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="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.patch"
+SRC_URI="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.3-add_spi+cacerts_ca_certs.patch"
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"
 
 DEPEND="virtual/pkgconfig"
@@ -23,12 +23,15 @@ RDEPEND=">=dev-libs/nspr-${NSPR_VER}
 	>=dev-db/sqlite-3.5
 	sys-libs/zlib"
 
+src_setup() {
+	export LC_ALL="C"
+}
+
 src_prepare() {
 	# Custom changes for gentoo
-	epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff"
+	epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch"
 	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.3-add_spi+cacerts_ca_certs.patch"
 
 	cd "${S}"/mozilla/security/coreconf || die
 	# hack nspr paths
@@ -194,12 +197,6 @@ src_install () {
 }
 
 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)
 }