1 |
commit: 66e9b462235af21833f09045c272c11e7b63d938 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 3 18:28:58 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 3 18:45:35 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e9b462 |
7 |
|
8 |
dev-python/m2crypto: drop obsolete LibreSSL patch |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../m2crypto/files/m2crypto-libressl-0.31.0.patch | 222 --------------------- |
13 |
1 file changed, 222 deletions(-) |
14 |
|
15 |
diff --git a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch |
16 |
deleted file mode 100644 |
17 |
index 10ed142b33e..00000000000 |
18 |
--- a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch |
19 |
+++ /dev/null |
20 |
@@ -1,222 +0,0 @@ |
21 |
-From fa56170c7adf5f124a48cf1074390adfc697272c Mon Sep 17 00:00:00 2001 |
22 |
-From: Stefan Strogin <stefan.strogin@×××××.com> |
23 |
-Date: Wed, 9 Jan 2019 10:15:08 +0200 |
24 |
-Subject: [PATCH] Fix compilation with LibreSSL |
25 |
- |
26 |
---- |
27 |
- SWIG/_bio.i | 8 +++++--- |
28 |
- SWIG/_evp.i | 2 +- |
29 |
- SWIG/_lib.i | 2 +- |
30 |
- SWIG/_lib11_compat.i | 5 ++++- |
31 |
- SWIG/_m2crypto_wrap.c | 11 ++++++++--- |
32 |
- SWIG/_ssl.i | 4 ++-- |
33 |
- SWIG/_threads.i | 10 +++++----- |
34 |
- 7 files changed, 26 insertions(+), 16 deletions(-) |
35 |
- |
36 |
-diff --git a/SWIG/_bio.i b/SWIG/_bio.i |
37 |
-index e85a275..8eada82 100644 |
38 |
---- a/SWIG/_bio.i |
39 |
-+++ b/SWIG/_bio.i |
40 |
-@@ -293,7 +293,7 @@ int bio_should_write(BIO* a) { |
41 |
- } |
42 |
- |
43 |
- /* Macros for things not defined before 1.1.0 */ |
44 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
45 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
46 |
- static BIO_METHOD * |
47 |
- BIO_meth_new( int type, const char *name ) |
48 |
- { |
49 |
-@@ -325,11 +325,13 @@ BIO_meth_free( BIO_METHOD *meth ) |
50 |
- #define BIO_set_shutdown(b, x) (b)->shutdown = x |
51 |
- #define BIO_get_shutdown(b) (b)->shutdown |
52 |
- #define BIO_set_init(b, x) b->init = x |
53 |
--#define BIO_get_init(b) (b)->init |
54 |
- #define BIO_set_data(b, x) b->ptr = x |
55 |
- #define BIO_clear_flags(b, x) b->flags &= ~(x) |
56 |
- #define BIO_get_data(b) b->ptr |
57 |
- #endif |
58 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
59 |
-+#define BIO_get_init(b) (b)->init |
60 |
-+#endif |
61 |
- |
62 |
- /* implment custom BIO_s_pyfd */ |
63 |
- |
64 |
-@@ -515,7 +517,7 @@ static long pyfd_ctrl(BIO *b, int cmd, long num, void *ptr) { |
65 |
- } |
66 |
- |
67 |
- void pyfd_init(void) { |
68 |
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
69 |
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) |
70 |
- methods_fdp = BIO_meth_new( |
71 |
- BIO_get_new_index()|BIO_TYPE_DESCRIPTOR|BIO_TYPE_SOURCE_SINK, |
72 |
- "python file descriptor"); |
73 |
-diff --git a/SWIG/_evp.i b/SWIG/_evp.i |
74 |
-index d04e806..6fa9b38 100644 |
75 |
---- a/SWIG/_evp.i |
76 |
-+++ b/SWIG/_evp.i |
77 |
-@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved. |
78 |
- #include <openssl/rsa.h> |
79 |
- #include <openssl/opensslv.h> |
80 |
- |
81 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
82 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
83 |
- |
84 |
- HMAC_CTX *HMAC_CTX_new(void) { |
85 |
- HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX)); |
86 |
-diff --git a/SWIG/_lib.i b/SWIG/_lib.i |
87 |
-index c84b800..807d5f6 100644 |
88 |
---- a/SWIG/_lib.i |
89 |
-+++ b/SWIG/_lib.i |
90 |
-@@ -512,7 +512,7 @@ int passphrase_callback(char *buf, int num, int v, void *arg) { |
91 |
- %inline %{ |
92 |
- |
93 |
- void lib_init() { |
94 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
95 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
96 |
- SSLeay_add_all_algorithms(); |
97 |
- ERR_load_ERR_strings(); |
98 |
- #endif |
99 |
-diff --git a/SWIG/_lib11_compat.i b/SWIG/_lib11_compat.i |
100 |
-index 1ec42dd..4234004 100644 |
101 |
---- a/SWIG/_lib11_compat.i |
102 |
-+++ b/SWIG/_lib11_compat.i |
103 |
-@@ -8,7 +8,7 @@ |
104 |
- */ |
105 |
- |
106 |
- %{ |
107 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
108 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
109 |
- |
110 |
- #include <string.h> |
111 |
- #include <openssl/engine.h> |
112 |
-@@ -24,6 +24,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line) |
113 |
- return ret; |
114 |
- } |
115 |
- |
116 |
-+#endif |
117 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
118 |
-+ |
119 |
- #include <openssl/bn.h> |
120 |
- |
121 |
- #ifndef BN_F_BN_GENCB_NEW |
122 |
-diff --git a/SWIG/_m2crypto_wrap.c b/SWIG/_m2crypto_wrap.c |
123 |
-index 0f07702..f168822 100644 |
124 |
---- a/SWIG/_m2crypto_wrap.c |
125 |
-+++ b/SWIG/_m2crypto_wrap.c |
126 |
-@@ -3838,7 +3838,7 @@ void threading_cleanup(void) { |
127 |
- #include <ceval.h> |
128 |
- |
129 |
- |
130 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
131 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
132 |
- |
133 |
- #include <string.h> |
134 |
- #include <openssl/engine.h> |
135 |
-@@ -3854,6 +3854,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line) |
136 |
- return ret; |
137 |
- } |
138 |
- |
139 |
-+#endif |
140 |
-+#ifdef OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
141 |
-+ |
142 |
- #include <openssl/bn.h> |
143 |
- |
144 |
- #ifndef BN_F_BN_GENCB_NEW |
145 |
-@@ -5315,7 +5318,7 @@ int bio_should_write(BIO* a) { |
146 |
- } |
147 |
- |
148 |
- /* Macros for things not defined before 1.1.0 */ |
149 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
150 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
151 |
- static BIO_METHOD * |
152 |
- BIO_meth_new( int type, const char *name ) |
153 |
- { |
154 |
-@@ -5347,11 +5350,13 @@ BIO_meth_free( BIO_METHOD *meth ) |
155 |
- #define BIO_set_shutdown(b, x) (b)->shutdown = x |
156 |
- #define BIO_get_shutdown(b) (b)->shutdown |
157 |
- #define BIO_set_init(b, x) b->init = x |
158 |
--#define BIO_get_init(b) (b)->init |
159 |
- #define BIO_set_data(b, x) b->ptr = x |
160 |
- #define BIO_clear_flags(b, x) b->flags &= ~(x) |
161 |
- #define BIO_get_data(b) b->ptr |
162 |
- #endif |
163 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
164 |
-+#define BIO_get_init(b) (b)->init |
165 |
-+#endif |
166 |
- |
167 |
- /* implment custom BIO_s_pyfd */ |
168 |
- |
169 |
-diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i |
170 |
-index 7257656..40b0582 100644 |
171 |
---- a/SWIG/_ssl.i |
172 |
-+++ b/SWIG/_ssl.i |
173 |
-@@ -27,7 +27,7 @@ typedef unsigned __int64 uint64_t; |
174 |
- #endif |
175 |
- %} |
176 |
- |
177 |
--#if OPENSSL_VERSION_NUMBER >= 0x10100005L |
178 |
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100005L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) |
179 |
- %include <openssl/safestack.h> |
180 |
- #endif |
181 |
- |
182 |
-@@ -261,7 +261,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) { |
183 |
- } |
184 |
- |
185 |
- const SSL_METHOD *tlsv1_method(void) { |
186 |
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
187 |
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) |
188 |
- PyErr_WarnEx(PyExc_DeprecationWarning, |
189 |
- "Function TLSv1_method has been deprecated.", 1); |
190 |
- #endif |
191 |
-diff --git a/SWIG/_threads.i b/SWIG/_threads.i |
192 |
-index 69adb9f..fd2285a 100644 |
193 |
---- a/SWIG/_threads.i |
194 |
-+++ b/SWIG/_threads.i |
195 |
-@@ -5,7 +5,7 @@ |
196 |
- #include <pythread.h> |
197 |
- #include <openssl/crypto.h> |
198 |
- |
199 |
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L |
200 |
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) |
201 |
- #define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS) |
202 |
- static PyThread_type_lock lock_cs[CRYPTO_num_locks()]; |
203 |
- static long lock_count[CRYPTO_num_locks()]; |
204 |
-@@ -13,7 +13,7 @@ static int thread_mode = 0; |
205 |
- #endif |
206 |
- |
207 |
- void threading_locking_callback(int mode, int type, const char *file, int line) { |
208 |
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L |
209 |
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) |
210 |
- if (mode & CRYPTO_LOCK) { |
211 |
- PyThread_acquire_lock(lock_cs[type], WAIT_LOCK); |
212 |
- lock_count[type]++; |
213 |
-@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, const char *file, int line) |
214 |
- } |
215 |
- |
216 |
- unsigned long threading_id_callback(void) { |
217 |
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L |
218 |
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) |
219 |
- return (unsigned long)PyThread_get_thread_ident(); |
220 |
- #else |
221 |
- return (unsigned long)0; |
222 |
-@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) { |
223 |
- |
224 |
- %inline %{ |
225 |
- void threading_init(void) { |
226 |
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L |
227 |
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) |
228 |
- int i; |
229 |
- if (!thread_mode) { |
230 |
- for (i=0; i<CRYPTO_num_locks(); i++) { |
231 |
-@@ -50,7 +50,7 @@ void threading_init(void) { |
232 |
- } |
233 |
- |
234 |
- void threading_cleanup(void) { |
235 |
--#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L |
236 |
-+#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)) |
237 |
- int i; |
238 |
- if (thread_mode) { |
239 |
- CRYPTO_set_locking_callback(NULL); |
240 |
--- |
241 |
-2.20.1 |
242 |
- |