CVS commit: pkgsrc/security/py-m2crypto

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Feb  9 08:44:50 UTC 2018

Modified Files:
        pkgsrc/security/py-m2crypto: Makefile PLIST distinfo
        pkgsrc/security/py-m2crypto/patches: patch-SWIG___m2crypto__wrap.c
            patch-setup.py

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/security/py-m2crypto/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-m2crypto/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/py-m2crypto/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-m2crypto/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/py-m2crypto/Makefile
diff -u pkgsrc/security/py-m2crypto/Makefile:1.44 pkgsrc/security/py-m2crypto/Makefile:1.45
--- pkgsrc/security/py-m2crypto/Makefile:1.44   Thu Oct 26 07:08:10 2017
+++ pkgsrc/security/py-m2crypto/Makefile        Fri Feb  9 08:44:50 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2017/10/26 07:08:10 adam Exp $
+# $NetBSD: Makefile,v 1.45 2018/02/09 08:44:50 adam Exp $
 
-DISTNAME=      M2Crypto-0.27.0
+DISTNAME=      M2Crypto-0.28.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=M/M2Crypto/}
@@ -10,12 +10,17 @@ HOMEPAGE=   https://gitlab.com/m2crypto/m2
 COMMENT=       Crypto and SSL toolkit for Python
 LICENSE=       m2crypto-license
 
+.include "../../lang/python/pyversion.mk"
+
+PLIST_VARS+=   typing
+
+.if "${PYPKGPREFIX}" == "py27" || "${PYPKGPREFIX}" == "py34"
 DEPENDS+=      ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
+PLIST.typing=  yes
+.endif
 
 PYSETUPBUILDARGS=      build_ext --openssl=${BUILDLINK_PREFIX.openssl}
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 0.27.0
-
 .include "../../devel/swig/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/security/py-m2crypto/PLIST
diff -u pkgsrc/security/py-m2crypto/PLIST:1.9 pkgsrc/security/py-m2crypto/PLIST:1.10
--- pkgsrc/security/py-m2crypto/PLIST:1.9       Wed May 10 17:03:42 2017
+++ pkgsrc/security/py-m2crypto/PLIST   Fri Feb  9 08:44:50 2018
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2017/05/10 17:03:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/02/09 08:44:50 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PLIST.typing}${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/M2Crypto/ASN1.py
 ${PYSITELIB}/M2Crypto/ASN1.pyc
@@ -34,24 +34,6 @@ ${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

Index: pkgsrc/security/py-m2crypto/distinfo
diff -u pkgsrc/security/py-m2crypto/distinfo:1.12 pkgsrc/security/py-m2crypto/distinfo:1.13
--- pkgsrc/security/py-m2crypto/distinfo:1.12   Thu Oct 26 07:08:10 2017
+++ pkgsrc/security/py-m2crypto/distinfo        Fri Feb  9 08:44:50 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2017/10/26 07:08:10 adam Exp $
+$NetBSD: distinfo,v 1.13 2018/02/09 08:44:50 adam Exp $
 
-SHA1 (M2Crypto-0.27.0.tar.gz) = 0bcf5962c60283f07aeaa443bebf49bcfe5a2e04
-RMD160 (M2Crypto-0.27.0.tar.gz) = 2b86ddc861d2b11db1ce40f76443608c2c09e869
-SHA512 (M2Crypto-0.27.0.tar.gz) = df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2
-Size (M2Crypto-0.27.0.tar.gz) = 1119288 bytes
-SHA1 (patch-SWIG___m2crypto__wrap.c) = 14e62bf68bf5f1b0231c3f32e6030a3dad1e0eef
-SHA1 (patch-setup.py) = 6f47564c57d4136612db53cfec50667a626b5091
+SHA1 (M2Crypto-0.28.2.tar.gz) = b03250b7891462631f3160248ec07175891a271f
+RMD160 (M2Crypto-0.28.2.tar.gz) = c2cec522c4b8d2a114698aa4ce7c978b1a6dd00a
+SHA512 (M2Crypto-0.28.2.tar.gz) = 57314a3ac70609386cf7cd5fda7fa4371a7b4fef5d1f49ea46215097f31bd98f98431c1698de47e670d7176639a6c0e53b14d981aca0f5f430a5dd7970784d7b
+Size (M2Crypto-0.28.2.tar.gz) = 1268506 bytes
+SHA1 (patch-SWIG___m2crypto__wrap.c) = 2672787cd8fd70b5ac2cf634b6a913aefc27b26c
+SHA1 (patch-setup.py) = 647b45f38eaf71726b21725b351b439a9b0770cd

Index: pkgsrc/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c
diff -u pkgsrc/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c:1.1 pkgsrc/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c:1.2
--- pkgsrc/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c:1.1       Sun Feb 19 18:54:39 2017
+++ pkgsrc/security/py-m2crypto/patches/patch-SWIG___m2crypto__wrap.c   Fri Feb  9 08:44:50 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-SWIG___m2crypto__wrap.c,v 1.1 2017/02/19 18:54:39 adam Exp $
+$NetBSD: patch-SWIG___m2crypto__wrap.c,v 1.2 2018/02/09 08:44:50 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.orig 2018-02-08 18:54:48.000000000 +0000
 +++ SWIG/_m2crypto_wrap.c
-@@ -5050,7 +5050,7 @@ PyObject *hmac_final(HMAC_CTX *ctx) {
+@@ -5949,7 +5949,7 @@ PyObject *hmac_final(HMAC_CTX *ctx) {
      return ret;
  }
  
@@ -12,8 +12,8 @@ Avoid conflict with hmac() definition fr
 +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
+     int klen = 0;
+@@ -13610,7 +13610,7 @@ SWIGINTERN PyObject *_wrap_hmac(PyObject
        SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
      }
    }

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