Bump to 3.12.6; no upstream release, so we have our own little tarball extracted from the firefox-3.6.2 sources.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 140 insertions, 2 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 728bb86e90d0..d5923fa0bf4e 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.172 2010/02/12 14:04:57 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.173 2010/03/24 22:31:07 nirbheek Exp $
+
+*nss-3.12.6 (24 Mar 2010)
+
+  24 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org> +nss-3.12.6.ebuild,
+  +files/nss-3.12.6-gentoo-fixup-warnings.patch:
+  Bump to 3.12.6; no upstream release, so we have our own little tarball
+  extracted from the firefox-3.6.2 sources.
 
   12 Feb 2010; <anarchy@gentoo.org> nss-3.12.5-r1.ebuild:
   Fix bugs #304687, #304571
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index bee556f941a0..39b5b7353ac0 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -8,6 +8,7 @@ AUX nss-3.12-config.patch 4192 RMD160 22955dd1a51b285748fff9f854946a461a9b43f2 S
 AUX nss-3.12.3-executable-stacks.patch 444 RMD160 ec9337fcfa7f666b9d58224a143811338b4afd7b SHA1 57f48fc04cd62789bb8a67d283c52d21eac50e36 SHA256 063958325f02090bd8221fd60b45031720c561cfeab683883ca082c217c9b173
 AUX nss-3.12.4-gentoo-fixups-1.diff 6669 RMD160 feb6d8e9bf6c51eea42d6eb2138bd420a5e42e38 SHA1 12ac4f92e77f9280626a22e5985996b25d5c58c7 SHA256 a4f4999065d8902f3c0c8bfec2f11992a79a91dd4a7e3dd4b8434f45baf9b3c1
 AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6
+AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329
 AUX nss-config.in 2238 RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd SHA1 535ea4869d0f5fdc4f14b723320ef7284c14190a SHA256 57fb0219482981c80d9a72d8a86dfcbe0e776e4e5609fad8965e651f79296fa7
 AUX nss-fbsd7.patch 638 RMD160 9c60b07a9f9b9a7482221f09042266c358d6cfcf SHA1 27036a161ff076fc8a9d459458d2a4adc38876ad SHA256 f471f04def6d4f1abd2062b582246a60a33b346576ad6e71c782fcfe317c8cc7
 AUX nss-mips64-2.patch 540 RMD160 16c461f453470238922065068dd6530b908bb64f SHA1 27062b98164c946d5116b64a49c7c164b261fdbd SHA256 06ad64812bd49382ff4165bfa452fd697a5ca2c03e8f3ffb9aa1bcfa14499b34
@@ -18,6 +19,7 @@ DIST nss-3.12.2.tar.bz2 3974864 RMD160 eebddb26f26268550d106301464e0f98944a5e04
 DIST nss-3.12.3.tar.bz2 4066954 RMD160 b5339eda9dfc87385b2c11e2ca53be249b75ed69 SHA1 eeca14a37629287baa10eb7562a5fb927e9dd171 SHA256 68152f9ad62b49c8860306a6056f5c42f1a66095749e97346a2c3001528075f4
 DIST nss-3.12.4.tar.gz 5412877 RMD160 4c451f5dd1c5205a6886a3c3abb014638f87395d SHA1 a152bf980f3a3dcf575c2d149fb279058ef2e757 SHA256 8202546524c69ce03e1c3ef5e2956b71b8fa0a5bffdf06568597e7c0d1f83bf0
 DIST nss-3.12.5.tar.gz 5397000 RMD160 2592c4cf107d5de907c74b2e7ae260650be3c446 SHA1 ec12c6eddba5fb4609a174b079095b374935d37c SHA256 2980c292b8cb2248e3f29111bef9991ea2cf83b11f26635618b413f422af16b3
+DIST nss-3.12.6-gentoo.tar.bz2 4566061 RMD160 fe0ef92df87b60475f64621f7844dfe25e5bcf4d SHA1 7a80ce4dc8564c712dc79949605fe936a3359fa0 SHA256 cb27e5866a98e7ab09c85ace6e7d7d6a5c2fe739e502796b87df49c71c74b027
 EBUILD nss-3.11.9-r1.ebuild 4249 RMD160 b946376594976c29d73050af8bdb8887aa73b382 SHA1 17482607cc8b98e69ecff4735bbf276601f484ad SHA256 086b85d6e853f8cb058e3111a86f2de31525dad78df70a5e5143dd48cf786098
 EBUILD nss-3.12.2.ebuild 4598 RMD160 bfe76dcbb0bbc33aad9462384217cc8a3b0e2402 SHA1 6167d30a4d42d690af15960438e318687ab95f8c SHA256 3362b29bcd69d539dd8a15b46d4681c43d63de07cb628679a002bd317a2cd849
 EBUILD nss-3.12.3-r1.ebuild 4707 RMD160 a0152ef25c60c1a84f38c4d79589a007c9584a7e SHA1 0d705e3db8f9fea9b04fb912e8d6eded40496693 SHA256 577f4d89c6d0fc7c2ff9bacce97b4658e681ac3f7f269f4eed4a2a65e976e927
