1 |
commit: 256371d3c2fc03f1c9e746a0c52b4a753dcf09ec |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jan 19 09:25:27 2019 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 5 22:37:43 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=256371d3 |
7 |
|
8 |
dev-lang/python: remove unused patches. |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/10869 |
12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
13 |
|
14 |
dev-lang/python/files/2.7-disable-nis.patch | 21 ----- |
15 |
.../files/python-2.7-libressl-compatibility.patch | 92 ---------------------- |
16 |
2 files changed, 113 deletions(-) |
17 |
|
18 |
diff --git a/dev-lang/python/files/2.7-disable-nis.patch b/dev-lang/python/files/2.7-disable-nis.patch |
19 |
deleted file mode 100644 |
20 |
index 5a6cb3e403f..00000000000 |
21 |
--- a/dev-lang/python/files/2.7-disable-nis.patch |
22 |
+++ /dev/null |
23 |
@@ -1,21 +0,0 @@ |
24 |
---- a/setup.py |
25 |
-+++ b/setup.py |
26 |
-@@ -1346,17 +1346,7 @@ class PyBuildExt(build_ext): |
27 |
- else: |
28 |
- missing.append('resource') |
29 |
- |
30 |
-- # Sun yellow pages. Some systems have the functions in libc. |
31 |
-- if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and |
32 |
-- find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): |
33 |
-- if (self.compiler.find_library_file(lib_dirs, 'nsl')): |
34 |
-- libs = ['nsl'] |
35 |
-- else: |
36 |
-- libs = [] |
37 |
-- exts.append( Extension('nis', ['nismodule.c'], |
38 |
-- libraries = libs) ) |
39 |
-- else: |
40 |
-- missing.append('nis') |
41 |
-+ missing.append('nis') |
42 |
- else: |
43 |
- missing.extend(['nis', 'resource', 'termios']) |
44 |
- |
45 |
|
46 |
diff --git a/dev-lang/python/files/python-2.7-libressl-compatibility.patch b/dev-lang/python/files/python-2.7-libressl-compatibility.patch |
47 |
deleted file mode 100644 |
48 |
index c9e7a8458e3..00000000000 |
49 |
--- a/dev-lang/python/files/python-2.7-libressl-compatibility.patch |
50 |
+++ /dev/null |
51 |
@@ -1,92 +0,0 @@ |
52 |
-# From https://github.com/python/cpython/pull/6215 |
53 |
- |
54 |
-# LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects |
55 |
-# LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and |
56 |
-# LibreSSL < 2.7. |
57 |
- |
58 |
-# Documentation updates and fixes for failing tests will be provided in |
59 |
-# another patch set. |
60 |
- |
61 |
-# Signed-off-by: Christian Heimes christian@××××××.org. |
62 |
-# (cherry picked from commit 4ca0739) |
63 |
- |
64 |
-#Co-authored-by: Christian Heimes christian@××××××.org |
65 |
- |
66 |
---- a/Modules/_ssl.c 2017-09-16 17:38:35.000000000 +0000 |
67 |
-+++ b/Modules/_ssl.c 2018-04-13 15:55:10.919424126 +0000 |
68 |
-@@ -97,6 +102,12 @@ |
69 |
- |
70 |
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) |
71 |
- # define OPENSSL_VERSION_1_1 1 |
72 |
-+# define PY_OPENSSL_1_1_API 1 |
73 |
-+#endif |
74 |
-+ |
75 |
-+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ |
76 |
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL |
77 |
-+# define PY_OPENSSL_1_1_API 1 |
78 |
- #endif |
79 |
- |
80 |
- /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 |
81 |
-@@ -118,24 +129,44 @@ |
82 |
- #endif |
83 |
- |
84 |
- /* ALPN added in OpenSSL 1.0.2 */ |
85 |
--#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT) |
86 |
--# define HAVE_ALPN |
87 |
-+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation |
88 |
-+# define HAVE_ALPN 1 |
89 |
-+#else |
90 |
-+# define HAVE_ALPN 0 |
91 |
-+#endif |
92 |
-+ |
93 |
-+/* We cannot rely on OPENSSL_NO_NEXTPROTONEG because LibreSSL 2.6.1 dropped |
94 |
-+ * NPN support but did not set OPENSSL_NO_NEXTPROTONEG for compatibility |
95 |
-+ * reasons. The check for TLSEXT_TYPE_next_proto_neg works with |
96 |
-+ * OpenSSL 1.0.1+ and LibreSSL. |
97 |
-+ * OpenSSL 1.1.1-pre1 dropped NPN but still has TLSEXT_TYPE_next_proto_neg. |
98 |
-+ */ |
99 |
-+#ifdef OPENSSL_NO_NEXTPROTONEG |
100 |
-+# define HAVE_NPN 0 |
101 |
-+#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) |
102 |
-+# define HAVE_NPN 0 |
103 |
-+#elif defined(TLSEXT_TYPE_next_proto_neg) |
104 |
-+# define HAVE_NPN 1 |
105 |
-+#else |
106 |
-+# define HAVE_NPN 0 |
107 |
- #endif |
108 |
- |
109 |
- #ifndef INVALID_SOCKET /* MS defines this */ |
110 |
- #define INVALID_SOCKET (-1) |
111 |
- #endif |
112 |
- |
113 |
--#ifdef OPENSSL_VERSION_1_1 |
114 |
--/* OpenSSL 1.1.0+ */ |
115 |
--#ifndef OPENSSL_NO_SSL2 |
116 |
--#define OPENSSL_NO_SSL2 |
117 |
--#endif |
118 |
--#else /* OpenSSL < 1.1.0 */ |
119 |
--#if defined(WITH_THREAD) |
120 |
-+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ |
121 |
-+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) |
122 |
- #define HAVE_OPENSSL_CRYPTO_LOCK |
123 |
- #endif |
124 |
- |
125 |
-+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) |
126 |
-+#define OPENSSL_NO_SSL2 |
127 |
-+#endif |
128 |
-+ |
129 |
-+#ifndef PY_OPENSSL_1_1_API |
130 |
-+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ |
131 |
-+ |
132 |
- #define TLS_method SSLv23_method |
133 |
- |
134 |
- static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) |
135 |
-@@ -178,7 +209,7 @@ |
136 |
- { |
137 |
- return store->param; |
138 |
- } |
139 |
--#endif /* OpenSSL < 1.1.0 or LibreSSL */ |
140 |
-+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ |
141 |
- |
142 |
- |
143 |
- enum py_ssl_error { |