From 771cf91145c4fbe0c4868b2c8e6022e91c460ca8 Mon Sep 17 00:00:00 2001 From: Jorge Schrauwen Date: Tue, 15 Sep 2020 18:08:57 +0200 Subject: [PATCH] Update to m2crypto 0.36.0 Compiles against newer SSL now --- security/py-m2crypto/Makefile | 10 +++++--- security/py-m2crypto/distinfo | 9 +++---- security/py-m2crypto/patches/patch-setup.py | 27 --------------------- 3 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 security/py-m2crypto/patches/patch-setup.py diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile index 9d5406b8b30b..831e8817c011 100644 --- a/security/py-m2crypto/Makefile +++ b/security/py-m2crypto/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.53 2020/04/24 11:41:37 nia Exp $ -DISTNAME= M2Crypto-0.32.0 +DISTNAME= M2Crypto-0.36.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} PKGREVISION= 1 CATEGORIES= security python @@ -11,11 +11,10 @@ HOMEPAGE= https://gitlab.com/m2crypto/m2crypto COMMENT= Crypto and SSL toolkit for Python LICENSE= m2crypto-license -BROKEN= "Fails to build with OpenSSL 1.1" - .include "../../lang/python/pyversion.mk" PLIST_VARS+= typing +USE_LANGUAGES+= c c++11 .if ${_PYTHON_VERSION} == 27 DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing @@ -24,7 +23,10 @@ PLIST.typing= yes PYSETUPBUILDARGS= build_ext --openssl=${BUILDLINK_PREFIX.openssl} -.include "../../devel/swig/buildlink3.mk" +pre-configure: + ${LN} -sf ${PREFIX}/bin/swig3.0 ${BUILDLINK_DIR}/bin/swig + +.include "../../devel/swig3/buildlink3.mk" .include "../../lang/python/egg.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo index ac648ee6c9c3..99fb1f8ae974 100644 --- a/security/py-m2crypto/distinfo +++ b/security/py-m2crypto/distinfo @@ -1,8 +1,7 @@ $NetBSD: distinfo,v 1.18 2019/03/04 18:41:48 adam Exp $ -SHA1 (M2Crypto-0.32.0.tar.gz) = b36c43373f952401b9cc190e4e5ddd09028e276b -RMD160 (M2Crypto-0.32.0.tar.gz) = 4d8b714b105ba4e2616d203edd72733736b124c1 -SHA512 (M2Crypto-0.32.0.tar.gz) = 477cc30748b3ddc21b66872a88ba0e111a592928ce0d2edc9b72c9a8fa7aa2b422e1b785b830e8d8fcab9f1678928634627b0ea3d57632ec5769ba4ed64c16f8 -Size (M2Crypto-0.32.0.tar.gz) = 1292542 bytes +SHA1 (M2Crypto-0.36.0.tar.gz) = 666735839ad0d9b414cc39937ffad2675297bb02 +RMD160 (M2Crypto-0.36.0.tar.gz) = e813fd1da12a8b8a5550931129d29977a25cef5d +SHA512 (M2Crypto-0.36.0.tar.gz) = 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1 +Size (M2Crypto-0.36.0.tar.gz) = 1127584 bytes SHA1 (patch-SWIG___m2crypto__wrap.c) = 2672787cd8fd70b5ac2cf634b6a913aefc27b26c -SHA1 (patch-setup.py) = ec43146954a849a7e12003397df19e6567df888c diff --git a/security/py-m2crypto/patches/patch-setup.py b/security/py-m2crypto/patches/patch-setup.py deleted file mode 100644 index 83d6f95f2030..000000000000 --- a/security/py-m2crypto/patches/patch-setup.py +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-setup.py,v 1.5 2019/03/04 18:41:48 adam Exp $ - -CPP may contain spaces. - -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 2019-03-04 17:27:03.000000000 +0000 -+++ setup.py -@@ -50,7 +50,7 @@ def _get_additional_includes(): - '*Visual*', 'VC', 'include') - err = glob.glob(globmask) - else: -- pid = subprocess.Popen([os.environ.get('CPP', 'cpp'), '-Wp,-v', '-'], -+ pid = subprocess.Popen(os.environ.get('CPP', 'cpp').split() + ['-Wp,-v', '-'], - stdin=open(os.devnull, 'r'), - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) -@@ -197,7 +197,6 @@ class _M2CryptoBuildExt(build_ext.build_ - - # 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') -