Sun Feb 19 18:54:39 2017 UTC ()
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


(adam)
diff -r1.40 -r1.41 pkgsrc/security/py-m2crypto/Makefile
diff -r1.7 -r1.8 pkgsrc/security/py-m2crypto/PLIST
diff -r1.8 -r1.9 pkgsrc/security/py-m2crypto/distinfo
diff -r0 -r1.1 pkgsrc/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c
diff -r1.2 -r1.3 pkgsrc/security/py-m2crypto/patches/patch-setup.py

cvs diff -r1.40 -r1.41 pkgsrc/security/py-m2crypto/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/py-m2crypto/Attic/Makefile 2017/01/01 14:43:55 1.40
+++ pkgsrc/security/py-m2crypto/Attic/Makefile 2017/02/19 18:54:39 1.41
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.40 2017/01/01 14:43:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.41 2017/02/19 18:54:39 adam Exp $
2 2
3DISTNAME= M2Crypto-0.22.3 3DISTNAME= M2Crypto-0.25.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5PKGREVISION= 1 5CATEGORIES= security python
6CATEGORIES= security python 6MASTER_SITES= ${MASTER_SITE_PYPI:=M/M2Crypto/}
7MASTER_SITES= ${MASTER_SITE_PYPI:=M/M2Crypto/} 7
8 8MAINTAINER= pkgsrc-users@NetBSD.org
9MAINTAINER= pkgsrc-users@NetBSD.org 9HOMEPAGE= http://chandlerproject.org/bin/view/Projects/MeTooCrypto
10HOMEPAGE= http://chandlerproject.org/bin/view/Projects/MeTooCrypto 10COMMENT= Crypto and SSL toolkit for Python
11COMMENT= Crypto and SSL toolkit for Python 11LICENSE= m2crypto-license
12LICENSE= m2crypto-license 12
 13DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
13 14
14PYSETUPBUILDARGS= build_ext --openssl=${BUILDLINK_PREFIX.openssl} 15PYSETUPBUILDARGS= build_ext --openssl=${BUILDLINK_PREFIX.openssl}
15 16
16PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.21.1 17PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.25.1
17 18
18.include "../../lang/python/egg.mk" 19.include "../../lang/python/egg.mk"
19.include "../../devel/swig/buildlink3.mk" 20.include "../../devel/swig/buildlink3.mk"
20.include "../../security/openssl/buildlink3.mk" 21.include "../../security/openssl/buildlink3.mk"
21.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"

