Fix pkcs11n header, fix compilation for multilib

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 46 insertions, 41 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index b2f677ca5765..113fa9830299 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.229 2011/11/25 17:31:41 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.230 2011/12/19 14:13:10 anarchy Exp $
+
+*nss-3.13.1-r1 (19 Dec 2011)
+
+  19 Dec 2011; Jory A. Pratt <anarchy@gentoo.org> -nss-3.13.1.ebuild,
+  +nss-3.13.1-r1.ebuild, +files/nss-3.13.1-pkcs11n-header-fix.patch:
+  Fix pkcs11n header, fix mulitlib portage compilation
 
   25 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> nss-3.12.11-r1.ebuild:
   ppc64 stable wrt #388045
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 04e13aaec2fb..acc368166044 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
 AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329
+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.10.tar.gz 6008914 RMD160 08c82ce0f4dc4c1806944cbc74adcad137878bf3 SHA1 229f65c8d4e2c1b34e145253bceddada5a82a142 SHA256 634f294507de6da93a5c3e08006156a469ff8d8af9ac9153f608800f4d20206e
 DIST nss-3.12.11.tar.gz 5944840 RMD160 4528d4be996bce801ff5f4c978457bd17c8e8625 SHA1 187ae83a8368512bb8729c206da2ed34db1725ad SHA256 d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16
@@ -13,23 +14,17 @@ DIST nss-3.13.1.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86b360bd S
 EBUILD nss-3.12.10.ebuild 6764 RMD160 bd101be19e59dadd3fcacaa09bdc225af789cf00 SHA1 d609a403c153faaf0e42ffadc4a2e39dde0eda9e SHA256 247fb02791f7a4879327a2d6a2119d12a6aa5d736809f3c58352d9e619136d5b
 EBUILD nss-3.12.11-r1.ebuild 7127 RMD160 4c9528b288fab68583d31b63c058c377660f3f63 SHA1 6de4415f2d2df2601c6815d2a4d0c156780c51e3 SHA256 e007958db501dc133b1e11d8d4220ca24f4978bf62347b0b92d0eec48c038a75
 EBUILD nss-3.12.9-r1.ebuild 6793 RMD160 14bbb410ee3e7794ae463eb834434de50b44bc37 SHA1 7107004afd31fda20cb72124d7c81809ce97e777 SHA256 692c1e4c8756663d73b6be3ed73a62b0939f4d67b7dd54d5b95b445060f80368
-EBUILD nss-3.13.1.ebuild 7070 RMD160 feda1cc51773e32a8b0bf77fa488ec8a068d18cd SHA1 b5ed147e6c8f38afaa0e077274efbf34fe41fe6d SHA256 ce7255428c0bbfaf3217ef1c3fa722faa6e95b198d246c593833ce1292b140ce
-MISC ChangeLog 29214 RMD160 e69ada83111972f9c04da1f78d977654b7773627 SHA1 a8ca9e3f6229ce83314412005bafe5e9ebbeee1c SHA256 7a52046408c7090033820e677aa508433b9a4f51c292be7a9c5c0b5e7be12cc0
+EBUILD nss-3.13.1-r1.ebuild 6679 RMD160 8449f9112c11a347b80cd8427f3d6968435e53e9 SHA1 c0fe981222f4eb10a7bc0ee2ebd3fcd8a4ab86b6 SHA256 9e03fdd4cd50cd7fcff1d7ef10a4966291e05dc004ddb0e4e13733b88430f14a
+MISC ChangeLog 29436 RMD160 34235fd36943181720ade387b94ac97110981370 SHA1 8d03c1caa64457bfc8e1e7149d88d30b683c4e3c SHA256 14ec991748cafe3da8e140272886e916e1cdb37e1b37769e07cfdf70c9db0795
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOz9EDAAoJEF0huFKJUZL5FxgP/2LefW/GYJ1RwuLF2yZnSTfw
-xrGSem5gg3c9mJV218w92Q//dFDdJSy5aY61AvLsUynvNI2X+4b3+leDG5eHoHS2
-6rJ8s3E4Qx0FcrNtOsTBnpRTs8nBu8SpQ6A2XfhNr2PBR56Mep7m5aGkR+3uCpwU
-jeBBccpWBkY8282IQGC04GR7BQPG/ZPUtCdEy0/3XduGYhBkPci4C9S/d+Sz1Icu
-57Zau8kSaWp7SNykPnkxcE1mwmXic8LaD+ewnkN0IQA4g7GIRp37LtSOEZ1lYs6O
-8v77LRrfB1JJC9oyCOzrLqTgI2KaW8Yy4EJhCLlOTj+LXaja9AnGfGdH7Hf6Fwbi
-3JEeWl789jO8WkHiwbIFdrkLT9O4RkATeJ9FyF16X4yySUt/yUSmRtB6e/G2IvuP
-0OL7HxUO8BnSuMQjEBRJ/ZiHR8fRplggmrqKImJRp1Qv3ANrcJ33H9q4DPX8Q73/
-WF7wpyOOwgfrrb+5uFmXfET/mBx1OY63qwtuwrHjVRI5kj0GAcr0Z30ptXLjEhIn
-7W1dSykjSLkaUibb0JNszjBOu8cOpSWsZ1ia+3D/Niy0gYD15ZnIgy9L6zaDmRaU
-6aaLe0ThXDKuReC3/frDzay0ncZ8ZAXzAel9nSbHQWjuxRhQiqozc4KnGvH4ZgaM
-1SnstZyZQctdvVHW3anO
-=t6wp
+iQEcBAEBAgAGBQJO70Z2AAoJEIXV9xahDnCoA9EH/2UpLkjFzi5umlnsXmN4OzKT
+s0q2xrMzQxRg0I2zHUcsPzbaZpdSlPNZAoFzb7/VVpMGO1uNSsV5Lw1Gpy8EhFNH
+jtQP4Nv8JeyOMl0uwFH6fRmRr29cFf0CKPHTxIUeCggQ1QbHzYqc+X0TVO4eek5o
+cMEFKAPi8LdEmfdb3f2ATiIoU1fqDP1eCtsjeo5qsWuCRH2lyIQ9dq46WX1arYS+
+fyXkSMAQGz6y8LIayiHlz2zbMa02ZHkKoZPFWX9ZQU4rjsNCkoOCSld87zfzRX0w
+TqcCziew/rK+DD8VvySqPm0F4pvmHtFDykCWFsoXpnrKGnAFcMUPS6fp76HLxU8=
+=L3so
 -----END PGP SIGNATURE-----
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 000000000000..39bcc9e9cdc9
--- /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.451617325 -0600
++++ a/mozilla/security/nss/lib/util/pkcs11n.h	2011-12-11 15:19:27.652239770 -0600
+@@ -362,7 +362,7 @@
+  *  cast the resulting value to the deprecated type in the #define, thus
+  *  producting the warning when the #define is used.
+  */
+-#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
++#if (__GNUC__  == 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
index b86893a63f45..dba6274a8195 100644
--- a/dev-libs/nss/nss-3.13.1.ebuild
+++ b/dev-libs/nss/nss-3.13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.ebuild,v 1.2 2011/11/21 17:43:40 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild,v 1.1 2011/12/19 14:13:10 anarchy Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -13,11 +13,10 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE="utils"
 
