Remove vulnerable version and obsolete file.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

4 files changed, 20 insertions, 107 deletions

diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog
index 70858a8f3ad7..d7eceb10eab3 100644
--- a/dev-python/pycrypto/ChangeLog
+++ b/dev-python/pycrypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pycrypto
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.154 2013/11/12 20:13:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.155 2013/11/12 21:20:14 djc Exp $
+
+  12 Nov 2013; Dirkjan Ochtman <djc@gentoo.org> -files/pycrypto-2.1.0-gmp.patch,
+  -pycrypto-2.6-r2.ebuild:
+  Remove vulnerable version and obsolete file.
 
   12 Nov 2013; Agostino Sarubbo <ago@gentoo.org> pycrypto-2.6.1.ebuild:
   Stable for ia64, wrt bug #488630
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 31ac492ce5b4..1953be58ab5e 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,27 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX pycrypto-2.1.0-gmp.patch 1560 SHA256 28b77c4c99510dbcb719a7f22e9c5a36928ff11a0ee1df248947663c9232d40d SHA512 c13b371b16b1649146ceaf7ded3a43b4fbf23385a6fa9fe1e19b7a9ed96176205168c05c80f7d94d32813f98c98754c140283807ab4be95c7c623cd793ea1a09 WHIRLPOOL fbb26317c9a1475db0dd1d19f78cb2bf6d7d0a1426e3657795ccbf0702e5daf6c5d23a77314ff932a9e662b833dc7f1069a771edf54f88f0c1f4db54a59aa88f
 DIST pycrypto-2.6.1.tar.gz 446240 SHA256 f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c SHA512 20a4aed4dac4e9e61d773ebc1d48ea577e9870c33f396be53d075a9bf8487d93e75e200179882d81e452efd0f6751789bac434f6f431b3e7c1c8ef9dba392847 WHIRLPOOL b63734145729f75838357002956297d1ea9e51288939e6f481eaaa12c7da256ab95e4d80d19e618445224fb46a8e2cb1ef5ee0b4b817767d472e3a7c4707371b
-DIST pycrypto-2.6.tar.gz 443445 SHA256 7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8 SHA512 7dc82f258e87aad458e88626c5167c17ef9f967aadfc62c41592e14476acf247dd41468bc7351ebb15a6e26f106e5f62bb3a00686b18522b1607e3c7e36b53a8 WHIRLPOOL cba3519668e0aff690f07b47c3cc11d70ee909ea88e365784536abe65bec415fd9a7e4f25a3ddd2129a6aa88360b3bb3770cb343576a0ec5ebbbf9fd362fe81c
-EBUILD pycrypto-2.6-r2.ebuild 1600 SHA256 6975643b32201ffe66db3ce911cde67a6ab7c42a64f611673c17169a8ee4f4e7 SHA512 377a4681b12773c2af0ae48d71fcb815a4517432d78c81b36d3bc51ffbdafbe651068bef8dc653c70ecc2d4c3c7cb5c5599c877189b6053c8b0cea84075af8ec WHIRLPOOL 057c6e54bbca7b9f8955334d8cf5d89281189093d5b171ff4b8727c0bec253ced254b27de09dc6d336c36fa3a4bb8839eefe6cfdbc629fea0967cd71382183a7
 EBUILD pycrypto-2.6.1.ebuild 1597 SHA256 5ace4731cc10526b711a100b6b7be64137ecaaa76b0ef3ac664770a575d9b7bb SHA512 9427c38e7073c8c4b0fe2178732369672e44910ffa85a0434e3c291dab75c516d94448467241bb5f139c39a1c635650d5f6f60caa2b2cbc0f8583ba326bea765 WHIRLPOOL 3c315829c9aa91f13f89f8b91c94ad6753f0a0e53550375371a9405d35c628e41c33269385b680a4e817c40adcb6a7bbb3565bb5e4e711fa2cc228edf2ec190f
