* [gentoo-commits] repo/gentoo:master commit in: dev-python/m2crypto/files/
@ 2017-08-13 11:24 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-08-13 11:24 UTC (permalink / raw
To: gentoo-commits
commit: e48e6a67c2bf03e4165d51f2793dc904f73faddb
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 8 08:25:22 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:23:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48e6a67
dev-python/m2crypto: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/5352
.../0.22.3-Use-swig-generated-python-loader.patch | 138 ---------------------
dev-python/m2crypto/files/0.22.3-packaging.patch | 69 -----------
2 files changed, 207 deletions(-)
diff --git a/dev-python/m2crypto/files/0.22.3-Use-swig-generated-python-loader.patch b/dev-python/m2crypto/files/0.22.3-Use-swig-generated-python-loader.patch
deleted file mode 100644
index 9ddd5509fdf..00000000000
--- a/dev-python/m2crypto/files/0.22.3-Use-swig-generated-python-loader.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 803188070e486030cb1d2e53692b39305c742b17 Mon Sep 17 00:00:00 2001
-From: Joe Julian <jjulian@io.com>
-Date: Tue, 19 May 2015 23:54:08 -0700
-Subject: [PATCH] Use swig generated python loader
-
----
- .gitignore | 6 +++++-
- M2Crypto/__init__.py | 4 ++--
- M2Crypto/m2.py | 4 +---
- SWIG/_m2crypto.def | 2 +-
- SWIG/_m2crypto.i | 2 +-
- setup.py | 25 +++++++++++++++++++++----
- 6 files changed, 31 insertions(+), 12 deletions(-)
-
-diff --git a/M2Crypto/__init__.py b/M2Crypto/__init__.py
-index 647e057..38dbbd5 100644
---- a/M2Crypto/__init__.py
-+++ b/M2Crypto/__init__.py
-@@ -19,7 +19,7 @@ Copyright 2008-2011 Heikki Toivonen. All rights reserved.
- version_info = (0, 22)
- version = '.'.join([str(_v) for _v in version_info])
-
--import __m2crypto
-+import m2crypto
- import m2
- import ASN1
- import AuthCookie
-@@ -47,4 +47,4 @@ import m2xmlrpclib
- import threading
- import util
-
--__m2crypto.lib_init()
-+m2crypto.lib_init()
-diff --git a/M2Crypto/m2.py b/M2Crypto/m2.py
-index e4bb695..516cadb 100644
---- a/M2Crypto/m2.py
-+++ b/M2Crypto/m2.py
-@@ -25,7 +25,5 @@ Portions created by Open Source Applications Foundation (OSAF) are
- Copyright (C) 2004 OSAF. All Rights Reserved.
- """
-
--from __m2crypto import *
-+from m2crypto import *
- lib_init()
--
--
-diff --git a/SWIG/_m2crypto.def b/SWIG/_m2crypto.def
-index 753db2c..3e9d5bc 100644
---- a/SWIG/_m2crypto.def
-+++ b/SWIG/_m2crypto.def
-@@ -1,2 +1,2 @@
- EXPORTS
--init__m2crypto
-+init_m2crypto
-diff --git a/SWIG/_m2crypto.i b/SWIG/_m2crypto.i
-index 50be5c3..e491222 100644
---- a/SWIG/_m2crypto.i
-+++ b/SWIG/_m2crypto.i
-@@ -8,7 +8,7 @@
- *
- */
-
--%module(threads=1) _m2crypto
-+%module(threads=1) m2crypto
- /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.
- Disable threadallow as well, only enable it for operations likely to
- block. */
-diff --git a/setup.py b/setup.py
-index bac6f9f..fc89513 100644
---- a/setup.py
-+++ b/setup.py
-@@ -17,9 +17,22 @@ import os, sys, platform
- from setuptools import setup
- from setuptools.command import build_ext
-
-+from distutils.util import get_platform
- from distutils.core import Extension
- from distutils.spawn import find_executable
-
-+from distutils.command.build import build
-+from setuptools.command.install import install
-+
-+class CustomBuild(build):
-+ def run(self):
-+ self.run_command('build_ext')
-+ build.run(self)
-+
-+class CustomInstall(install):
-+ def run(self):
-+ self.run_command('build_ext')
-+ self.do_egg_install()
-
- class _M2CryptoBuildExt(build_ext.build_ext):
- '''Specialization of build_ext to enable swig_opts to inherit any
-@@ -70,11 +83,12 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-
- self.add_multiarch_paths()
-
-- opensslIncludeDir = os.path.join(self.openssl, 'include')
-+ includeDir = os.path.join(self.openssl, 'include')
-+ opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
- opensslLibraryDir = os.path.join(self.openssl, 'lib')
-
- self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
-- [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]]
-+ [opensslIncludeDir, includeDir]]
- self.swig_opts.append('-includeall')
- self.swig_opts.append('-modern')
-
-@@ -85,6 +99,9 @@ class _M2CryptoBuildExt(build_ext.build_ext):
- elif platform.architecture()[0] == '32bit':
- self.swig_opts.append('-D__i386__')
-
-+ self.swig_opts.append('-outdir')
-+ self.swig_opts.append(os.path.join(os.getcwd(),'M2Crypto'))
-+
- self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
- os.path.join(os.getcwd(), 'SWIG')]
-
-@@ -103,7 +120,7 @@ if sys.platform == 'darwin':
- else:
- my_extra_compile_args = []
-
--m2crypto = Extension(name = 'M2Crypto.__m2crypto',
-+m2crypto = Extension(name = 'M2Crypto._m2crypto',
- sources = ['SWIG/_m2crypto.i'],
- extra_compile_args = ['-DTHREADING'] + my_extra_compile_args,
- #extra_link_args = ['-Wl,-search_paths_first'], # Uncomment to build Universal Mac binaries
-@@ -145,5 +162,5 @@ interface.''',
-
- ext_modules = [m2crypto],
- test_suite='tests.alltests.suite',
-- cmdclass = {'build_ext': _M2CryptoBuildExt}
-+ cmdclass = {'build': CustomBuild, 'install': CustomInstall, 'build_ext': _M2CryptoBuildExt}
- )
---
-2.4.1
-
diff --git a/dev-python/m2crypto/files/0.22.3-packaging.patch b/dev-python/m2crypto/files/0.22.3-packaging.patch
deleted file mode 100644
index 26952a4e78e..00000000000
--- a/dev-python/m2crypto/files/0.22.3-packaging.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0f2c82f097cf6d3722b7793fe1159160f3f52725 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 25 May 2015 12:08:47 -0400
-Subject: [PATCH] Gentoo-specific packaging fixes
-
-Fix cross-compiles
-EPREFIX support
----
- setup.py | 20 ++++----------------
- 1 file changed, 4 insertions(+), 16 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index fc89513..8360e7e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -32,7 +32,7 @@ class CustomBuild(build):
- class CustomInstall(install):
- def run(self):
- self.run_command('build_ext')
-- self.do_egg_install()
-+ install.run(self)
-
- class _M2CryptoBuildExt(build_ext.build_ext):
- '''Specialization of build_ext to enable swig_opts to inherit any
-@@ -81,29 +81,19 @@ class _M2CryptoBuildExt(build_ext.build_ext):
-
- build_ext.build_ext.finalize_options(self)
-
-- self.add_multiarch_paths()
--
- includeDir = os.path.join(self.openssl, 'include')
- opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
- opensslLibraryDir = os.path.join(self.openssl, 'lib')
-
-- self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
-- [opensslIncludeDir, includeDir]]
-+ eprefix = os.getenv('EPREFIX', '')
-+ self.swig_opts = ['-I' + eprefix + '/usr/include']
- self.swig_opts.append('-includeall')
- self.swig_opts.append('-modern')
-
-- # Fedora does hat tricks.
-- if platform.linux_distribution()[0] in ['Fedora', 'CentOS']:
-- if platform.architecture()[0] == '64bit':
-- self.swig_opts.append('-D__x86_64__')
-- elif platform.architecture()[0] == '32bit':
-- self.swig_opts.append('-D__i386__')
--
- self.swig_opts.append('-outdir')
- self.swig_opts.append(os.path.join(os.getcwd(),'M2Crypto'))
-
-- self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
-- os.path.join(os.getcwd(), 'SWIG')]
-+ self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
-
- if sys.platform == 'cygwin':
- # Cygwin SHOULD work (there's code in distutils), but
-@@ -113,8 +103,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
- # Someday distutils will be fixed and this won't be needed.
- self.library_dirs += [os.path.join(self.openssl, 'bin')]
-
-- self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
--
- if sys.platform == 'darwin':
- my_extra_compile_args = ["-Wno-deprecated-declarations"]
- else:
---
-2.4.1
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/m2crypto/files/
@ 2020-09-12 9:55 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-09-12 9:55 UTC (permalink / raw
To: gentoo-commits
commit: b9fae4ed6181b22f0fdc9ca50428aab8791dd19c
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 28 16:56:03 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 09:54:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9fae4ed
dev-python/m2crypto: remove unused patch
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch
deleted file mode 100644
index ff8388988ad..00000000000
--- a/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -50,7 +50,8 @@
- '*Visual*', 'VC', 'include')
- err = glob.glob(globmask)
- else:
-- pid = subprocess.Popen(['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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/m2crypto/files/
@ 2021-05-03 18:46 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-05-03 18:46 UTC (permalink / raw
To: gentoo-commits
commit: 66e9b462235af21833f09045c272c11e7b63d938
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 3 18:28:58 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 3 18:45:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e9b462
dev-python/m2crypto: drop obsolete LibreSSL patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../m2crypto/files/m2crypto-libressl-0.31.0.patch | 222 ---------------------
1 file changed, 222 deletions(-)
diff --git a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch
deleted file mode 100644
index 10ed142b33e..00000000000
--- a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From fa56170c7adf5f124a48cf1074390adfc697272c Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Wed, 9 Jan 2019 10:15:08 +0200
-Subject: [PATCH] Fix compilation with LibreSSL
-
----
- SWIG/_bio.i | 8 +++++---
- SWIG/_evp.i | 2 +-
- SWIG/_lib.i | 2 +-
- SWIG/_lib11_compat.i | 5 ++++-
- SWIG/_m2crypto_wrap.c | 11 ++++++++---
- SWIG/_ssl.i | 4 ++--
- SWIG/_threads.i | 10 +++++-----
- 7 files changed, 26 insertions(+), 16 deletions(-)
-
-diff --git a/SWIG/_bio.i b/SWIG/_bio.i
-index e85a275..8eada82 100644
---- a/SWIG/_bio.i
-+++ b/SWIG/_bio.i
-@@ -293,7 +293,7 @@ int bio_should_write(BIO* a) {
- }
-
- /* Macros for things not defined before 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static BIO_METHOD *
- BIO_meth_new( int type, const char *name )
- {
-@@ -325,11 +325,13 @@ BIO_meth_free( BIO_METHOD *meth )
- #define BIO_set_shutdown(b, x) (b)->shutdown = x
- #define BIO_get_shutdown(b) (b)->shutdown
- #define BIO_set_init(b, x) b->init = x
--#define BIO_get_init(b) (b)->init
- #define BIO_set_data(b, x) b->ptr = x
- #define BIO_clear_flags(b, x) b->flags &= ~(x)
- #define BIO_get_data(b) b->ptr
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
-
- /* implment custom BIO_s_pyfd */
-
-@@ -515,7 +517,7 @@ static long pyfd_ctrl(BIO *b, int cmd, long num, void *ptr) {
- }
-
- void pyfd_init(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- methods_fdp = BIO_meth_new(
- BIO_get_new_index()|BIO_TYPE_DESCRIPTOR|BIO_TYPE_SOURCE_SINK,
- "python file descriptor");
-diff --git a/SWIG/_evp.i b/SWIG/_evp.i
-index d04e806..6fa9b38 100644
---- a/SWIG/_evp.i
-+++ b/SWIG/_evp.i
-@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
- #include <openssl/rsa.h>
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-
- HMAC_CTX *HMAC_CTX_new(void) {
- HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));
-diff --git a/SWIG/_lib.i b/SWIG/_lib.i
-index c84b800..807d5f6 100644
---- a/SWIG/_lib.i
-+++ b/SWIG/_lib.i
-@@ -512,7 +512,7 @@ int passphrase_callback(char *buf, int num, int v, void *arg) {
- %inline %{
-
- void lib_init() {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- SSLeay_add_all_algorithms();
- ERR_load_ERR_strings();
- #endif
-diff --git a/SWIG/_lib11_compat.i b/SWIG/_lib11_compat.i
-index 1ec42dd..4234004 100644
---- a/SWIG/_lib11_compat.i
-+++ b/SWIG/_lib11_compat.i
-@@ -8,7 +8,7 @@
- */
-
- %{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #include <string.h>
- #include <openssl/engine.h>
-@@ -24,6 +24,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
- return ret;
- }
-
-+#endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-+
- #include <openssl/bn.h>
-
- #ifndef BN_F_BN_GENCB_NEW
-diff --git a/SWIG/_m2crypto_wrap.c b/SWIG/_m2crypto_wrap.c
-index 0f07702..f168822 100644
---- a/SWIG/_m2crypto_wrap.c
-+++ b/SWIG/_m2crypto_wrap.c
-@@ -3838,7 +3838,7 @@ void threading_cleanup(void) {
- #include <ceval.h>
-
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #include <string.h>
- #include <openssl/engine.h>
-@@ -3854,6 +3854,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
- return ret;
- }
-
-+#endif
-+#ifdef OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
-+
- #include <openssl/bn.h>
-
- #ifndef BN_F_BN_GENCB_NEW
-@@ -5315,7 +5318,7 @@ int bio_should_write(BIO* a) {
- }
-
- /* Macros for things not defined before 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static BIO_METHOD *
- BIO_meth_new( int type, const char *name )
- {
-@@ -5347,11 +5350,13 @@ BIO_meth_free( BIO_METHOD *meth )
- #define BIO_set_shutdown(b, x) (b)->shutdown = x
- #define BIO_get_shutdown(b) (b)->shutdown
- #define BIO_set_init(b, x) b->init = x
--#define BIO_get_init(b) (b)->init
- #define BIO_set_data(b, x) b->ptr = x
- #define BIO_clear_flags(b, x) b->flags &= ~(x)
- #define BIO_get_data(b) b->ptr
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#define BIO_get_init(b) (b)->init
-+#endif
-
- /* implment custom BIO_s_pyfd */
-
-diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i
-index 7257656..40b0582 100644
---- a/SWIG/_ssl.i
-+++ b/SWIG/_ssl.i
-@@ -27,7 +27,7 @@ typedef unsigned __int64 uint64_t;
- #endif
- %}
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100005L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100005L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- %include <openssl/safestack.h>
- #endif
-
-@@ -261,7 +261,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) {
- }
-
- const SSL_METHOD *tlsv1_method(void) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- PyErr_WarnEx(PyExc_DeprecationWarning,
- "Function TLSv1_method has been deprecated.", 1);
- #endif
-diff --git a/SWIG/_threads.i b/SWIG/_threads.i
-index 69adb9f..fd2285a 100644
---- a/SWIG/_threads.i
-+++ b/SWIG/_threads.i
-@@ -5,7 +5,7 @@
- #include <pythread.h>
- #include <openssl/crypto.h>
-
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- #define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS)
- static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
- static long lock_count[CRYPTO_num_locks()];
-@@ -13,7 +13,7 @@ static int thread_mode = 0;
- #endif
-
- void threading_locking_callback(int mode, int type, const char *file, int line) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- if (mode & CRYPTO_LOCK) {
- PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
- lock_count[type]++;
-@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, const char *file, int line)
- }
-
- unsigned long threading_id_callback(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- return (unsigned long)PyThread_get_thread_ident();
- #else
- return (unsigned long)0;
-@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) {
-
- %inline %{
- void threading_init(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- int i;
- if (!thread_mode) {
- for (i=0; i<CRYPTO_num_locks(); i++) {
-@@ -50,7 +50,7 @@ void threading_init(void) {
- }
-
- void threading_cleanup(void) {
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
- int i;
- if (thread_mode) {
- CRYPTO_set_locking_callback(NULL);
---
-2.20.1
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-03 18:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-12 9:55 [gentoo-commits] repo/gentoo:master commit in: dev-python/m2crypto/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-05-03 18:46 Sam James
2017-08-13 11:24 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox