From 20fc2876c51d5f2bd0e57665b5e477f16b45af36 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sun, 13 Dec 2020 14:43:51 +0000 Subject: [PATCH] Update to 0.37.1 Changes: https://gitlab.com/m2crypto/m2crypto/blob/master/CHANGES https://gitlab.com/m2crypto/m2crypto/commits/master --- security/py-m2crypto/Makefile | 5 +++-- security/py-m2crypto/distinfo | 6 +++--- security/py-m2crypto/files/patch-SWIG-_m2crypto.i | 5 ++--- security/py-m2crypto/files/patch-setup.py | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile index 91d64c286eb0..dc8e590c4040 100644 --- a/security/py-m2crypto/Makefile +++ b/security/py-m2crypto/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= m2crypto -PORTVERSION= 0.36.0 +PORTVERSION= 0.37.1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE BUILD_DEPENDS= swig>=2.0.4:devel/swig -RUN_DEPENDS= ${PY_TYPING} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parameterized>=0:devel/py-parameterized@${PY_FLAVOR} \ + ${PY_TYPING} USES= python ssl USE_PYTHON= autoplist concurrent distutils diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo index 775291b23065..0d7687db3b7a 100644 --- a/security/py-m2crypto/distinfo +++ b/security/py-m2crypto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1595416625 -SHA256 (M2Crypto-0.36.0.tar.gz) = 1542c18e3ee5c01db5031d0b594677536963e3f54ecdf5315aeecb3a595b4dc1 -SIZE (M2Crypto-0.36.0.tar.gz) = 1127584 +TIMESTAMP = 1607685399 +SHA256 (M2Crypto-0.37.1.tar.gz) = e4e42f068b78ccbf113e5d0a72ae5f480f6c3ace4940b91e4fff5598cfff6fb3 +SIZE (M2Crypto-0.37.1.tar.gz) = 1247031 diff --git a/security/py-m2crypto/files/patch-SWIG-_m2crypto.i b/security/py-m2crypto/files/patch-SWIG-_m2crypto.i index d3301a0dedae..41ad4f160074 100644 --- a/security/py-m2crypto/files/patch-SWIG-_m2crypto.i +++ b/security/py-m2crypto/files/patch-SWIG-_m2crypto.i @@ -1,6 +1,6 @@ ---- SWIG/_m2crypto.i.orig 2018-02-24 13:54:59 UTC +--- SWIG/_m2crypto.i.orig 2020-01-30 08:17:01 UTC +++ SWIG/_m2crypto.i -@@ -57,7 +57,8 @@ static PyObject *x509_store_verify_cb_fu +@@ -65,6 +65,7 @@ static PyObject *x509_store_verify_cb_func; #ifdef _WIN32 %include #endif @@ -8,4 +8,3 @@ %include /* Bring in LHASH_OF macro definition */ - /* XXX Can't include lhash.h where LHASH_OF is defined, because it includes diff --git a/security/py-m2crypto/files/patch-setup.py b/security/py-m2crypto/files/patch-setup.py index 2b5d7b62fd49..0890a64585c8 100644 --- a/security/py-m2crypto/files/patch-setup.py +++ b/security/py-m2crypto/files/patch-setup.py @@ -1,9 +1,9 @@ ---- setup.py.orig 2018-04-29 18:47:25 UTC +--- setup.py.orig 2020-12-08 18:29:38 UTC +++ setup.py -@@ -196,7 +196,7 @@ class _M2CryptoBuildExt(build_ext.build_ +@@ -204,7 +204,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): + self.swig_opts.append( + '-I' + os.path.join(openssl_include_dir, 'openssl')) - # 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('-includeall') self.swig_opts.append('-modern')