Changes 0.25.0:

- More cleanups, removal of obsolete stuff, and moves towards py3k
  compatibility.
- Add support for EC.get_builtin_curves() and use it for testing.
- Enable AES CTR mode
- Bundle-in six module v. 1.10.0
- add rand_file_name and rand_status
- remove all LHASH fiddling
- Extend Travis and GitLab CI configuration to test also py3k (with
  allowed_failures) and CentOS6 (on GitLab CI).
- Add CONTRIBUTORS.rst. Thank you!
- Add PEP-484 type hints in comments to all Python files (except for
  tests)
- Use context managers for file handling wherever possible instead of
  leaking open file descriptors.
- Improve defaults handling for SSL_CTX_new().
- Fix PGP tests to actually run

5 files changed, 75 insertions, 25 deletions

diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index ea0b514d2cf..3d4fe67152a 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.40 2017/01/01 14:43:55 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2017/02/19 18:54:39 adam Exp $
 
-DISTNAME=		M2Crypto-0.22.3
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=		1
-CATEGORIES=		security python
-MASTER_SITES=		${MASTER_SITE_PYPI:=M/M2Crypto/}
+DISTNAME=	M2Crypto-0.25.1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
+CATEGORIES=	security python
+MASTER_SITES=	${MASTER_SITE_PYPI:=M/M2Crypto/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://chandlerproject.org/bin/view/Projects/MeTooCrypto
-COMMENT=		Crypto and SSL toolkit for Python
-LICENSE=		m2crypto-license
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://chandlerproject.org/bin/view/Projects/MeTooCrypto
+COMMENT=	Crypto and SSL toolkit for Python
+LICENSE=	m2crypto-license
+
+DEPENDS+=	${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
 
 PYSETUPBUILDARGS=	build_ext --openssl=${BUILDLINK_PREFIX.openssl}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 0.21.1
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 0.25.1
 
 .include "../../lang/python/egg.mk"
 .include "../../devel/swig/buildlink3.mk"
diff --git a/security/py-m2crypto/PLIST b/security/py-m2crypto/PLIST
index 284222010ae..cbbe2b7fd1f 100644
--- a/security/py-m2crypto/PLIST
+++ b/security/py-m2crypto/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2014/06/01 23:51:25 rodent Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/02/19 18:54:39 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/M2Crypto/ASN1.py
 ${PYSITELIB}/M2Crypto/ASN1.pyc
@@ -33,6 +34,24 @@ ${PYSITELIB}/M2Crypto/Engine.pyo
 ${PYSITELIB}/M2Crypto/Err.py
 ${PYSITELIB}/M2Crypto/Err.pyc
 ${PYSITELIB}/M2Crypto/Err.pyo
+${PYSITELIB}/M2Crypto/PGP/PublicKey.py
+${PYSITELIB}/M2Crypto/PGP/PublicKey.pyc
+${PYSITELIB}/M2Crypto/PGP/PublicKey.pyo
+${PYSITELIB}/M2Crypto/PGP/PublicKeyRing.py
+${PYSITELIB}/M2Crypto/PGP/PublicKeyRing.pyc
+${PYSITELIB}/M2Crypto/PGP/PublicKeyRing.pyo
+${PYSITELIB}/M2Crypto/PGP/RSA.py
+${PYSITELIB}/M2Crypto/PGP/RSA.pyc
+${PYSITELIB}/M2Crypto/PGP/RSA.pyo
+${PYSITELIB}/M2Crypto/PGP/__init__.py
+${PYSITELIB}/M2Crypto/PGP/__init__.pyc
+${PYSITELIB}/M2Crypto/PGP/__init__.pyo
+${PYSITELIB}/M2Crypto/PGP/constants.py
+${PYSITELIB}/M2Crypto/PGP/constants.pyc
+${PYSITELIB}/M2Crypto/PGP/constants.pyo
+${PYSITELIB}/M2Crypto/PGP/packet.py
+${PYSITELIB}/M2Crypto/PGP/packet.pyc
+${PYSITELIB}/M2Crypto/PGP/packet.pyo
 ${PYSITELIB}/M2Crypto/RC4.py
 ${PYSITELIB}/M2Crypto/RC4.pyc
 ${PYSITELIB}/M2Crypto/RC4.pyo
@@ -85,6 +104,9 @@ ${PYSITELIB}/M2Crypto/__init__.py
 ${PYSITELIB}/M2Crypto/__init__.pyc
 ${PYSITELIB}/M2Crypto/__init__.pyo
 ${PYSITELIB}/M2Crypto/__m2crypto.so
+${PYSITELIB}/M2Crypto/_m2crypto.py
+${PYSITELIB}/M2Crypto/_m2crypto.pyc
+${PYSITELIB}/M2Crypto/_m2crypto.pyo
 ${PYSITELIB}/M2Crypto/callback.py
 ${PYSITELIB}/M2Crypto/callback.pyc
 ${PYSITELIB}/M2Crypto/callback.pyo
@@ -106,6 +128,9 @@ ${PYSITELIB}/M2Crypto/m2urllib2.pyo
 ${PYSITELIB}/M2Crypto/m2xmlrpclib.py
 ${PYSITELIB}/M2Crypto/m2xmlrpclib.pyc
 ${PYSITELIB}/M2Crypto/m2xmlrpclib.pyo
+${PYSITELIB}/M2Crypto/six.py
+${PYSITELIB}/M2Crypto/six.pyc
+${PYSITELIB}/M2Crypto/six.pyo
 ${PYSITELIB}/M2Crypto/threading.py
 ${PYSITELIB}/M2Crypto/threading.pyc
 ${PYSITELIB}/M2Crypto/threading.pyo
diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo
index 7af3315eff0..16d55ad3fce 100644
--- a/security/py-m2crypto/distinfo
+++ b/security/py-m2crypto/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:18:04 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/02/19 18:54:39 adam Exp $
 
-SHA1 (M2Crypto-0.22.3.tar.gz) = c5e39d928aff7a47e6d82624210a7a31b8220a50
-RMD160 (M2Crypto-0.22.3.tar.gz) = 3ba7498308949f4c40c7eb8b649d575afd665a55
-SHA512 (M2Crypto-0.22.3.tar.gz) = c179d3cf03ced77aed24285ca3f1527d5e05bbfe091a1522bff94a940fd390213fbb9b83d7ccd43ceae49626b427ae8790782cf93ead85be1e063bc4121c62e0
-Size (M2Crypto-0.22.3.tar.gz) = 74795 bytes
-SHA1 (patch-setup.py) = 994ddaa88ef942967d344d84b34f0cbed2778910
+SHA1 (M2Crypto-0.25.1.tar.gz) = 44a24c03b9f56aad7c6a9278aa9436ac967bc7e9
+RMD160 (M2Crypto-0.25.1.tar.gz) = 6dcb90c12a030b7c575efc310e6abd503be7e0a0
+SHA512 (M2Crypto-0.25.1.tar.gz) = 096d414efd5558f9ca4cebf46a297fa39f799e35c4325e031ee816689345e041370f2129650a10db66ebfcfe64309a7c7b49082306567baaf003b88ed9d60bda
+Size (M2Crypto-0.25.1.tar.gz) = 300904 bytes
+SHA1 (patch-SWIG___m2crypto__wrap.c) = 14e62bf68bf5f1b0231c3f32e6030a3dad1e0eef
+SHA1 (patch-setup.py) = 6f47564c57d4136612db53cfec50667a626b5091
diff --git a/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c b/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c
new file mode 100644
index 00000000000..694e26d5c07
--- /dev/null
+++ b/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-SWIG___m2crypto__wrap.c,v 1.1 2017/02/19 18:54:39 adam Exp $
+
+Avoid conflict with hmac() definition from stdlib.h (NetBSD).
+
+--- SWIG/_m2crypto_wrap.c.orig	2017-02-19 18:35:59.000000000 +0000
++++ SWIG/_m2crypto_wrap.c
+@@ -5050,7 +5050,7 @@ PyObject *hmac_final(HMAC_CTX *ctx) {
+     return ret;
+ }
+ 
+-PyObject *hmac(PyObject *key, PyObject *data, const EVP_MD *md) {
++PyObject *hmac_func(PyObject *key, PyObject *data, const EVP_MD *md) {
+     const void *kbuf, *dbuf;
+     void *blob;
+     int klen;
+@@ -12676,7 +12676,7 @@ SWIGINTERN PyObject *_wrap_hmac(PyObject
+       SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+     }
+   }
+-  result = (PyObject *)hmac(arg1,arg2,(EVP_MD const *)arg3);
++  result = (PyObject *)hmac_func(arg1,arg2,(EVP_MD const *)arg3);
+   {
+     resultobj=result;
+   }
diff --git a/security/py-m2crypto/patches/patch-setup.py b/security/py-m2crypto/patches/patch-setup.py
index b5e645c0eb0..96a16fb97ff 100644
--- a/security/py-m2crypto/patches/patch-setup.py
+++ b/security/py-m2crypto/patches/patch-setup.py
@@ -1,17 +1,16 @@
-$NetBSD: patch-setup.py,v 1.2 2014/06/01 23:51:25 rodent Exp $
+$NetBSD: patch-setup.py,v 1.3 2017/02/19 18:54:39 adam Exp $
 
 Don't pass "-includeall" to swig.  It causes compiler-dependent
 tests in system include files to break (e.g. "#ifdef __GNUC__"
 doesn't work properly.)
 
---- setup.py.orig	2014-01-22 19:36:53.000000000 +0000
+--- setup.py.orig	2016-07-22 12:43:17.000000000 +0000
 +++ setup.py
-@@ -75,7 +75,7 @@ class _M2CryptoBuildExt(build_ext.build_
+@@ -112,7 +112,6 @@ class _M2CryptoBuildExt(build_ext.build_
+             self.swig_opts.append('-D%s' % arch)
  
-         self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
-                           [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]]
+         self.swig_opts.extend(['-I%s' % i for i in self.include_dirs])
 -        self.swig_opts.append('-includeall')
-+        #self.swig_opts.append('-includeall')
          self.swig_opts.append('-modern')
+         self.swig_opts.append('-builtin')
  
-         # Fedora does hat tricks.