Bump to 2.6, fixes security bug 417625. Thanks to Agostino Sarubbo <ago@gentoo.org>

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

3 files changed, 79 insertions, 6 deletions

diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog
index 49e329c344f9..7fb77f93bc3d 100644
--- a/dev-python/pycrypto/ChangeLog
+++ b/dev-python/pycrypto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pycrypto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.116 2012/04/01 15:20:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.117 2012/05/26 12:19:48 maksbotan Exp $
+
+*pycrypto-2.6 (26 May 2012)
+
+  26 May 2012; Maxim Koltsov <maksbotan@gentoo.org> +pycrypto-2.6.ebuild:
+  Bump to 2.6, fixes security bug 417625. Thanks to Agostino Sarubbo
+  <ago@gentoo.org>
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> pycrypto-2.4.1.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #406439
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 1e252e22e6c7..c11a347508e3 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -5,15 +5,21 @@ AUX pycrypto-2.1.0-gmp.patch 1560 RMD160 699354d2d75b5f026066ca014a9acc820db7be5
 DIST pycrypto-2.3.tar.gz 331476 RMD160 5b7b15aab3f5e33113ba197a2edd629c72595374 SHA1 96b33b77e729893bd0837a09a6aa7a12b5070037 SHA256 4f11e85fbcf13960373650fc2dae8f088f9b001f07fb6d3efb2fcb5334987182
 DIST pycrypto-2.4.1.tar.gz 383032 RMD160 7dbf3b0ca10e8f728772f0b282667e4ba94661c5 SHA1 da028359986c9125b880b5b62b7c8ba06b733282 SHA256 4ff5f7008869c8509d16a31f285b9f6340c4a9ff703c85298832a2869210b154
 DIST pycrypto-2.5.tar.gz 426802 RMD160 12f814b7c5e8842aa61bf28c5e877bba4433fdbe SHA1 1fe50712e0776b45900f8032357201239223ab7e SHA256 e950a78184e2a7defccf5d45e0c29c1e9edeb29984433f0d110a21e9631e38de
+DIST pycrypto-2.6.tar.gz 443445 RMD160 5782b529d59f2a62951607fdafaa434aea13ee0a SHA1 c17e41a80b3fbf2ee4e8f2d8bb9e28c5d08bbb84 SHA256 7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8
 EBUILD pycrypto-2.3.ebuild 1874 RMD160 552e850883f198a2d0b4de3b4a7cc1716b9ee031 SHA1 38540804b95749fbdbc730850f3a86c836185a3f SHA256 14eeddcee8470a4cf4e43367089f66adf7387a96fe7d6ba2ec517754f389ebe8
 EBUILD pycrypto-2.4.1.ebuild 2016 RMD160 bc80cf9a4a14fa01e686329851d8f9c2bc32a203 SHA1 74955f8e3499dd3e5135bd193507946eb139b269 SHA256 4335b3f36e779c7c7ce362a80404244db574855542977b49bfe4b9f4aff0bbe1
 EBUILD pycrypto-2.5.ebuild 2026 RMD160 357bfa264c671f80c5cdc120a63f17ca9d6519ea SHA1 bdd694a381e917d891a37789b36443628ff4029c SHA256 c6eb1f5e09bc3565557237bddc27c4cd9400ac6cc984eb9bd47e4a40b3c4fa56
-MISC ChangeLog 15079 RMD160 5fd38247289f83d31ac9d449d49452aa2969433f SHA1 64d845ff8d978a9a2c0ee3e9d5282f17b94d7ae6 SHA256 aff1e471261ff44713d880ea0fbe4c6e311bc7e2d7b99ea5e17fecb93f728d42
+EBUILD pycrypto-2.6.ebuild 1902 RMD160 6d357680aa44f4ab6c1185ac9b55b5b0d95a0e43 SHA1 5a0de7869dff76314e145c37eb948b97e90630e4 SHA256 5a58a4fb3d8878c13868dd10be89c5fc143eb6b9363344ad2af033aa19275d9d
+MISC ChangeLog 15273 RMD160 487c33dbbe0328acec44d61387f8c8fb4c9a572d SHA1 c79d2133898020354e3a168da06af465ab5c0527 SHA256 9ed2270854a1ba79ba5f6dc1728a65e4cba7df8dc117702a449c3cb78d60bc6d
 MISC metadata.xml 1774 RMD160 b0aeda4d69c1dc4ec798f05f617a2d0ddf8c29ab SHA1 00da4a85672688868003fecd52b3a9497a3c433c SHA256 b4fe5bcbed977469f626a33c8b9c16d860e53e16b02f78ce931f6afa67c98ac2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk94cjcACgkQuQc30/atMkDs4wCfeQYGHzQERcDrPZFxL587+q6L
-NcIAnj+gTIz2y0uHkRNUTcGynGfkpsPr
-=2NN9
+iQEcBAEBAgAGBQJPwMqCAAoJEAmJmMX429reboUIAIgBSk8hNtgjgZqVvzOXL+36
+sdc1mCLDZ1UB0mfvYOpn5E8tvQN4pNyPTum7YAZI2wFSkymzg5v6NJ7P3V+LWudX
+P9eHLZZLuubjrpajM0svq6Jd49qL3tx3AAUifSJOx9MT1detUUQjR8nBscRMHisj
+vzmYtjbORFG+xTpeFZyM73YQ4D87BHjk22vDMphMUs5pkP/Vl5w7T8pKTKFjQLGv
+YiNmg+qqqTAaFW3dhwMlutCgl2QbDj1k+t7pWpJxGHq7ZWBajViLWPF+dH4Z+IMj
+ysuEOY2qhscZBLKrPD11df/X0BfXLvLp5hcWCstKvG7gRvGJaR4py5Rw+GgCCoU=
+=E1Zu
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycrypto/pycrypto-2.6.ebuild b/dev-python/pycrypto/pycrypto-2.6.ebuild
new file mode 100644
index 000000000000..97b69b02d85c
--- /dev/null
+++ b/dev-python/pycrypto/pycrypto-2.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.ebuild,v 1.1 2012/05/26 12:19:48 maksbotan Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils eutils
+
+DESCRIPTION="Python Cryptography Toolkit"
+HOMEPAGE="http://www.dlitz.net/software/pycrypto/ http://pypi.python.org/pypi/pycrypto"
+SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
+
+LICENSE="PSF-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc +gmp"
+
+RDEPEND="gmp? ( dev-libs/gmp )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils >=dev-python/epydoc-3 )"
+
+# Some tests fail with some limit of inlining of functions.
+# Avoid warnings about breaking strict-aliasing rules.
+PYTHON_CFLAGS=("2.* + -fno-inline-functions -fno-strict-aliasing")
+
+DOCS="ACKS ChangeLog README TODO"
+PYTHON_MODNAME="Crypto"
+
+src_prepare() {
+	distutils_src_prepare
+}
+
+src_configure() {
+	#Mimic behavoir of 2.5 ebuild about disabling mpir
+	econf \
+		$(use_with gmp) \
+		--without-mpir || die "econf failed"
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		rst2html.py Doc/pycrypt.rst > Doc/index.html
+		PYTHONPATH="$(ls -d build-$(PYTHON --ABI -f)/lib.*)" epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die "Generation of documentation failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml Doc/index.html || die "dohtml failed"
+		dohtml Doc/apidoc/* || die "dohtml failed"
+	fi
+}