-MISC ChangeLog 19443 SHA256 fc3625266824229b1058c89944a4c35bf4645e8b6eb25690d4d669658123ad37 SHA512 9cb6c6707dd34c7dfe0a06621327de11fc983de67acbce411c4b771bcc8ea13c3682725d09d9e762425d655500a52dd19d85ab390a5efa2d3e5f3d4a1d64fd83 WHIRLPOOL 28eb99b5857a1a01d1653595c8a9da93a758a034a68ba5acda531898b210bc19cd109bb8ffa9470fe1f76bc5bd82a1baca89e4ad7c99327e058e7191e74cb4fc
+MISC ChangeLog 19599 SHA256 d86870787b7b2e1f1cb3a63c047333c33c51a9fe832d8ab6017118a7b60bca6a SHA512 a7b505ae35a113c0f65236347bd7ee9f1f79b4be3fb94cd1eb808597baa8da7a6c00ee6905d860e4cc99eb5f68c230cf683078955ea96180cc765706a4e6346b WHIRLPOOL bd320655240470d25d8c419174191c3d93925fd9df6b10fd11f94b7c66dc618e114a850e352a15e33fbc6b89d6325f0b9f40ebfb22ddbd72fcdd6e4a9ec5a00c
 MISC metadata.xml 1774 SHA256 b4fe5bcbed977469f626a33c8b9c16d860e53e16b02f78ce931f6afa67c98ac2 SHA512 162e3dd991ee53845dc67a5fa711042ce6ae00c2d0d536824c3629b361d5369568d8aca152f4113772c267263b568f944f6a9d2424a1941c59e0e5cd5c4d7a03 WHIRLPOOL 7a9f5e7b2cecaf727d1110594c3c8d521a8cde676cdd072872ffd99bde0619ffbd54455bad73e34c0917944608b42395d1de0abfbb7f3a7a755de6aa9d277f1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSgoveAAoJELp701BxlEWfEYoP+wVXQb+ZfprLULNSP3Y6t6qU
