Bump to 0.12, bug 390867. Thanks to slepnoga.

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

4 files changed, 89 insertions, 12 deletions

diff --git a/dev-python/python-nss/ChangeLog b/dev-python/python-nss/ChangeLog
index 18c8c080fc74..3f523dec3d55 100644
--- a/dev-python/python-nss/ChangeLog
+++ b/dev-python/python-nss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-nss
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/ChangeLog,v 1.3 2011/11/17 17:09:43 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/ChangeLog,v 1.4 2011/12/04 12:42:48 maksbotan Exp $
+
+*python-nss-0.12 (04 Dec 2011)
+
+  04 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> +python-nss-0.12.ebuild,
+  +files/python-nss-0.12-rsapssparams.patch:
+  Bump to 0.12, bug 390867. Thanks to slepnoga.
 
   17 Nov 2011; Peter Volkov <pva@gentoo.org> python-nss-0.8.ebuild,
   python-nss-0.8-r1.ebuild:
diff --git a/dev-python/python-nss/Manifest b/dev-python/python-nss/Manifest
index e90fd221c674..f2f4151a9f8a 100644
--- a/dev-python/python-nss/Manifest
+++ b/dev-python/python-nss/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gentoo_lib_name.patch 1772 RMD160 5a1eea8d3c681dd335486c622f6e19c11acfe461 SHA1 1d8de4d267a05b83a842c9ee8fd7985ee1b11220 SHA256 9f66cc2bfdd12b4b7ae9f8f3cf39db5b588025a83e8b1008dad823616a494902
+AUX python-nss-0.12-rsapssparams.patch 1030 RMD160 b75756372fc2fec626f93f909bc66c38fcbfd85f SHA1 c9b9b1c171b8201d31a9ee305986662af9ab4280 SHA256 0b58ebe23d144a6dcd40c9850306b733f3a4bcb63644dfba236c0fdc3522811a
+DIST python-nss-0.12.tar.bz2 167007 RMD160 a925360abfcad0884c9e9744f80089ca0824b633 SHA1 715874f00985875fcd816c2bfd19ea8d9f830369 SHA256 e1084fef686f5b2f74f47fa46a7403d8b747ad14be7d9b3685b1bb105a4283cb
 DIST python-nss-0.8.tar.lzma 108903 RMD160 e636140ab155e64d99e9eb1b5d574ae1e966cf07 SHA1 ad67c7c5e65be0054c98aea0eced12414208352a SHA256 6af55f01782867b2bc9ce09838c385ba9340c2a0646c3cf1ec1931892f64086a
+EBUILD python-nss-0.12.ebuild 1398 RMD160 4e8b839b3d274d227b9a6f2d312a809ab629df1c SHA1 58cd3eb9ba99e3fee0f67f0c204787b290644d39 SHA256 fc1af05343c0c23a1f3b1cb72ed945c1c2e9041ba550d8443a6a74cba2493d2c
 EBUILD python-nss-0.8-r1.ebuild 1228 RMD160 1c0c96d4bca426056fbae0fd4d0e36f792f2b49a SHA1 dcdcd36b27e98e872cd8ce46984014b8c80280db SHA256 1f0e538055d3ca46757a56e58b6a806d93df1529aebd9e2d47b800f6e6ff771f
 EBUILD python-nss-0.8.ebuild 1209 RMD160 1e49c1f698a349b7859634f9be11ef75409c9aee SHA1 534af2183baf26a83e3b6837b0af4a0a84e53086 SHA256 2e36c7bcd97f7fb9d19c81716ecbcf615ac101d420a732ec802ef954de0867b7
