Update py-crypto to 2.4.1 and install doc under py-XXX for upcoming
python 2 and 3 compatibility.
Ok?
Martin
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/py-crypto/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 4 Nov 2011 13:36:16 -0000 1.23
+++ Makefile 26 Dec 2011 09:10:51 -0000
@@ -4,13 +4,11 @@ SHARED_ONLY = Yes
COMMENT = cryptographic tools for Python
-MODPY_EGG_VERSION = 2.3
+MODPY_EGG_VERSION = 2.4.1
DISTNAME = pycrypto-${MODPY_EGG_VERSION}
PKGNAME = py-crypto-${MODPY_EGG_VERSION}
CATEGORIES = security devel
-REVISION = 0
-
HOMEPAGE = https://www.dlitz.net/software/pycrypto/
MAINTAINER = Martin Pieuchot <[email protected]>
@@ -38,7 +36,7 @@ pre-configure:
post-install:
${INSTALL_DATA_DIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/py-crypto
do-regress: fake
cd ${WRKSRC} && ${MAKE_ENV} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/py-crypto/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 8 Oct 2011 14:56:34 -0000 1.6
+++ distinfo 23 Dec 2011 18:28:51 -0000
@@ -1,5 +1,5 @@
-MD5 (pycrypto-2.3.tar.gz) = K4Ec+/w0LYPuYUCX7/uBAQ==
-RMD160 (pycrypto-2.3.tar.gz) = W3sVqrP14zETuhl6Lt1inHJZU3Q=
-SHA1 (pycrypto-2.3.tar.gz) = lrM7d+cpiTvQg3oJpqp6ErUHADc=
-SHA256 (pycrypto-2.3.tar.gz) = TxHoX7zxOWA3NlD8La6PCI+bAB8H+20++y/LUzSYcYI=
-SIZE (pycrypto-2.3.tar.gz) = 331476
+MD5 (pycrypto-2.4.1.tar.gz) = wqFASoSHl/sIBvPhHCnvFQ==
+RMD160 (pycrypto-2.4.1.tar.gz) = fb87DKEOj3KHcvCygmZ+S6lGYcU=
+SHA1 (pycrypto-2.4.1.tar.gz) = 2gKDWZhskSW4gLW2K3yLoGtzMoI=
+SHA256 (pycrypto-2.4.1.tar.gz) = T/X3AIhpyFCdFqMfKFufY0DEqf9wPIUpiDKihpIQsVQ=
+SIZE (pycrypto-2.4.1.tar.gz) = 383032
Index: patches/patch-lib_Crypto_SelfTest_Cipher___init___py
===================================================================
RCS file:
/cvs/ports/security/py-crypto/patches/patch-lib_Crypto_SelfTest_Cipher___init___py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_Crypto_SelfTest_Cipher___init___py
--- patches/patch-lib_Crypto_SelfTest_Cipher___init___py 9 Oct 2011
15:09:55 -0000 1.2
+++ patches/patch-lib_Crypto_SelfTest_Cipher___init___py 26 Dec 2011
08:51:36 -0000
@@ -1,10 +1,11 @@
---- lib/Crypto/SelfTest/Cipher/__init__.py.orig Fri Aug 27 06:41:55 2010
-+++ lib/Crypto/SelfTest/Cipher/__init__.py Sun Oct 9 17:06:47 2011
-@@ -29,7 +29,6 @@ __revision__ = "$Id:
patch-lib_Crypto_SelfTest_Cipher___init___py,v 1.2 2011/10/09 15:09:55
ajacoutot Exp $"
+$OpenBSD$
+--- lib/Crypto/SelfTest/Cipher/__init__.py.orig Fri Nov 4 20:17:40 2011
++++ lib/Crypto/SelfTest/Cipher/__init__.py Mon Dec 26 09:48:45 2011
+@@ -29,7 +29,6 @@
def get_tests(config={}):
tests = []
- import test_AES; tests += test_AES.get_tests(config=config)
-- import test_ARC2; tests += test_ARC2.get_tests(config=config)
- import test_ARC4; tests += test_ARC4.get_tests(config=config)
- import test_Blowfish; tests += test_Blowfish.get_tests(config=config)
- import test_CAST; tests += test_CAST.get_tests(config=config)
+ from Crypto.SelfTest.Cipher import test_AES; tests +=
test_AES.get_tests(config=config)
+- from Crypto.SelfTest.Cipher import test_ARC2; tests +=
test_ARC2.get_tests(config=config)
+ from Crypto.SelfTest.Cipher import test_ARC4; tests +=
test_ARC4.get_tests(config=config)
+ from Crypto.SelfTest.Cipher import test_Blowfish; tests +=
test_Blowfish.get_tests(config=config)
+ from Crypto.SelfTest.Cipher import test_CAST; tests +=
test_CAST.get_tests(config=config)
Index: patches/patch-lib_Crypto_SelfTest_Hash___init__py
===================================================================
RCS file:
/cvs/ports/security/py-crypto/patches/patch-lib_Crypto_SelfTest_Hash___init__py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_Crypto_SelfTest_Hash___init__py
--- patches/patch-lib_Crypto_SelfTest_Hash___init__py 9 Oct 2011 15:09:55
-0000 1.2
+++ patches/patch-lib_Crypto_SelfTest_Hash___init__py 26 Dec 2011 08:51:39
-0000
@@ -1,10 +1,11 @@
---- lib/Crypto/SelfTest/Hash/__init__.py.orig Fri Aug 27 06:41:55 2010
-+++ lib/Crypto/SelfTest/Hash/__init__.py Sun Oct 9 17:06:47 2011
-@@ -29,7 +29,6 @@ __revision__ = "$Id:
patch-lib_Crypto_SelfTest_Hash___init__py,v 1.2 2011/10/09 15:09:55 ajacoutot
Exp $"
+$OpenBSD$
+--- lib/Crypto/SelfTest/Hash/__init__.py.orig Fri Nov 4 20:17:40 2011
++++ lib/Crypto/SelfTest/Hash/__init__.py Mon Dec 26 09:50:24 2011
+@@ -29,7 +29,6 @@
def get_tests(config={}):
tests = []
- import test_HMAC; tests += test_HMAC.get_tests(config=config)
-- import test_MD2; tests += test_MD2.get_tests(config=config)
- import test_MD4; tests += test_MD4.get_tests(config=config)
- import test_MD5; tests += test_MD5.get_tests(config=config)
- import test_RIPEMD; tests += test_RIPEMD.get_tests(config=config)
+ from Crypto.SelfTest.Hash import test_HMAC; tests +=
test_HMAC.get_tests(config=config)
+- from Crypto.SelfTest.Hash import test_MD2; tests +=
test_MD2.get_tests(config=config)
+ from Crypto.SelfTest.Hash import test_MD4; tests +=
test_MD4.get_tests(config=config)
+ from Crypto.SelfTest.Hash import test_MD5; tests +=
test_MD5.get_tests(config=config)
+ from Crypto.SelfTest.Hash import test_RIPEMD; tests +=
test_RIPEMD.get_tests(config=config)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/py-crypto/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 8 Oct 2011 14:56:34 -0000 1.7
+++ pkg/PLIST 26 Dec 2011 09:11:23 -0000
@@ -21,7 +21,13 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/RIPEMD160.so
lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/SHA.py
lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/SHA.pyc
+lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/SHA224.py
+lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/SHA224.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/SHA256.so
+lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/SHA384.py
+lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/SHA384.pyc
+lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/SHA512.py
+lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/SHA512.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/__init__.py
lib/python${MODPY_VERSION}/site-packages/Crypto/Hash/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/Protocol/
@@ -112,11 +118,19 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_RIPEMD.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA.py
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA.pyc
+lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA224.py
+lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA224.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA256.py
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA256.pyc
+lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA384.py
+lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA384.pyc
+lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA512.py
+lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Hash/test_SHA512.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Protocol/
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Protocol/__init__.py
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Protocol/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Protocol/test_AllOrNothing.py
+lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Protocol/test_AllOrNothing.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Protocol/test_chaffing.py
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Protocol/test_chaffing.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/SelfTest/Protocol/test_rfc1751.py
@@ -188,8 +202,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/Crypto/Util/asn1.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/Util/number.py
lib/python${MODPY_VERSION}/site-packages/Crypto/Util/number.pyc
-lib/python${MODPY_VERSION}/site-packages/Crypto/Util/python_compat.py
-lib/python${MODPY_VERSION}/site-packages/Crypto/Util/python_compat.pyc
+lib/python${MODPY_VERSION}/site-packages/Crypto/Util/py21compat.py
+lib/python${MODPY_VERSION}/site-packages/Crypto/Util/py21compat.pyc
+lib/python${MODPY_VERSION}/site-packages/Crypto/Util/py3compat.py
+lib/python${MODPY_VERSION}/site-packages/Crypto/Util/py3compat.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/Util/randpool.py
lib/python${MODPY_VERSION}/site-packages/Crypto/Util/randpool.pyc
lib/python${MODPY_VERSION}/site-packages/Crypto/Util/strxor.so
@@ -200,5 +216,5 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/Crypto/pct_warnings.py
lib/python${MODPY_VERSION}/site-packages/Crypto/pct_warnings.pyc
lib/python${MODPY_VERSION}/site-packages/pycrypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
-share/doc/py-crypto/
-share/doc/py-crypto/README
+share/doc/${MODPY_PY_PREFIX}crypto/
+share/doc/${MODPY_PY_PREFIX}crypto/README