@@ -25,5 +27,6 @@ EBUILD nss-3.12.3.ebuild 4613 RMD160 440ac301ddf48df2e715ea7c59d30b8f9cc658fc SH
 EBUILD nss-3.12.4-r2.ebuild 3797 RMD160 f9cc7d27298f953b5d70551c199432e48d933e5d SHA1 418b773d837571db4918cbbba8b5f43216b8db3f SHA256 cddf7ceebbd2077a5e1245d23db28a92c8ff3e7cb17eb0e3f148e0ad03e2df12
 EBUILD nss-3.12.5-r1.ebuild 3622 RMD160 07f36f9905c2114bf5a4c243131d7ded05b8f463 SHA1 a74cd74556ba145b0f596c52225eb8c47b2ab822 SHA256 289a533844552f8e3fc86fd8da60c20cef6b53cfc1bcf8c0ecc701c20a7e5a0e
 EBUILD nss-3.12.5.ebuild 3904 RMD160 4a482069bf56b343cbf3d56d6189d7f8e25f3fff SHA1 c7f5cbdf09b52ce188e9a90bb39de6eee33b1fa5 SHA256 b395fde2231f7373e67c51c3cc87f2db4bac2ebf396b2c65dba42612233c4f9d
-MISC ChangeLog 21349 RMD160 5c5826321bfb7be6a77b735e5ac921e024476c23 SHA1 832e0d61164ee8b2b6a262a9a4ae86c5c78b2e12 SHA256 f81128fd20e0c3528c8bdc079f707ff4c5530a064469a076c6b2e80c2938054c
+EBUILD nss-3.12.6.ebuild 3708 RMD160 76eb8d5a9ac11c2845046809dee0910327fd841d SHA1 7b5dcb1f8678800de25cd454dc74e51e06199266 SHA256 61e779dfb01b945a46cec7a2b862ec4717bef40322a10808f75ee7edd4cae41a
+MISC ChangeLog 21618 RMD160 0406cb9edafceabcdb8dd8c08bd752e839afe3c5 SHA1 9aa44732325a9fddd7a8961dfd348563ef596a2f SHA256 3f9e774481cfef9de8edb42ca3044788b850d0ad330ed9c57a1ea2c402ce7a29
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
diff --git a/dev-libs/nss/files/nss-3.12.6-gentoo-fixup-warnings.patch b/dev-libs/nss/files/nss-3.12.6-gentoo-fixup-warnings.patch
new file mode 100644
index 000000000000..bf2a86583080
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.12.6-gentoo-fixup-warnings.patch
@@ -0,0 +1,10 @@
+--- nss-3.12.6b/mozilla/security/coreconf/Linux.mk-old	2010-02-11 12:43:26.000000000 -0600
++++ nss-3.12.6b/mozilla/security/coreconf/Linux.mk	2010-02-14 09:13:53.962449644 -0600
+@@ -120,6 +120,7 @@
+ ifdef MOZ_DEBUG_SYMBOLS
+ 	OPTIMIZER  += -gstabs+
+ endif
++OPTIMIZER += -fno-strict-aliasing
+ endif
+ 
+ 
diff --git a/dev-libs/nss/nss-3.12.6.ebuild b/dev-libs/nss/nss-3.12.6.ebuild
new file mode 100644
index 000000000000..fbb526cac4a3
--- /dev/null
+++ b/dev-libs/nss/nss-3.12.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.6.ebuild,v 1.1 2010/03/24 22:31:07 nirbheek Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+NSPR_VER="4.8.3-r2"
+RTM_NAME="NSS_${PV//./_}_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_NAME}/src/${P}.tar.gz"
+#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="utils"
+
+DEPEND="dev-util/pkgconfig"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}
+	>=dev-db/sqlite-3.5"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# Custom changes for gentoo
+	epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff"
+	epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch"
+
+	cd "${S}"/mozilla/security/coreconf
+
+	# modify install path
+	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Ensure we stay multilib aware
+	sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib"
+}
+
+src_compile() {
+	strip-flags
+
+	echo > "${T}"/test.c
+	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+	*64-bit*) export USE_64=1;;
+	*32-bit*) ;;
+	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+
+	export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+	export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+	export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
+	export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L//'`
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export XCFLAGS="${CFLAGS}"
+	export FREEBL_NO_DEPEND=1
+
+	cd "${S}"/mozilla/security/coreconf
+	emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
+	cd "${S}"/mozilla/security/dbm
+	emake -j1 CC="$(tc-getCC)" || die "dbm make failed"
+	cd "${S}"/mozilla/security/nss
+	emake -j1 CC="$(tc-getCC)" || die "nss make failed"
+}
+
+src_install () {
+	MINOR_VERSION=12
+	cd "${S}"/mozilla/security/dist
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*.so "${D}"/usr/$(get_libdir) || die "copying shared libs failed"
+	cp -L */lib/*.chk "${D}"/usr/$(get_libdir) || die "copying chk files failed"
+	cp -L */lib/libcrmf.a "${D}"/usr/$(get_libdir) || die "copying libs failed"
+
+	# Install nspr-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${D}"/usr/bin
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${D}"/usr/$(get_libdir)/pkgconfig
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.h
+	cd "${D}"/usr/$(get_libdir)
+	for file in *.so; do
+		mv ${file} ${file}.${MINOR_VERSION}
+		ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+
+	if use utils; then
+		local nssutils
+		nssutils="certutil crlutil cmsutil modutil pk12util signtool signver ssltap addbuiltin"
+
+		cd "${S}"/mozilla/security/dist/*/bin/
+		for f in $nssutils; do
+			dobin ${f}
+		done
+	fi
+}
+
+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
+}