cvs diff -r1.7 -r1.8 pkgsrc/security/py-m2crypto/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/security/py-m2crypto/Attic/PLIST 2014/06/01 23:51:25 1.7
+++ pkgsrc/security/py-m2crypto/Attic/PLIST 2017/02/19 18:54:39 1.8
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1@comment $NetBSD: PLIST,v 1.7 2014/06/01 23:51:25 rodent Exp $ 1@comment $NetBSD: PLIST,v 1.8 2017/02/19 18:54:39 adam Exp $
2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 5${PYSITELIB}/${EGG_INFODIR}/requires.txt
5${PYSITELIB}/${EGG_INFODIR}/top_level.txt 6${PYSITELIB}/${EGG_INFODIR}/top_level.txt
6${PYSITELIB}/M2Crypto/ASN1.py 7${PYSITELIB}/M2Crypto/ASN1.py
7${PYSITELIB}/M2Crypto/ASN1.pyc 8${PYSITELIB}/M2Crypto/ASN1.pyc
8${PYSITELIB}/M2Crypto/ASN1.pyo 9${PYSITELIB}/M2Crypto/ASN1.pyo
9${PYSITELIB}/M2Crypto/AuthCookie.py 10${PYSITELIB}/M2Crypto/AuthCookie.py
10${PYSITELIB}/M2Crypto/AuthCookie.pyc 11${PYSITELIB}/M2Crypto/AuthCookie.pyc
11${PYSITELIB}/M2Crypto/AuthCookie.pyo 12${PYSITELIB}/M2Crypto/AuthCookie.pyo
12${PYSITELIB}/M2Crypto/BIO.py 13${PYSITELIB}/M2Crypto/BIO.py
13${PYSITELIB}/M2Crypto/BIO.pyc 14${PYSITELIB}/M2Crypto/BIO.pyc
14${PYSITELIB}/M2Crypto/BIO.pyo 15${PYSITELIB}/M2Crypto/BIO.pyo
15${PYSITELIB}/M2Crypto/BN.py 16${PYSITELIB}/M2Crypto/BN.py
16${PYSITELIB}/M2Crypto/BN.pyc 17${PYSITELIB}/M2Crypto/BN.pyc
17${PYSITELIB}/M2Crypto/BN.pyo 18${PYSITELIB}/M2Crypto/BN.pyo
@@ -23,26 +24,44 @@ ${PYSITELIB}/M2Crypto/DSA.pyc @@ -23,26 +24,44 @@ ${PYSITELIB}/M2Crypto/DSA.pyc
23${PYSITELIB}/M2Crypto/DSA.pyo 24${PYSITELIB}/M2Crypto/DSA.pyo
24${PYSITELIB}/M2Crypto/EC.py 25${PYSITELIB}/M2Crypto/EC.py
25${PYSITELIB}/M2Crypto/EC.pyc 26${PYSITELIB}/M2Crypto/EC.pyc
26${PYSITELIB}/M2Crypto/EC.pyo 27${PYSITELIB}/M2Crypto/EC.pyo
27${PYSITELIB}/M2Crypto/EVP.py 28${PYSITELIB}/M2Crypto/EVP.py
28${PYSITELIB}/M2Crypto/EVP.pyc 29${PYSITELIB}/M2Crypto/EVP.pyc
29${PYSITELIB}/M2Crypto/EVP.pyo 30${PYSITELIB}/M2Crypto/EVP.pyo
30${PYSITELIB}/M2Crypto/Engine.py 31${PYSITELIB}/M2Crypto/Engine.py
31${PYSITELIB}/M2Crypto/Engine.pyc 32${PYSITELIB}/M2Crypto/Engine.pyc
32${PYSITELIB}/M2Crypto/Engine.pyo 33${PYSITELIB}/M2Crypto/Engine.pyo
33${PYSITELIB}/M2Crypto/Err.py 34${PYSITELIB}/M2Crypto/Err.py
34${PYSITELIB}/M2Crypto/Err.pyc 35${PYSITELIB}/M2Crypto/Err.pyc
35${PYSITELIB}/M2Crypto/Err.pyo 36${PYSITELIB}/M2Crypto/Err.pyo
 37${PYSITELIB}/M2Crypto/PGP/PublicKey.py
 38${PYSITELIB}/M2Crypto/PGP/PublicKey.pyc
 39${PYSITELIB}/M2Crypto/PGP/PublicKey.pyo
 40${PYSITELIB}/M2Crypto/PGP/PublicKeyRing.py
 41${PYSITELIB}/M2Crypto/PGP/PublicKeyRing.pyc
 42${PYSITELIB}/M2Crypto/PGP/PublicKeyRing.pyo
 43${PYSITELIB}/M2Crypto/PGP/RSA.py
 44${PYSITELIB}/M2Crypto/PGP/RSA.pyc
 45${PYSITELIB}/M2Crypto/PGP/RSA.pyo
 46${PYSITELIB}/M2Crypto/PGP/__init__.py
 47${PYSITELIB}/M2Crypto/PGP/__init__.pyc
 48${PYSITELIB}/M2Crypto/PGP/__init__.pyo
 49${PYSITELIB}/M2Crypto/PGP/constants.py
 50${PYSITELIB}/M2Crypto/PGP/constants.pyc
 51${PYSITELIB}/M2Crypto/PGP/constants.pyo
 52${PYSITELIB}/M2Crypto/PGP/packet.py
 53${PYSITELIB}/M2Crypto/PGP/packet.pyc
 54${PYSITELIB}/M2Crypto/PGP/packet.pyo
