py-rsa: updated to 4.0

Version 4.0:
- Removed deprecated modules:
    - rsa.varblock
    - rsa.bigfile
    - rsa._version133
    - rsa._version200
- Removed CLI commands that use the VARBLOCK/bigfile format.
- Ensured that PublicKey.save_pkcs1() and PrivateKey.save_pkcs1() always return bytes.
- Dropped support for Python 2.6 and 3.3.
- Dropped support for Psyco.
- Miller-Rabin iterations determined by bitsize of key.
- Added function rsa.find_signature_hash() to return the name of the hashing
  algorithm used to sign a message. rsa.verify() now also returns that name,
  instead of always returning True.
- Add support for SHA-224 for PKCS1 signatures.
- Transitioned from requirements.txt to Pipenv for package management.

4 files changed, 38 insertions, 32 deletions

diff --git a/security/py-rsa/ALTERNATIVES b/security/py-rsa/ALTERNATIVES
new file mode 100644
index 00000000000..f83a6d6a313
--- /dev/null
+++ b/security/py-rsa/ALTERNATIVES
@@ -0,0 +1,6 @@
+bin/pyrsa-decrypt @PREFIX@/bin/pyrsa-decrypt-@PYVERSSUFFIX@
+bin/pyrsa-encrypt @PREFIX@/bin/pyrsa-encrypt-@PYVERSSUFFIX@
+bin/pyrsa-keygen @PREFIX@/bin/pyrsa-keygen-@PYVERSSUFFIX@
+bin/pyrsa-priv2pub @PREFIX@/bin/pyrsa-priv2pub-@PYVERSSUFFIX@
+bin/pyrsa-sign @PREFIX@/bin/pyrsa-sign-@PYVERSSUFFIX@
+bin/pyrsa-verify @PREFIX@/bin/pyrsa-verify-@PYVERSSUFFIX@
diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile
index 689c0316125..9b92c649896 100644
--- a/security/py-rsa/Makefile
+++ b/security/py-rsa/Makefile
@@ -1,20 +1,28 @@
-# $NetBSD: Makefile,v 1.6 2017/09/04 18:08:27 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/10/07 10:41:52 adam Exp $
 
-DISTNAME=	rsa-3.4.2
+DISTNAME=	rsa-4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=r/rsa/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://stuvel.eu/rsa
+HOMEPAGE=	https://github.com/sybrenstuvel/python-rsa
 COMMENT=	Pure-Python RSA implementation
 LICENSE=	apache-2.0
 
+DEPENDS+=	${PYPKGPREFIX}-asn1>=0.1.3:../../security/py-asn1
+TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+
 USE_LANGUAGES=	# none
 
