4 files changed, 46 insertions, 34 deletions

diff --git a/security/py-pycrypto/Makefile b/security/py-pycrypto/Makefile
index 94de76f5c0b2..b8eea66b3657 100644
--- a/security/py-pycrypto/Makefile
+++ b/security/py-pycrypto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pycrypto
-PORTVERSION=	2.3
+PORTVERSION=	2.4
 CATEGORIES=	security python
 MASTER_SITES=	http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,6 +16,10 @@ COMMENT=	The Python Cryptography Toolkit
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+HAS_CONFIGURE=	yes
+USE_AUTOTOOLS=	autoconf
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 
diff --git a/security/py-pycrypto/distinfo b/security/py-pycrypto/distinfo
index 00859a051561..b7f4eaafd72c 100644
--- a/security/py-pycrypto/distinfo
+++ b/security/py-pycrypto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pycrypto-2.3.tar.gz) = 4f11e85fbcf13960373650fc2dae8f088f9b001f07fb6d3efb2fcb5334987182
-SIZE (pycrypto-2.3.tar.gz) = 331476
+SHA256 (pycrypto-2.4.tar.gz) = f49d8aea2d7d65db9906c7d3b8b3a07fcae8387cf5cb06a7510383e211902d39
+SIZE (pycrypto-2.4.tar.gz) = 382924
diff --git a/security/py-pycrypto/files/patch-setup.py b/security/py-pycrypto/files/patch-setup.py
index 642c54eac5a6..b6a7f4f1ecfe 100644
--- a/security/py-pycrypto/files/patch-setup.py
+++ b/security/py-pycrypto/files/patch-setup.py
@@ -1,27 +1,10 @@
---- setup.py.orig	2010-08-08 14:02:23.895825034 +0200
-+++ setup.py	2010-08-08 14:04:31.663792751 +0200
-@@ -139,6 +139,7 @@
+--- setup.py.orig	2011-11-01 17:47:23.000000000 +0400
++++ setup.py	2011-11-01 17:54:51.000000000 +0400
+@@ -177,6 +177,7 @@
                  # especially helps the DES modules.
                  self.__add_compiler_option("-O3")
                  self.__add_compiler_option("-fomit-frame-pointer")
 +                self.__add_compiler_option("-D_WCHAR_T_DEFINED")
                  # Don't include debug symbols unless debugging
                  self.__remove_compiler_option("-g")
-                 # Don't include profiling information (incompatible with -fomit-frame-pointer)
-@@ -157,7 +158,7 @@
-             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']
-+        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib', '%%LOCALBASE%%/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"])
-@@ -264,6 +265,7 @@
-             Extension("Crypto.PublicKey._fastmath",
-                       include_dirs=['src/'],
-                       libraries=['gmp'],
-+                      library_dirs=['%%LOCALBASE%%/lib'],
-                       sources=["src/_fastmath.c"]),
- 
-             # Hash functions
+                 # Don't include profiling information (incompatible with
diff --git a/security/py-pycrypto/pkg-plist b/security/py-pycrypto/pkg-plist
index 845f9ba31305..c1ffa620a949 100644
--- a/security/py-pycrypto/pkg-plist
+++ b/security/py-pycrypto/pkg-plist
@@ -24,7 +24,16 @@
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA.py
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA224.py
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA224.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA224.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA256.so
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA384.py
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA384.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA384.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA512.py
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA512.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Hash/SHA512.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/__init__.py
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Hash/__init__.pyo
@@ -55,6 +64,7 @@
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/__init__.py
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_fastmath.so
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_slowmath.py
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_slowmath.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/PublicKey/_slowmath.pyo
@@ -154,12 +164,24 @@
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA.py
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA224.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA224.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA224.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA256.py
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA256.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA256.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA384.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA384.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA384.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA512.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA512.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash/test_SHA512.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/__init__.py
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_AllOrNothing.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_AllOrNothing.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_AllOrNothing.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_chaffing.py
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_chaffing.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol/test_chaffing.pyo
@@ -220,12 +242,12 @@
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.py
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_asn1.py
-%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_asn1.pyc
-%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_asn1.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.py
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_asn1.py
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_asn1.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_asn1.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_number.py
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_number.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_number.pyo
@@ -238,9 +260,6 @@
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.py
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.pyo
-%%PYTHON_SITELIBDIR%%/Crypto/Util/asn1.py
-%%PYTHON_SITELIBDIR%%/Crypto/Util/asn1.pyc
-%%PYTHON_SITELIBDIR%%/Crypto/Util/asn1.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.py
 %%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.pyo
@@ -254,12 +273,18 @@
 %%PYTHON_SITELIBDIR%%/Crypto/Util/_number_new.py
 %%PYTHON_SITELIBDIR%%/Crypto/Util/_number_new.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Util/_number_new.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Util/asn1.py
+%%PYTHON_SITELIBDIR%%/Crypto/Util/asn1.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Util/asn1.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/Util/number.py
 %%PYTHON_SITELIBDIR%%/Crypto/Util/number.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Util/number.pyo
-%%PYTHON_SITELIBDIR%%/Crypto/Util/python_compat.py
-%%PYTHON_SITELIBDIR%%/Crypto/Util/python_compat.pyc
-%%PYTHON_SITELIBDIR%%/Crypto/Util/python_compat.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Util/py21compat.py
+%%PYTHON_SITELIBDIR%%/Crypto/Util/py21compat.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Util/py21compat.pyo
+%%PYTHON_SITELIBDIR%%/Crypto/Util/py3compat.py
+%%PYTHON_SITELIBDIR%%/Crypto/Util/py3compat.pyc
+%%PYTHON_SITELIBDIR%%/Crypto/Util/py3compat.pyo
 %%PYTHON_SITELIBDIR%%/Crypto/Util/randpool.py
 %%PYTHON_SITELIBDIR%%/Crypto/Util/randpool.pyc
 %%PYTHON_SITELIBDIR%%/Crypto/Util/randpool.pyo
@@ -280,8 +305,8 @@
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Protocol
-@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Hash
+@dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Cipher
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/SelfTest
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/Random/OSRNG
 @dirrm %%PYTHON_SITELIBDIR%%/Crypto/Random/Fortuna