36${PYSITELIB}/M2Crypto/RC4.py 55${PYSITELIB}/M2Crypto/RC4.py
37${PYSITELIB}/M2Crypto/RC4.pyc 56${PYSITELIB}/M2Crypto/RC4.pyc
38${PYSITELIB}/M2Crypto/RC4.pyo 57${PYSITELIB}/M2Crypto/RC4.pyo
39${PYSITELIB}/M2Crypto/RSA.py 58${PYSITELIB}/M2Crypto/RSA.py
40${PYSITELIB}/M2Crypto/RSA.pyc 59${PYSITELIB}/M2Crypto/RSA.pyc
41${PYSITELIB}/M2Crypto/RSA.pyo 60${PYSITELIB}/M2Crypto/RSA.pyo
42${PYSITELIB}/M2Crypto/Rand.py 61${PYSITELIB}/M2Crypto/Rand.py
43${PYSITELIB}/M2Crypto/Rand.pyc 62${PYSITELIB}/M2Crypto/Rand.pyc
44${PYSITELIB}/M2Crypto/Rand.pyo 63${PYSITELIB}/M2Crypto/Rand.pyo
45${PYSITELIB}/M2Crypto/SMIME.py 64${PYSITELIB}/M2Crypto/SMIME.py
46${PYSITELIB}/M2Crypto/SMIME.pyc 65${PYSITELIB}/M2Crypto/SMIME.pyc
47${PYSITELIB}/M2Crypto/SMIME.pyo 66${PYSITELIB}/M2Crypto/SMIME.pyo
48${PYSITELIB}/M2Crypto/SSL/Checker.py 67${PYSITELIB}/M2Crypto/SSL/Checker.py
@@ -75,40 +94,46 @@ ${PYSITELIB}/M2Crypto/SSL/cb.pyo @@ -75,40 +94,46 @@ ${PYSITELIB}/M2Crypto/SSL/cb.pyo
75${PYSITELIB}/M2Crypto/SSL/ssl_dispatcher.py 94${PYSITELIB}/M2Crypto/SSL/ssl_dispatcher.py
76${PYSITELIB}/M2Crypto/SSL/ssl_dispatcher.pyc 95${PYSITELIB}/M2Crypto/SSL/ssl_dispatcher.pyc
77${PYSITELIB}/M2Crypto/SSL/ssl_dispatcher.pyo 96${PYSITELIB}/M2Crypto/SSL/ssl_dispatcher.pyo
78${PYSITELIB}/M2Crypto/SSL/timeout.py 97${PYSITELIB}/M2Crypto/SSL/timeout.py
79${PYSITELIB}/M2Crypto/SSL/timeout.pyc 98${PYSITELIB}/M2Crypto/SSL/timeout.pyc
80${PYSITELIB}/M2Crypto/SSL/timeout.pyo 99${PYSITELIB}/M2Crypto/SSL/timeout.pyo
81${PYSITELIB}/M2Crypto/X509.py 100${PYSITELIB}/M2Crypto/X509.py
82${PYSITELIB}/M2Crypto/X509.pyc 101${PYSITELIB}/M2Crypto/X509.pyc
83${PYSITELIB}/M2Crypto/X509.pyo 102${PYSITELIB}/M2Crypto/X509.pyo
84${PYSITELIB}/M2Crypto/__init__.py 103${PYSITELIB}/M2Crypto/__init__.py
85${PYSITELIB}/M2Crypto/__init__.pyc 104${PYSITELIB}/M2Crypto/__init__.pyc
86${PYSITELIB}/M2Crypto/__init__.pyo 105${PYSITELIB}/M2Crypto/__init__.pyo
87${PYSITELIB}/M2Crypto/__m2crypto.so 106${PYSITELIB}/M2Crypto/__m2crypto.so
 107${PYSITELIB}/M2Crypto/_m2crypto.py
 108${PYSITELIB}/M2Crypto/_m2crypto.pyc
 109${PYSITELIB}/M2Crypto/_m2crypto.pyo
