3 files changed, 65 insertions, 57 deletions

diff --git a/security/py-pycryptopp/Makefile b/security/py-pycryptopp/Makefile
index 3dceb6dcf944..e2854c9cf189 100644
--- a/security/py-pycryptopp/Makefile
+++ b/security/py-pycryptopp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pycryptopp
-PORTVERSION=	0.5.12
+PORTVERSION=	0.5.14
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,8 +14,15 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Python Wrappers for the Crypto++ Library
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}darcsver>0:${PORTSDIR}/devel/py-darcsver \
+		${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:${PORTSDIR}/devel/py-setuptools_darcs
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 PYEASYINSTALL_ARCHDEP=	yes
 
+post-extract:
+	@${REINPLACE_CMD} -e 's#<malloc.h>#<stdlib.h>#g' ${WRKSRC}/cryptopp/rijndael.cpp
+
 .include <bsd.port.mk>
diff --git a/security/py-pycryptopp/distinfo b/security/py-pycryptopp/distinfo
index 2192fc709193..a32a482af916 100644
--- a/security/py-pycryptopp/distinfo
+++ b/security/py-pycryptopp/distinfo
@@ -1,3 +1,3 @@
-MD5 (pycryptopp-0.5.12.tar.gz) = e2b6ae1ea19c6d690b2dc66e6af7c2c9
-SHA256 (pycryptopp-0.5.12.tar.gz) = 860caaf77a69308ce88bc382279a0946907d62bc2f676001150d2c4496490c25
-SIZE (pycryptopp-0.5.12.tar.gz) = 1380921
+MD5 (pycryptopp-0.5.14.tar.gz) = 1300f6e977d0b5d33924be4b39dc6ecd
+SHA256 (pycryptopp-0.5.14.tar.gz) = 341fb80165e3ac4825ca25bb74e198b3e64bff6fd134d0e71d4284d8f0f67df7
+SIZE (pycryptopp-0.5.14.tar.gz) = 1057971
diff --git a/security/py-pycryptopp/pkg-plist b/security/py-pycryptopp/pkg-plist
index 21af513fea7f..3cbb782cc9c1 100644
--- a/security/py-pycryptopp/pkg-plist
+++ b/security/py-pycryptopp/pkg-plist
@@ -1,79 +1,80 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/_version.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/stdeb.cfg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/_version.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/_pycryptopp.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/_pycryptopp.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/_pycryptopp.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/_pycryptopp.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/_version.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/_version.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/_version.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher/aesmodule.cpp
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher/aes.so
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher/aes.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher/aes.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher/aes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/rsa.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/ecdsamodule.cpp
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/rsamodule.cpp
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/rsa.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/rsa.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/rsa.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher/aes.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/sha256.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/sha256module.cpp
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/sha256.so
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/sha256.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/sha256.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_rsa.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_sha256.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash/sha256.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/ecdsa.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/ecdsa.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/ecdsa.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/rsa.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/rsa.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey/rsa.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_aes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_ecdsa.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_rsa.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_sha256.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_aes.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_aes.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_aes.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_ecdsa.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_ecdsa.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_ecdsa.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_rsa.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_rsa.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_rsa.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_sha256.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_sha256.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_sha256.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_aes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/test_ecdsa.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/SHA256LongMsg.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/SHA256Monte.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/SHA256ShortMsg.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/KAT_AES/ECBGFSbox128e.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/KAT_AES/ECBGFSbox256e.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/KAT_AES/ECBKeySbox128e.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/KAT_AES/ECBKeySbox256e.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/KAT_AES/ECBVarKey128e.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/KAT_AES/ECBVarKey256e.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/KAT_AES/ECBVarTxt128e.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/KAT_AES/ECBVarTxt256e.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/python-pycryptopp/COPYING.GPL
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/python-pycryptopp/COPYING.TGPPL.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/python-pycryptopp/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/KAT_AES/ECBGFSbox128e.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/KAT_AES/ECBGFSbox256e.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/KAT_AES/ECBKeySbox128e.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/KAT_AES/ECBKeySbox256e.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/KAT_AES/ECBVarKey128e.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/KAT_AES/ECBVarKey256e.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/KAT_AES/ECBVarTxt128e.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/KAT_AES/ECBVarTxt256e.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/SHA256LongMsg.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/SHA256Monte.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/SHA256ShortMsg.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/pycryptopp/COPYING.GPL
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/pycryptopp/COPYING.TGPPL.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/pycryptopp/README.txt
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/cipher
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/hash
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors/KAT_AES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test/vectors
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/publickey
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/test
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors/KAT_AES
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp/testvectors
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pycryptopp
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/python-pycryptopp
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc/pycryptopp
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/doc
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%