-DEPEND="dev-util/pkgconfig
-	${RDEPEND}"
+DEPEND="dev-util/pkgconfig"
 RDEPEND=">=dev-libs/nspr-${NSPR_VER}
 	>=dev-db/sqlite-3.5"
 
@@ -25,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"
 
 	cd "${S}"/mozilla/security/coreconf
 	# hack nspr paths
@@ -43,20 +43,10 @@ src_prepare() {
 
 	# Fix pkgconfig file for Prefix
 	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		"${S}"/mozilla/security/nss/config/Makefile || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Fix pkgconfig for Darwin (no RPATH stuff)
-		sed -i -e 's/-Wl,-R${\?libdir}\?//' \
-			"${S}"/mozilla/security/nss/config/nss-config.in \
-			"${S}"/mozilla/security/nss/config/nss.pc.in || die
-	fi
+		"${S}"/mozilla/security/nss/config/Makefile
 
-	# Avoid install_name_tooling post install
-	sed -i -e "s:@executable_path:${EPREFIX}/usr/$(get_libdir):" \
-		"${S}"/mozilla/security/coreconf/Darwin.mk \
-		"${S}"/mozilla/security/nss/lib/freebl/config.mk || die
+	epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch"
 
-	epatch "${FILESDIR}"/${PN}-3.13.1-solaris-gcc.patch  # breaks non-gnu tools
 	# dirty hack
 	cd "${S}"/mozilla/security/nss
 	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
@@ -84,6 +74,7 @@ src_compile() {
 	export NSS_ENABLE_ECC=1
 	export XCFLAGS="${CFLAGS}"
 	export FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
 
 	cd "${S}"/mozilla/security/coreconf
 	emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
@@ -115,7 +106,7 @@ generate_chk() {
 	einfo "Resigning core NSS libraries for FIPS validation"
 	shift 2
 	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}$(get_libname)
+		local libname=lib${i}.so
 		local chkname=lib${i}.chk
 		"${shlibsign}" \
 			-i "${libdir}"/${libname} \
@@ -131,7 +122,7 @@ cleanup_chk() {
 	local libdir="$1"
 	shift 1
 	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}$(get_libname)"
+		local libfname="${libdir}/lib${i}.so"
 		# If the major version has changed, then we have old chk files.
 		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
 			&& rm -f "${libfname}.chk"
@@ -163,6 +154,9 @@ src_install () {
 		n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
 		mv ${file} ${n}
 		ln -s ${n} ${file}
+		if [[ ${CHOST} == *-darwin* ]]; then
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
+		fi
 	done
 
 	local nssutils
@@ -187,7 +181,7 @@ src_install () {
 	# shlibsign after prelink.
 	declare -a libs
 	for l in ${NSS_CHK_SIGN_LIBS} ; do
-		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}$(get_libname)")
+		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
 	done
 	OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}"
 	echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss"
@@ -197,14 +191,13 @@ src_install () {
 
 pkg_postinst() {
 	elog "We have reverted back to using upstreams soname."
-	elog "Please run revdep-rebuild --library libnss3$(get_libname 12) , this"
+	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 " links after upgrade."
 	elog
-	# We must re-sign the ELF libraries AFTER they are stripped.
-	[[ ${CHOST} != *-darwin* ]] && \
-		generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir)
+	# We must re-sign the libraries AFTER they are stripped.
+	generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir)
 }
 
 pkg_postrm() {