88${PYSITELIB}/M2Crypto/callback.py 110${PYSITELIB}/M2Crypto/callback.py
89${PYSITELIB}/M2Crypto/callback.pyc 111${PYSITELIB}/M2Crypto/callback.pyc
90${PYSITELIB}/M2Crypto/callback.pyo 112${PYSITELIB}/M2Crypto/callback.pyo
91${PYSITELIB}/M2Crypto/ftpslib.py 113${PYSITELIB}/M2Crypto/ftpslib.py
92${PYSITELIB}/M2Crypto/ftpslib.pyc 114${PYSITELIB}/M2Crypto/ftpslib.pyc
93${PYSITELIB}/M2Crypto/ftpslib.pyo 115${PYSITELIB}/M2Crypto/ftpslib.pyo
94${PYSITELIB}/M2Crypto/httpslib.py 116${PYSITELIB}/M2Crypto/httpslib.py
95${PYSITELIB}/M2Crypto/httpslib.pyc 117${PYSITELIB}/M2Crypto/httpslib.pyc
96${PYSITELIB}/M2Crypto/httpslib.pyo 118${PYSITELIB}/M2Crypto/httpslib.pyo
97${PYSITELIB}/M2Crypto/m2.py 119${PYSITELIB}/M2Crypto/m2.py
98${PYSITELIB}/M2Crypto/m2.pyc 120${PYSITELIB}/M2Crypto/m2.pyc
99${PYSITELIB}/M2Crypto/m2.pyo 121${PYSITELIB}/M2Crypto/m2.pyo
100${PYSITELIB}/M2Crypto/m2urllib.py 122${PYSITELIB}/M2Crypto/m2urllib.py
101${PYSITELIB}/M2Crypto/m2urllib.pyc 123${PYSITELIB}/M2Crypto/m2urllib.pyc
102${PYSITELIB}/M2Crypto/m2urllib.pyo 124${PYSITELIB}/M2Crypto/m2urllib.pyo
103${PYSITELIB}/M2Crypto/m2urllib2.py 125${PYSITELIB}/M2Crypto/m2urllib2.py
104${PYSITELIB}/M2Crypto/m2urllib2.pyc 126${PYSITELIB}/M2Crypto/m2urllib2.pyc
105${PYSITELIB}/M2Crypto/m2urllib2.pyo 127${PYSITELIB}/M2Crypto/m2urllib2.pyo
106${PYSITELIB}/M2Crypto/m2xmlrpclib.py 128${PYSITELIB}/M2Crypto/m2xmlrpclib.py
107${PYSITELIB}/M2Crypto/m2xmlrpclib.pyc 129${PYSITELIB}/M2Crypto/m2xmlrpclib.pyc
108${PYSITELIB}/M2Crypto/m2xmlrpclib.pyo 130${PYSITELIB}/M2Crypto/m2xmlrpclib.pyo
 131${PYSITELIB}/M2Crypto/six.py
 132${PYSITELIB}/M2Crypto/six.pyc
 133${PYSITELIB}/M2Crypto/six.pyo
109${PYSITELIB}/M2Crypto/threading.py 134${PYSITELIB}/M2Crypto/threading.py
110${PYSITELIB}/M2Crypto/threading.pyc 135${PYSITELIB}/M2Crypto/threading.pyc
111${PYSITELIB}/M2Crypto/threading.pyo 136${PYSITELIB}/M2Crypto/threading.pyo
112${PYSITELIB}/M2Crypto/util.py 137${PYSITELIB}/M2Crypto/util.py
113${PYSITELIB}/M2Crypto/util.pyc 138${PYSITELIB}/M2Crypto/util.pyc
114${PYSITELIB}/M2Crypto/util.pyo 139${PYSITELIB}/M2Crypto/util.pyo