-A3EwnpSzgtda4IrpEnZIkvP8XqoTT6fXavDl1tISKDrLuTzR5Y3lBMQ6wr1IGt2P
-GGRTk+5cODx9bGZSyC9k2ggVM93m3wT7wcfFoFc+vWI0xYmXSO54/I3JNPZ9b+PR
-6haYlJYmv6Ihx4ELE8lVE5treycRuwt5aYqb0cmmHnEae5NeWDf7fjchqGm4IU3y
-9c8O1DGkk7xAwFbBqB/zGy98Wdn1DuCdyE3wb1Zeuspglw0jurTbgwU/ydqMh8Ul
-nUT4dZ+lKf1ZKONItKOsH4Rzt+8L8GbtUEExuF8tMg9YxIDb3L4iAbVb50dIS1Ij
-r2ju/2iDBj5oknFda+b6OXu4uxXXA8xDtPNty3JrF7V13VljHAyRqiP5Ed/bpITF
-ayY7Q7DFlTOybQ4U3XcxiWyyGnozTr9YJecycnWG3A99eAjWeNDsSZE3+wDV9d4m
-Ekcoz5BXDwzPD1DIgbMm8lsnfW2PM6kxSCo47yAv7alZkV0Gk6PniYSQCCwKmwON
-49BGdRZt6HYlnp5OAE+gvCJPtVj3hYKJY711JH1IlX5I450IWnssfKeaaFqPonMY
-kHTq9aqgQz1wh7koF+PAI8xHwC8YVEWeLWR/ZTX4PXY3BDx1EXMSa02y5NFgVU43
-lVcI38/f5kwv5+af1yzY
-=v3Ls
+iQIcBAEBCAAGBQJSgpudAAoJEJ+WuSkwOAOBazEP/3kJnoFE32O4K9DkdUSIGPdf
+GnRo73imqv8aYCw5jFSDbcy/MQrxHbYkznajLe0soACObp40gvnRSN7K6I+Uuq9Z
+tqQux+HoPdjib9gkET7c4Hgr1fopcU2OYigja/7fO9GNxCR4OudE9Jt+Jm8avqX4
+LJvCHMbo3ChskKHLachdr9c1ln7gWKv4pRZwR/3rQKwt8TzWnaw3dF7RLAA8sbuu
+n68J7Elwuw6yFKpcmEqSRFV6JFkkYl7R5rzokRrY0nmeHvI90CizlC9So4TmigVP
+YypKPYeaDd/5zS0BlzI7tA+THYzlagVBlX/8VrlfaOnNiXOJXw/CxXbaHLxd5n5M
+CuMOmTfisfdYEWcza9mTXp6RGbqnJ4YM/GPqypy3jx2+5haMy6SUCtiZqoJ5czEU
+7B/ShcEK0x88NudwNLwI2fYlUDH03eRLfGkQDLu1JOoReCMKlwpwj94qeitPw/2T
+Nc/nUOCiJwZTobW2rc0ZOmspZsUPHwwyw6D6ar5yJ/ChuT/lMvKhKP1d1NqkL8ze
+2+V5rubYmiqE6I45HUeTMURN/CBeUVzErPnpdxSpeVwsXOiBrtM2btmXsii3KN+L
+2nP9Neek/Qky49l/1s+RuGoaoOse8Jqq+7ZS30rQO18IaDQa6w+RYLI/9TtKhFsT
+tE38LbjOrOS0c7hA1kSr
+=lgEt
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycrypto/files/pycrypto-2.1.0-gmp.patch b/dev-python/pycrypto/files/pycrypto-2.1.0-gmp.patch
deleted file mode 100644
index 9b7c03baf93c..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.1.0-gmp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-* make GMP conditional
-* don't use hardwired search path /lib /usr/lib, but instead use the
-  python configured libdir (in particular under Prefix very important,
-  e.g. bug #291949)
-
---- setup.py
-+++ setup.py
-@@ -36,7 +36,7 @@
- 
- __revision__ = "$Id: pycrypto-2.1.0-gmp.patch,v 1.2 2009/12/23 21:56:41 grobian Exp $"
- 
--from distutils import core
-+from distutils import core, sysconfig
- from distutils.core import Extension, Command
- from distutils.command.build_ext import build_ext
- import os, sys
-@@ -151,11 +151,12 @@
-         if self.compiler.compiler_type == 'msvc':
-             self.compiler.include_dirs.insert(0, "src/inc-msvc/")
- 
--        # Detect libgmp and don't build _fastmath if it is missing.
--        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
--        if not (self.compiler.find_library_file(lib_dirs, 'gmp')):
--            print >>sys.stderr, "warning: GMP library not found; Not building Crypto.PublicKey._fastmath."
--            self.__remove_extensions(["Crypto.PublicKey._fastmath"])
-+        if os.environ.get("USE_GMP", "1") == "1":
-+            # Detect libgmp and don't build _fastmath if it is missing.
-+            lib_dirs = self.compiler.library_dirs + [sysconfig.get_config_var('LIBDIR'), '/lib', '/usr/lib']
-+            if not (self.compiler.find_library_file(lib_dirs, 'gmp')):
-+                print >>sys.stderr, "error: GMP library not found."
-+                sys.exit(1)
- 
-     def __remove_extensions(self, names):
-         """Remove the specified extension from the list of extensions to build"""
diff --git a/dev-python/pycrypto/pycrypto-2.6-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6-r2.ebuild
deleted file mode 100644
index a2a679018992..000000000000
--- a/dev-python/pycrypto/pycrypto-2.6-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6-r2.ebuild,v 1.16 2013/09/14 22:53:41 floppym Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-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 )"
-
-python_configure_all() {
-	# the configure does not interact with python in any way,
-	# it just sets up the C header file.
-	econf \
-		$(use_with gmp) \
-		--without-mpir
-}
-
-python_compile_all() {
-	if use doc; then
-		rst2html.py Doc/pycrypt.rst > Doc/index.html
-		epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die
-	fi
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( ACKS ChangeLog README TODO )
-	use doc && local HTML_DOCS=( Doc/apidoc/. Doc/index.html )
-
-	distutils-r1_python_install_all
-}