-DEPENDS+=	${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
-BUILD_DEPENDS+=	${PYPKGPREFIX}-constants-[0-9]*:../../devel/py-constants
-BUILD_DEPENDS+=	${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && \
+		${MV} pyrsa-decrypt pyrsa-decrypt-${PYVERSSUFFIX} && \
+		${MV} pyrsa-encrypt pyrsa-encrypt-${PYVERSSUFFIX} && \
+		${MV} pyrsa-keygen pyrsa-keygen-${PYVERSSUFFIX} && \
+		${MV} pyrsa-priv2pub pyrsa-priv2pub-${PYVERSSUFFIX} && \
+		${MV} pyrsa-sign pyrsa-sign-${PYVERSSUFFIX} && \
+		${MV} pyrsa-verify pyrsa-verify-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-rsa/PLIST b/security/py-rsa/PLIST
index 73c71b11b4d..6fe6bb32b7b 100644
--- a/security/py-rsa/PLIST
+++ b/security/py-rsa/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2014/11/24 14:38:03 wiz Exp $
-bin/pyrsa-decrypt
-bin/pyrsa-decrypt-bigfile
-bin/pyrsa-encrypt
-bin/pyrsa-encrypt-bigfile
-bin/pyrsa-keygen
-bin/pyrsa-priv2pub
-bin/pyrsa-sign
-bin/pyrsa-verify
+@comment $NetBSD: PLIST,v 1.2 2018/10/07 10:41:52 adam Exp $
+bin/pyrsa-decrypt-${PYVERSSUFFIX}
+bin/pyrsa-encrypt-${PYVERSSUFFIX}
+bin/pyrsa-keygen-${PYVERSSUFFIX}
+bin/pyrsa-priv2pub-${PYVERSSUFFIX}
+bin/pyrsa-sign-${PYVERSSUFFIX}
+bin/pyrsa-verify-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -19,18 +17,9 @@ ${PYSITELIB}/rsa/__init__.pyo
 ${PYSITELIB}/rsa/_compat.py
 ${PYSITELIB}/rsa/_compat.pyc
 ${PYSITELIB}/rsa/_compat.pyo
-${PYSITELIB}/rsa/_version133.py
-${PYSITELIB}/rsa/_version133.pyc
-${PYSITELIB}/rsa/_version133.pyo
-${PYSITELIB}/rsa/_version200.py
-${PYSITELIB}/rsa/_version200.pyc
-${PYSITELIB}/rsa/_version200.pyo
 ${PYSITELIB}/rsa/asn1.py
 ${PYSITELIB}/rsa/asn1.pyc
 ${PYSITELIB}/rsa/asn1.pyo
-${PYSITELIB}/rsa/bigfile.py
-${PYSITELIB}/rsa/bigfile.pyc
-${PYSITELIB}/rsa/bigfile.pyo
 ${PYSITELIB}/rsa/cli.py
 ${PYSITELIB}/rsa/cli.pyc
 ${PYSITELIB}/rsa/cli.pyo
@@ -43,6 +32,9 @@ ${PYSITELIB}/rsa/core.pyo
 ${PYSITELIB}/rsa/key.py
 ${PYSITELIB}/rsa/key.pyc
 ${PYSITELIB}/rsa/key.pyo
+${PYSITELIB}/rsa/machine_size.py
+${PYSITELIB}/rsa/machine_size.pyc
+${PYSITELIB}/rsa/machine_size.pyo
 ${PYSITELIB}/rsa/parallel.py
 ${PYSITELIB}/rsa/parallel.pyc
 ${PYSITELIB}/rsa/parallel.pyo
@@ -52,6 +44,9 @@ ${PYSITELIB}/rsa/pem.pyo
 ${PYSITELIB}/rsa/pkcs1.py
 ${PYSITELIB}/rsa/pkcs1.pyc
 ${PYSITELIB}/rsa/pkcs1.pyo
+${PYSITELIB}/rsa/pkcs1_v2.py
+${PYSITELIB}/rsa/pkcs1_v2.pyc
+${PYSITELIB}/rsa/pkcs1_v2.pyo
 ${PYSITELIB}/rsa/prime.py
 ${PYSITELIB}/rsa/prime.pyc
 ${PYSITELIB}/rsa/prime.pyo
@@ -64,6 +59,3 @@ ${PYSITELIB}/rsa/transform.pyo
 ${PYSITELIB}/rsa/util.py
 ${PYSITELIB}/rsa/util.pyc
 ${PYSITELIB}/rsa/util.pyo
-${PYSITELIB}/rsa/varblock.py
-${PYSITELIB}/rsa/varblock.pyc
-${PYSITELIB}/rsa/varblock.pyo
diff --git a/security/py-rsa/distinfo b/security/py-rsa/distinfo
index 3a0870d0b2c..ef8cc6496c7 100644
--- a/security/py-rsa/distinfo
+++ b/security/py-rsa/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2017/05/09 12:37:14 adam Exp $
+$NetBSD: distinfo,v 1.7 2018/10/07 10:41:52 adam Exp $
 
-SHA1 (rsa-3.4.2.tar.gz) = 5e01533d344df8e55c090f0fce9c5f9383bf9e9c
-RMD160 (rsa-3.4.2.tar.gz) = ed031a093373ab3c1a6d27d2d9e58235c0058809
-SHA512 (rsa-3.4.2.tar.gz) = 62b0ff31fb3b9c18ae65bd102329e69726b853560576b1b66b9b89b26d3ff79154239af7e7a581b6a27c7017cc013f738762cd9662777ef594cc11c5b1f8e267
-Size (rsa-3.4.2.tar.gz) = 40956 bytes
+SHA1 (rsa-4.0.tar.gz) = 8a68dcee7bd2a7727c253b9ed2820cd1b5b9241a
+RMD160 (rsa-4.0.tar.gz) = 806f139f5b69af170c7a04977665cdf8d4c046c7
+SHA512 (rsa-4.0.tar.gz) = e11106741cc4275246c986d39b3f028b5a4df6fbffdd08a78072ac3d3a9a7ade7a39789c504a2705f54d858a9bdbf03981251f32f9c45baba71e4a986e14b24e
+Size (rsa-4.0.tar.gz) = 37385 bytes