cvs diff -r1.8 -r1.9 pkgsrc/security/py-m2crypto/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/security/py-m2crypto/Attic/distinfo 2015/11/04 01:18:04 1.8
+++ pkgsrc/security/py-m2crypto/Attic/distinfo 2017/02/19 18:54:39 1.9
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.8 2015/11/04 01:18:04 agc Exp $ 1$NetBSD: distinfo,v 1.9 2017/02/19 18:54:39 adam Exp $
2 2
3SHA1 (M2Crypto-0.22.3.tar.gz) = c5e39d928aff7a47e6d82624210a7a31b8220a50 3SHA1 (M2Crypto-0.25.1.tar.gz) = 44a24c03b9f56aad7c6a9278aa9436ac967bc7e9
4RMD160 (M2Crypto-0.22.3.tar.gz) = 3ba7498308949f4c40c7eb8b649d575afd665a55 4RMD160 (M2Crypto-0.25.1.tar.gz) = 6dcb90c12a030b7c575efc310e6abd503be7e0a0
5SHA512 (M2Crypto-0.22.3.tar.gz) = c179d3cf03ced77aed24285ca3f1527d5e05bbfe091a1522bff94a940fd390213fbb9b83d7ccd43ceae49626b427ae8790782cf93ead85be1e063bc4121c62e0 5SHA512 (M2Crypto-0.25.1.tar.gz) = 096d414efd5558f9ca4cebf46a297fa39f799e35c4325e031ee816689345e041370f2129650a10db66ebfcfe64309a7c7b49082306567baaf003b88ed9d60bda
6Size (M2Crypto-0.22.3.tar.gz) = 74795 bytes 6Size (M2Crypto-0.25.1.tar.gz) = 300904 bytes
7SHA1 (patch-setup.py) = 994ddaa88ef942967d344d84b34f0cbed2778910 7SHA1 (patch-SWIG___m2crypto__wrap.c) = 14e62bf68bf5f1b0231c3f32e6030a3dad1e0eef
 8SHA1 (patch-setup.py) = 6f47564c57d4136612db53cfec50667a626b5091

File Added: pkgsrc/security/py-m2crypto/patches/Attic/patch-SWIG___m2crypto__wrap.c
$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;
   }

cvs diff -r1.2 -r1.3 pkgsrc/security/py-m2crypto/patches/Attic/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/security/py-m2crypto/patches/Attic/patch-setup.py 2014/06/01 23:51:25 1.2
+++ pkgsrc/security/py-m2crypto/patches/Attic/patch-setup.py 2017/02/19 18:54:39 1.3
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1$NetBSD: patch-setup.py,v 1.2 2014/06/01 23:51:25 rodent Exp $ 1$NetBSD: patch-setup.py,v 1.3 2017/02/19 18:54:39 adam Exp $
2 2
3Don't pass "-includeall" to swig. It causes compiler-dependent 3Don't pass "-includeall" to swig. It causes compiler-dependent
4tests in system include files to break (e.g. "#ifdef __GNUC__" 4tests in system include files to break (e.g. "#ifdef __GNUC__"
5doesn't work properly.) 5doesn't work properly.)
6 6
7--- setup.py.orig 2014-01-22 19:36:53.000000000 +0000 7--- setup.py.orig 2016-07-22 12:43:17.000000000 +0000
8+++ setup.py 8+++ setup.py
9@@ -75,7 +75,7 @@ class _M2CryptoBuildExt(build_ext.build_ 9@@ -112,7 +112,6 @@ class _M2CryptoBuildExt(build_ext.build_
 10 self.swig_opts.append('-D%s' % arch)
10  11
11 self.swig_opts = ['-I%s' % i for i in self.include_dirs + \ 12 self.swig_opts.extend(['-I%s' % i for i in self.include_dirs])
12 [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]] 
13- self.swig_opts.append('-includeall') 13- self.swig_opts.append('-includeall')
14+ #self.swig_opts.append('-includeall') 
15 self.swig_opts.append('-modern') 14 self.swig_opts.append('-modern')
 15 self.swig_opts.append('-builtin')
16  16
17 # Fedora does hat tricks.