3 files changed, 49 insertions, 44 deletions

diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile
index 48dee4fe9dfb..a338edc3d9a4 100644
--- a/security/py-rsa/Makefile
+++ b/security/py-rsa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsa
-PORTVERSION=	3.0.1
+PORTVERSION=	3.1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1>=0.0.13:${PORTSDIR}/devel/py-asn1
 
-USE_ZIP=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 
diff --git a/security/py-rsa/distinfo b/security/py-rsa/distinfo
index dcbf4e3afa4f..29eb31afd85e 100644
--- a/security/py-rsa/distinfo
+++ b/security/py-rsa/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rsa-3.0.1.zip) = 2c36df5690f476154c32537b6a0a0bce85c26b4b4a365e23b6e5ac6773355668
-SIZE (rsa-3.0.1.zip) = 49380
+SHA256 (rsa-3.1.tar.gz) = 93728c699d8bb55c4edd224ef0302e1e71ab86bd46b484acc9a0927c04af0fd2
+SIZE (rsa-3.1.tar.gz) = 37580
diff --git a/security/py-rsa/pkg-plist b/security/py-rsa/pkg-plist
index c8334e2d7b39..011a9fc8c50f 100644
--- a/security/py-rsa/pkg-plist
+++ b/security/py-rsa/pkg-plist
@@ -7,58 +7,64 @@ bin/pyrsa-priv2pub
 bin/pyrsa-decrypt
 bin/pyrsa-keygen
 bin/pyrsa-decrypt-bigfile
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/bigfile.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/cli.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/common.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/core.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/key.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pem.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pkcs1.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/prime.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/randnum.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/transform.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/varblock.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version133.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version200.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/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/bigfile.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/cli.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/common.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/core.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/key.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pem.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pkcs1.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/prime.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/randnum.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/transform.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/varblock.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_compat.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_compat.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_compat.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version133.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version133.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version133.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version200.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version200.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version200.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/bigfile.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/bigfile.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/bigfile.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/cli.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/cli.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/cli.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/common.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/common.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/common.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/core.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/core.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/core.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/key.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/key.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/key.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/parallel.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/parallel.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/parallel.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pem.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pem.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pem.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pkcs1.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pkcs1.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/pkcs1.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/prime.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/prime.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/prime.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/randnum.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/randnum.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/randnum.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/transform.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/transform.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/transform.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/varblock.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/varblock.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/varblock.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version133.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/_version200.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa/__init__.pyo
-%%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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/zip-safe
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrmtry %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rsa
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/