py-m2crypto: Update to 0.36.0. Based on joyent/pkgsrc#282 from sjorge. 0.36.0 - 2020-07-13 ------------------- - wrap SocketIO in io.Buffered* for makefile <lethliel> - SSL.Connection.close accepts an argument to force the socket closing <Christophe Haen> - SSL.Connection: make the clientPostConnectionCheck an instance attribute <Christophe Haen> - Fixed bug with usage of unexisting method getreply at SSL_Transport <roman-nagaev> - Add appveyor builds for python 3.7 and 3.8 <Daniel A. Wozniak> - Fixed syntax warning on line 44. <randomfox> - Update M2Crypto.six to 1.13.0 <Mat��j Cepl> - base64.decodestring() was finally removed in Python 3.8. <Mat��j Cepl> - wrap SocketIO in io.Buffered* for makefile <lethliel> - NULL is legal argument for key and iv paramters of EVP_CipherInit(3) <Mat��j Cepl> - Expose X509_V_FLAG_ALLOW_PROXY_CERTS verification flag and X509_STORE_SET_FLAGS function <Christophe Haen> - Stop testing for 2.6 and 3.4 on Travis. Start testing 3.8 <Mat��j Cepl> - Extend test cert validity to 2049 <Bernhard M. Wiedemann> - Revert using typing module in 2.6. It is just not worthy. <Mat��j Cepl> - Update Debian/stable SSL as well <Mat��j Cepl> - Make tests pass again. <Mat��j Cepl> - Stop using string module, which has been deprecated. <Mat��j Cepl> - Tiny fixes to make pyls more happy <Mat��j Cepl> - CI: Rework Fedora CI configuration <Neal Gompa> 0.35.2 - 2019-06-10 ------------------- - tests.test_rsa: Fix typo to match for proper exception <Sebastian Andrzej Siewior> - Expose CRLs verification flags <Christophe Haen> 0.35.1 - 2019-06-08 ------------------- - Actually, really fix compatibility with OpenSSL 1.1.1c. Thank you, Sebastian Andrzej Siewior from the Debian team for resolving it. 0.34.0 - 2019-05-30 ------------------- - Use more recent version of OpenSSL on Windows - Be resilient against the situation when no erorr happened. - Correct URL of https://www.schneier.com/academic/smime/ - Use shlex.split() for CPP 0.33.0 - 2019-04-26 ------------------- - eb4525c - Stop pretending to support Python 3.4. <Mat��j Cepl> - 6a89548 - Fix use of urlunsplit (25 hours ago) <Andreas Schwab> - 0a5a356 - tests/test_ssl: use -ciphercuites for TLS1.3 cipher in openssl1.1 <Sebastian Andrzej Siewior> - 8a0a3e3 - There are apparently multiword CPP variables. Taking that into account. <Mat��j Cepl>diff -r1.53 -r1.54 pkgsrc/security/py-m2crypto/Makefile
(jperkin)
@@ -1,30 +1,32 @@ | @@ -1,30 +1,32 @@ | |||
1 | # $NetBSD: Makefile,v 1.53 2020/04/24 11:41:37 nia Exp $ | 1 | # $NetBSD: Makefile,v 1.54 2020/09/17 08:56:38 jperkin Exp $ | |
2 | 2 | |||
3 | DISTNAME= M2Crypto-0.32.0 | 3 | DISTNAME= M2Crypto-0.36.0 | |
4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} | 4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} | |
5 | PKGREVISION= 1 | |||
6 | CATEGORIES= security python | 5 | CATEGORIES= security python | |
7 | MASTER_SITES= ${MASTER_SITE_PYPI:=M/M2Crypto/} | 6 | MASTER_SITES= ${MASTER_SITE_PYPI:=M/M2Crypto/} | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://gitlab.com/m2crypto/m2crypto | 9 | HOMEPAGE= https://gitlab.com/m2crypto/m2crypto | |
11 | COMMENT= Crypto and SSL toolkit for Python | 10 | COMMENT= Crypto and SSL toolkit for Python | |
12 | LICENSE= m2crypto-license | 11 | LICENSE= m2crypto-license | |
13 | 12 | |||
14 | BROKEN= "Fails to build with OpenSSL 1.1" | 13 | USE_LANGUAGES+= c c++11 | |
15 | 14 | |||
16 | .include "../../lang/python/pyversion.mk" | 15 | .include "../../lang/python/pyversion.mk" | |
17 | 16 | |||
18 | PLIST_VARS+= typing | 17 | PLIST_VARS+= typing | |
19 | 18 | |||
20 | .if ${_PYTHON_VERSION} == 27 | 19 | .if ${_PYTHON_VERSION} == 27 | |
21 | DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing | 20 | DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing | |
22 | PLIST.typing= yes | 21 | PLIST.typing= yes | |
23 | .endif | 22 | .endif | |
24 | 23 | |||
25 | PYSETUPBUILDARGS= build_ext --openssl=${BUILDLINK_PREFIX.openssl} | 24 | PYSETUPBUILDARGS= build_ext --openssl=${BUILDLINK_PREFIX.openssl} | |
26 | 25 | |||
27 | .include "../../devel/swig/buildlink3.mk" | 26 | pre-configure: | |
27 | ${LN} -s ${PREFIX}/bin/swig3.0 ${BUILDLINK_DIR}/bin/swig | |||
28 | ||||
29 | .include "../../devel/swig3/buildlink3.mk" | |||
28 | .include "../../lang/python/egg.mk" | 30 | .include "../../lang/python/egg.mk" | |
29 | .include "../../security/openssl/buildlink3.mk" | 31 | .include "../../security/openssl/buildlink3.mk" | |
30 | .include "../../mk/bsd.pkg.mk" | 32 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.18 2019/03/04 18:41:48 adam Exp $ | 1 | $NetBSD: distinfo,v 1.19 2020/09/17 08:56:38 jperkin Exp $ | |
2 | 2 | |||
3 | SHA1 (M2Crypto-0.32.0.tar.gz) = b36c43373f952401b9cc190e4e5ddd09028e276b | 3 | SHA1 (M2Crypto-0.36.0.tar.gz) = 666735839ad0d9b414cc39937ffad2675297bb02 | |
4 | RMD160 (M2Crypto-0.32.0.tar.gz) = 4d8b714b105ba4e2616d203edd72733736b124c1 | 4 | RMD160 (M2Crypto-0.36.0.tar.gz) = e813fd1da12a8b8a5550931129d29977a25cef5d | |
5 | SHA512 (M2Crypto-0.32.0.tar.gz) = 477cc30748b3ddc21b66872a88ba0e111a592928ce0d2edc9b72c9a8fa7aa2b422e1b785b830e8d8fcab9f1678928634627b0ea3d57632ec5769ba4ed64c16f8 | 5 | SHA512 (M2Crypto-0.36.0.tar.gz) = 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1 | |
6 | Size (M2Crypto-0.32.0.tar.gz) = 1292542 bytes | 6 | Size (M2Crypto-0.36.0.tar.gz) = 1127584 bytes | |
7 | SHA1 (patch-SWIG___m2crypto__wrap.c) = 2672787cd8fd70b5ac2cf634b6a913aefc27b26c | 7 | SHA1 (patch-SWIG___evp.i) = 07fc94a5c7dbd2fcfde716ec316d8a833f28ffc7 | |
8 | SHA1 (patch-setup.py) = ec43146954a849a7e12003397df19e6567df888c | 8 | SHA1 (patch-SWIG___m2crypto.i) = 5f6024d2be735c0cfcfd64ed69d6da289c8fd268 |
$NetBSD: patch-SWIG___evp.i,v 1.1 2020/09/17 08:56:38 jperkin Exp $
Avoid conflict with hmac() definition from stdlib.h (NetBSD).
--- SWIG/_evp.i.orig 2020-04-14 21:09:41.000000000 +0000
+++ SWIG/_evp.i
@@ -361,7 +361,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 = 0;
$NetBSD: patch-SWIG___m2crypto.i,v 1.1 2020/09/17 08:56:38 jperkin Exp $
Find local includes correctly.
--- SWIG/_m2crypto.i.orig 2020-01-30 08:17:01.000000000 +0000
+++ SWIG/_m2crypto.i
@@ -46,9 +46,9 @@ typedef unsigned __int64 uint64_t;
#include <openssl/err.h>
#include <openssl/rand.h>
-#include <_lib.h>
-#include <libcrypto-compat.h>
-#include <py3k_compat.h>
+#include "_lib.h"
+#include "libcrypto-compat.h"
+#include "py3k_compat.h"
#include "compile.h"