-MISC ChangeLog 743 RMD160 31a7fc1ee8c363a22967fe2749a57802825bcb79 SHA1 411703547bdad0db214063aed89cbc84b7f9f500 SHA256 f444c9ef690405d5ca743562ab415f5cc5c3dc797b86f37259550ae1bc345a13
+MISC ChangeLog 952 RMD160 bdef8d4cbd838adddea46cad447a43643ac02f7e SHA1 0fb3286e1de433253c43de591b861175555aa488 SHA256 6dbcf1ea2f39bd159166b56e2f332419b1919838311b04ac22ed1ea059e2da4d
 MISC metadata.xml 502 RMD160 edf16334a8e38ff7c9954e83c9936fe056d3f7b5 SHA1 d2d73949f821ea8ea628e463de70ac937b94e692 SHA256 cf743fc45431ffa0c5d1bde902dd0179270818125e7a63d58a724455570ac248
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk7FP90ACgkQGrk+8vGYmwfJ5wEAlX9J2RJ0QXkqu/7Cmt/DZa0u
-s6MTDvutOpvpsxi3V6YA/RKVTzTUVzkcs/AgLW6D9kq9GH3FMnx0pp59rlK/yhqN
-=x++9
------END PGP SIGNATURE-----
diff --git a/dev-python/python-nss/files/python-nss-0.12-rsapssparams.patch b/dev-python/python-nss/files/python-nss-0.12-rsapssparams.patch
new file mode 100644
index 000000000000..cea6f1d1ac4e
--- /dev/null
+++ b/dev-python/python-nss/files/python-nss-0.12-rsapssparams.patch
@@ -0,0 +1,25 @@
+RCS file: /cvsroot/mozilla/security/python/nss/src/py_nss.c,v
+retrieving revision 1.23
+diff -b -u -r1.23 py_nss.c
+--- src/py_nss.c	6 Jun 2011 15:21:13 -0000	1.23
++++ src/py_nss.c	17 Nov 2011 21:11:40 -0000
+@@ -4669,7 +4669,7 @@
+     }
+
+     if (params.hashAlg) {
+-        obj = oid_secitem_to_pystr_desc(&params->hashAlg->algorithm);
++        obj = oid_secitem_to_pystr_desc(&params.hashAlg->algorithm);
+     } else {
+         obj = PyString_FromString("default, SHA-1");
+     }
+@@ -4677,8 +4677,8 @@
+     Py_CLEAR(obj);
+
+     if (params.maskAlg) {
+-        obj = oid_secitem_to_pystr_desc(&params->maskAlg->algorithm);
+-        if (SEC_QuickDERDecodeItem(pool, &mask_hash_alg,
++        obj = oid_secitem_to_pystr_desc(&params.maskAlg->algorithm);
++        if (SEC_QuickDERDecodeItem(arena, &mask_hash_alg,
+                                    SEC_ASN1_GET(SECOID_AlgorithmIDTemplate),
+                                    &params.maskAlg->parameters) == SECSuccess) {
+             obj1 = oid_secitem_to_pystr_desc(&mask_hash_alg);
diff --git a/dev-python/python-nss/python-nss-0.12.ebuild b/dev-python/python-nss/python-nss-0.12.ebuild
new file mode 100644
index 000000000000..bafb8075eff2
--- /dev/null
+++ b/dev-python/python-nss/python-nss-0.12.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.12.ebuild,v 1.1 2011/12/04 12:42:48 maksbotan Exp $
+
+EAPI="4"
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils versionator
+
+MY_PV="$(replace_all_version_separators  '_' )_0"
+DESCRIPTION="Python bindings for Network Security Services (NSS)"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/PYNSS_RELEASE_${MY_PV}/src/${P}.tar.bz2"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-libs/nss
+	dev-libs/nspr
+	doc? ( dev-python/docutils
+			dev-python/epydoc )"
+
+RDEPEND="${DEPEND}"
+
+DOCS="README doc/ChangeLog"
+
+src_prepare() {
+	# RHB #754750 ; bgo #390869	
+	epatch "${FILESDIR}/python-nss-0.12-rsapssparams.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		einfo "Generating API documentation..."
+
+		mkdir "${S}"/doc/html
+		PYTHONPATH="${ED}$(python_get_sitedir -f)" epydoc --html --docformat restructuredtext \
+			-o "${S}"/doc/html \
+			 "$(ls -d build-$(PYTHON -f --ABI)/lib.*)/nss"
+
+		dohtml -r "${S}"/doc/html/
+		insinto /usr/share/doc/"${PF}"
+		doins -r ./test
+		insinto /usr/share/doc/"${PF}"/examples
+		doins doc/examples/*.py
+	fi
+}