Fri Feb 9 08:44:50 2018 UTC ()
py-m2crypto: updated to 0.28.2

0.28.0:
- Mainly port to Python 3 (supporting 2.6, 2.7, 3.3, 3.4, 3.5, 3.6)
- Some lame efforts to make setup.py build --openssl work better (needs
  more real testing on Mac OS X)
- Fix licence: it is MIT, not BSD
- Fix and add tests for SWIG/_aes.i module
- Improve somehow situation on Mac OS X (some testing, improve setup.py,
  testsuite should fully pass)
- Bundle-in unittest2 for Python 2.6 (dealing with the need for
  specific version of unittest2 package was too complicated)
- Remove all PGP modules


(adam)
diff -r1.44 -r1.45 pkgsrc/security/py-m2crypto/Makefile
diff -r1.9 -r1.10 pkgsrc/security/py-m2crypto/PLIST
diff -r1.12 -r1.13 pkgsrc/security/py-m2crypto/distinfo
diff -r1.1 -r1.2 pkgsrc/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c
diff -r1.3 -r1.4 pkgsrc/security/py-m2crypto/patches/patch-setup.py
cvs diff -r1.44 -r1.45 pkgsrc/security/py-m2crypto/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/py-m2crypto/Attic/Makefile 2017/10/26 07:08:10 1.44
+++ pkgsrc/security/py-m2crypto/Attic/Makefile 2018/02/09 08:44:50 1.45
@@ -1,22 +1,27 @@ @@ -1,22 +1,27 @@
1# $NetBSD: Makefile,v 1.44 2017/10/26 07:08:10 adam Exp $ 1# $NetBSD: Makefile,v 1.45 2018/02/09 08:44:50 adam Exp $
2 2
3DISTNAME= M2Crypto-0.27.0 3DISTNAME= M2Crypto-0.28.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5CATEGORIES= security python 5CATEGORIES= security python
6MASTER_SITES= ${MASTER_SITE_PYPI:=M/M2Crypto/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=M/M2Crypto/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://gitlab.com/m2crypto/m2crypto 9HOMEPAGE= https://gitlab.com/m2crypto/m2crypto
10COMMENT= Crypto and SSL toolkit for Python 10COMMENT= Crypto and SSL toolkit for Python
11LICENSE= m2crypto-license 11LICENSE= m2crypto-license
12 12
 13.include "../../lang/python/pyversion.mk"
 14
 15PLIST_VARS+= typing
 16
 17.if "${PYPKGPREFIX}" == "py27" || "${PYPKGPREFIX}" == "py34"
13DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing 18DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
 19PLIST.typing= yes
 20.endif
14 21
15PYSETUPBUILDARGS= build_ext --openssl=${BUILDLINK_PREFIX.openssl} 22PYSETUPBUILDARGS= build_ext --openssl=${BUILDLINK_PREFIX.openssl}
16 23
17PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.27.0 
18 
19.include "../../devel/swig/buildlink3.mk" 24.include "../../devel/swig/buildlink3.mk"
20.include "../../lang/python/egg.mk" 25.include "../../lang/python/egg.mk"
21.include "../../security/openssl/buildlink3.mk" 26.include "../../security/openssl/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/security/py-m2crypto/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/security/py-m2crypto/Attic/PLIST 2017/05/10 17:03:42 1.9
+++ pkgsrc/security/py-m2crypto/Attic/PLIST 2018/02/09 08:44:50 1.10
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1@comment $NetBSD: PLIST,v 1.9 2017/05/10 17:03:42 adam Exp $ 1@comment $NetBSD: PLIST,v 1.10 2018/02/09 08:44:50 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${PLIST.typing}${PYSITELIB}/${EGG_INFODIR}/requires.txt
6${PYSITELIB}/${EGG_INFODIR}/top_level.txt 6${PYSITELIB}/${EGG_INFODIR}/top_level.txt
7${PYSITELIB}/M2Crypto/ASN1.py 7${PYSITELIB}/M2Crypto/ASN1.py
8${PYSITELIB}/M2Crypto/ASN1.pyc 8${PYSITELIB}/M2Crypto/ASN1.pyc
9${PYSITELIB}/M2Crypto/ASN1.pyo 9${PYSITELIB}/M2Crypto/ASN1.pyo
10${PYSITELIB}/M2Crypto/AuthCookie.py 10${PYSITELIB}/M2Crypto/AuthCookie.py
11${PYSITELIB}/M2Crypto/AuthCookie.pyc 11${PYSITELIB}/M2Crypto/AuthCookie.pyc
12${PYSITELIB}/M2Crypto/AuthCookie.pyo 12${PYSITELIB}/M2Crypto/AuthCookie.pyo
13${PYSITELIB}/M2Crypto/BIO.py 13${PYSITELIB}/M2Crypto/BIO.py
14${PYSITELIB}/M2Crypto/BIO.pyc 14${PYSITELIB}/M2Crypto/BIO.pyc
15${PYSITELIB}/M2Crypto/BIO.pyo 15${PYSITELIB}/M2Crypto/BIO.pyo
16${PYSITELIB}/M2Crypto/BN.py 16${PYSITELIB}/M2Crypto/BN.py
17${PYSITELIB}/M2Crypto/BN.pyc 17${PYSITELIB}/M2Crypto/BN.pyc
18${PYSITELIB}/M2Crypto/BN.pyo 18${PYSITELIB}/M2Crypto/BN.pyo
@@ -24,44 +24,26 @@ ${PYSITELIB}/M2Crypto/DSA.pyc @@ -24,44 +24,26 @@ ${PYSITELIB}/M2Crypto/DSA.pyc
24${PYSITELIB}/M2Crypto/DSA.pyo 24${PYSITELIB}/M2Crypto/DSA.pyo
25${PYSITELIB}/M2Crypto/EC.py 25${PYSITELIB}/M2Crypto/EC.py
26${PYSITELIB}/M2Crypto/EC.pyc 26${PYSITELIB}/M2Crypto/EC.pyc
27${PYSITELIB}/M2Crypto/EC.pyo 27${PYSITELIB}/M2Crypto/EC.pyo
28${PYSITELIB}/M2Crypto/EVP.py 28${PYSITELIB}/M2Crypto/EVP.py
29${PYSITELIB}/M2Crypto/EVP.pyc 29${PYSITELIB}/M2Crypto/EVP.pyc
30${PYSITELIB}/M2Crypto/EVP.pyo 30${PYSITELIB}/M2Crypto/EVP.pyo
31${PYSITELIB}/M2Crypto/Engine.py 31${PYSITELIB}/M2Crypto/Engine.py
32${PYSITELIB}/M2Crypto/Engine.pyc 32${PYSITELIB}/M2Crypto/Engine.pyc
33${PYSITELIB}/M2Crypto/Engine.pyo 33${PYSITELIB}/M2Crypto/Engine.pyo
34${PYSITELIB}/M2Crypto/Err.py 34${PYSITELIB}/M2Crypto/Err.py
35${PYSITELIB}/M2Crypto/Err.pyc 35${PYSITELIB}/M2Crypto/Err.pyc
36${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 
55${PYSITELIB}/M2Crypto/RC4.py 37${PYSITELIB}/M2Crypto/RC4.py
56${PYSITELIB}/M2Crypto/RC4.pyc 38${PYSITELIB}/M2Crypto/RC4.pyc
57${PYSITELIB}/M2Crypto/RC4.pyo 39${PYSITELIB}/M2Crypto/RC4.pyo
58${PYSITELIB}/M2Crypto/RSA.py 40${PYSITELIB}/M2Crypto/RSA.py
59${PYSITELIB}/M2Crypto/RSA.pyc 41${PYSITELIB}/M2Crypto/RSA.pyc
60${PYSITELIB}/M2Crypto/RSA.pyo 42${PYSITELIB}/M2Crypto/RSA.pyo
61${PYSITELIB}/M2Crypto/Rand.py 43${PYSITELIB}/M2Crypto/Rand.py
62${PYSITELIB}/M2Crypto/Rand.pyc 44${PYSITELIB}/M2Crypto/Rand.pyc
63${PYSITELIB}/M2Crypto/Rand.pyo 45${PYSITELIB}/M2Crypto/Rand.pyo
64${PYSITELIB}/M2Crypto/SMIME.py 46${PYSITELIB}/M2Crypto/SMIME.py
65${PYSITELIB}/M2Crypto/SMIME.pyc 47${PYSITELIB}/M2Crypto/SMIME.pyc
66${PYSITELIB}/M2Crypto/SMIME.pyo 48${PYSITELIB}/M2Crypto/SMIME.pyo
67${PYSITELIB}/M2Crypto/SSL/Checker.py 49${PYSITELIB}/M2Crypto/SSL/Checker.py
cvs diff -r1.12 -r1.13 pkgsrc/security/py-m2crypto/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/security/py-m2crypto/Attic/distinfo 2017/10/26 07:08:10 1.12
+++ pkgsrc/security/py-m2crypto/Attic/distinfo 2018/02/09 08:44:50 1.13
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.12 2017/10/26 07:08:10 adam Exp $ 1$NetBSD: distinfo,v 1.13 2018/02/09 08:44:50 adam Exp $
2 2
3SHA1 (M2Crypto-0.27.0.tar.gz) = 0bcf5962c60283f07aeaa443bebf49bcfe5a2e04 3SHA1 (M2Crypto-0.28.2.tar.gz) = b03250b7891462631f3160248ec07175891a271f
4RMD160 (M2Crypto-0.27.0.tar.gz) = 2b86ddc861d2b11db1ce40f76443608c2c09e869 4RMD160 (M2Crypto-0.28.2.tar.gz) = c2cec522c4b8d2a114698aa4ce7c978b1a6dd00a
5SHA512 (M2Crypto-0.27.0.tar.gz) = df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2 5SHA512 (M2Crypto-0.28.2.tar.gz) = 57314a3ac70609386cf7cd5fda7fa4371a7b4fef5d1f49ea46215097f31bd98f98431c1698de47e670d7176639a6c0e53b14d981aca0f5f430a5dd7970784d7b
6Size (M2Crypto-0.27.0.tar.gz) = 1119288 bytes 6Size (M2Crypto-0.28.2.tar.gz) = 1268506 bytes
7SHA1 (patch-SWIG___m2crypto__wrap.c) = 14e62bf68bf5f1b0231c3f32e6030a3dad1e0eef 7SHA1 (patch-SWIG___m2crypto__wrap.c) = 2672787cd8fd70b5ac2cf634b6a913aefc27b26c
8SHA1 (patch-setup.py) = 6f47564c57d4136612db53cfec50667a626b5091 8SHA1 (patch-setup.py) = 647b45f38eaf71726b21725b351b439a9b0770cd
cvs diff -r1.1 -r1.2 pkgsrc/security/py-m2crypto/patches/Attic/patch-SWIG___m2crypto__wrap.c (expand / switch to unified diff)

--- pkgsrc/security/py-m2crypto/patches/Attic/patch-SWIG___m2crypto__wrap.c 2017/02/19 18:54:39 1.1
+++ pkgsrc/security/py-m2crypto/patches/Attic/patch-SWIG___m2crypto__wrap.c 2018/02/09 08:44:50 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-SWIG___m2crypto__wrap.c,v 1.1 2017/02/19 18:54:39 adam Exp $ 1$NetBSD: patch-SWIG___m2crypto__wrap.c,v 1.2 2018/02/09 08:44:50 adam Exp $
2 2
3Avoid conflict with hmac() definition from stdlib.h (NetBSD). 3Avoid conflict with hmac() definition from stdlib.h (NetBSD).
4 4
5--- SWIG/_m2crypto_wrap.c.orig 2017-02-19 18:35:59.000000000 +0000 5--- SWIG/_m2crypto_wrap.c.orig 2018-02-08 18:54:48.000000000 +0000
6+++ SWIG/_m2crypto_wrap.c 6+++ SWIG/_m2crypto_wrap.c
7@@ -5050,7 +5050,7 @@ PyObject *hmac_final(HMAC_CTX *ctx) { 7@@ -5949,7 +5949,7 @@ PyObject *hmac_final(HMAC_CTX *ctx) {
8 return ret; 8 return ret;
9 } 9 }
10  10
11-PyObject *hmac(PyObject *key, PyObject *data, const EVP_MD *md) { 11-PyObject *hmac(PyObject *key, PyObject *data, const EVP_MD *md) {
12+PyObject *hmac_func(PyObject *key, PyObject *data, const EVP_MD *md) { 12+PyObject *hmac_func(PyObject *key, PyObject *data, const EVP_MD *md) {
13 const void *kbuf, *dbuf; 13 const void *kbuf, *dbuf;
14 void *blob; 14 void *blob;
15 int klen; 15 int klen = 0;
16@@ -12676,7 +12676,7 @@ SWIGINTERN PyObject *_wrap_hmac(PyObject 16@@ -13610,7 +13610,7 @@ SWIGINTERN PyObject *_wrap_hmac(PyObject
17 SWIG_exception(SWIG_ValueError,"Received a NULL pointer."); 17 SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
18 } 18 }
19 } 19 }
20- result = (PyObject *)hmac(arg1,arg2,(EVP_MD const *)arg3); 20- result = (PyObject *)hmac(arg1,arg2,(EVP_MD const *)arg3);
21+ result = (PyObject *)hmac_func(arg1,arg2,(EVP_MD const *)arg3); 21+ result = (PyObject *)hmac_func(arg1,arg2,(EVP_MD const *)arg3);
22 { 22 {
23 resultobj=result; 23 resultobj=result;
24 } 24 }
cvs diff -r1.3 -r1.4 pkgsrc/security/py-m2crypto/patches/Attic/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/security/py-m2crypto/patches/Attic/patch-setup.py 2017/02/19 18:54:39 1.3
+++ pkgsrc/security/py-m2crypto/patches/Attic/patch-setup.py 2018/02/09 08:44:50 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-setup.py,v 1.3 2017/02/19 18:54:39 adam Exp $ 1$NetBSD: patch-setup.py,v 1.4 2018/02/09 08:44:50 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 2016-07-22 12:43:17.000000000 +0000 7--- setup.py.orig 2018-02-08 18:54:48.000000000 +0000
8+++ setup.py 8+++ setup.py
9@@ -112,7 +112,6 @@ class _M2CryptoBuildExt(build_ext.build_ 9@@ -192,7 +192,6 @@ class _M2CryptoBuildExt(build_ext.build_
10 self.swig_opts.append('-D%s' % arch) 
11  10
12 self.swig_opts.extend(['-I%s' % i for i in self.include_dirs]) 11 # swig seems to need the default header file directories
 12 self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()])
13- self.swig_opts.append('-includeall') 13- self.swig_opts.append('-includeall')
14 self.swig_opts.append('-modern') 14 self.swig_opts.append('-modern')
15 self.swig_opts.append('-builtin') 15 self.swig_opts.append('-builtin')
16  16