mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 05:17:07 +02:00
main/python3: rebuild against libressl-2.7
This commit is contained in:
Natanael Copa
parent
31dc4920f2
commit
f73d91fd99
@ -1,11 +1,11 @@
|
||||
# Maintainer:
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
|
||||
|
||||
pkgname=python3
|
||||
# the python2-tkinter's pkgver needs to be synchronized with this.
|
||||
pkgver=3.6.4
|
||||
_basever="${pkgver%.*}"
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="A high-level scripting language"
|
||||
url="http://www.python.org"
|
||||
arch="all"
|
||||
@ -20,6 +20,7 @@ source="http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
|
||||
fix-xattrs-glibc.patch
|
||||
bpo-30353.patch
|
||||
libressl.patch
|
||||
libressl-2.7.patch
|
||||
"
|
||||
builddir="$srcdir/Python-$pkgver"
|
||||
|
||||
@ -147,4 +148,5 @@ sha512sums="09ba2103ac517ac4d262f00380c9aac836a53401ce252540c17fd821a3b92e1ddf32
|
||||
ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2 musl-find_library.patch
|
||||
37b6ee5d0d5de43799316aa111423ba5a666c17dc7f81b04c330f59c1d1565540eac4c585abe2199bbed52ebe7426001edb1c53bd0a17486a2a8e052d0f494ad fix-xattrs-glibc.patch
|
||||
df54032e66171483aad24f9f370e185072dcb2d6981210a8dd79b5fa51c2c7aa64da2501aa96bb5009bfb658387851068bc82f23c515f739672722495c2c98dd bpo-30353.patch
|
||||
8402ab554bb121c5737b5dc49c18719a5655545e914eed2210374b8aeaad3db7f0cff45c1c23a8e06a0f298677995a8d35ba6336667c69125eb1428254beba20 libressl.patch"
|
||||
8402ab554bb121c5737b5dc49c18719a5655545e914eed2210374b8aeaad3db7f0cff45c1c23a8e06a0f298677995a8d35ba6336667c69125eb1428254beba20 libressl.patch
|
||||
bd93678693fcb6aaba784023b5b5fc90b0ba18078f2b1fa4f2cfd153307418cd8c0317b8f2bcdaf6da8ed6ecece0a96eaf9ac62cf987f9a7e042d0b4d2e81d0c libressl-2.7.patch"
|
||||
|
||||
111
main/python3/libressl-2.7.patch
Normal file
111
main/python3/libressl-2.7.patch
Normal file
@ -0,0 +1,111 @@
|
||||
From f5befbb0d1526f18eb2b24eabb48c3b761c624a2 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Heimes <christian@python.org>
|
||||
Date: Sat, 24 Mar 2018 18:38:14 +0100
|
||||
Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0
|
||||
(GH-6210) (GH-6214)
|
||||
|
||||
LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects
|
||||
LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and
|
||||
LibreSSL < 2.7.
|
||||
|
||||
Documentation updates and fixes for failing tests will be provided in
|
||||
another patch set.
|
||||
|
||||
Signed-off-by: Christian Heimes <christian@python.org>.
|
||||
(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1)
|
||||
|
||||
Co-authored-by: Christian Heimes <christian@python.org>
|
||||
---
|
||||
Lib/test/test_ssl.py | 1 +
|
||||
.../2018-03-24-15-08-24.bpo-33127.olJmHv.rst | 1 +
|
||||
Modules/_ssl.c | 24 ++++++++++++++--------
|
||||
Tools/ssl/multissltests.py | 3 ++-
|
||||
4 files changed, 20 insertions(+), 9 deletions(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst
|
||||
|
||||
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
|
||||
index 8dd3b4145078..9785a59a7e49 100644
|
||||
--- a/Lib/test/test_ssl.py
|
||||
+++ b/Lib/test/test_ssl.py
|
||||
@@ -1687,6 +1687,7 @@ def test_get_ca_certs_capath(self):
|
||||
self.assertEqual(len(ctx.get_ca_certs()), 1)
|
||||
|
||||
@needs_sni
|
||||
+ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), "needs TLS 1.2")
|
||||
def test_context_setget(self):
|
||||
# Check that the context of a connected socket can be replaced.
|
||||
ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
|
||||
diff --git a/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst
|
||||
new file mode 100644
|
||||
index 000000000000..635aabbde031
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst
|
||||
@@ -0,0 +1 @@
|
||||
+The ssl module now compiles with LibreSSL 2.7.1.
|
||||
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
|
||||
index c54e43c2b48a..5e007da858bd 100644
|
||||
--- a/Modules/_ssl.c
|
||||
+++ b/Modules/_ssl.c
|
||||
@@ -106,6 +106,12 @@ struct py_ssl_library_code {
|
||||
|
||||
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
# define OPENSSL_VERSION_1_1 1
|
||||
+# define PY_OPENSSL_1_1_API 1
|
||||
+#endif
|
||||
+
|
||||
+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */
|
||||
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL
|
||||
+# define PY_OPENSSL_1_1_API 1
|
||||
#endif
|
||||
|
||||
/* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1
|
||||
@@ -152,16 +158,18 @@ struct py_ssl_library_code {
|
||||
#define INVALID_SOCKET (-1)
|
||||
#endif
|
||||
|
||||
-#ifdef OPENSSL_VERSION_1_1
|
||||
-/* OpenSSL 1.1.0+ */
|
||||
-#ifndef OPENSSL_NO_SSL2
|
||||
-#define OPENSSL_NO_SSL2
|
||||
-#endif
|
||||
-#else /* OpenSSL < 1.1.0 */
|
||||
-#if defined(WITH_THREAD)
|
||||
+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */
|
||||
+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD)
|
||||
#define HAVE_OPENSSL_CRYPTO_LOCK
|
||||
#endif
|
||||
|
||||
+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2)
|
||||
+#define OPENSSL_NO_SSL2
|
||||
+#endif
|
||||
+
|
||||
+#ifndef PY_OPENSSL_1_1_API
|
||||
+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */
|
||||
+
|
||||
#define TLS_method SSLv23_method
|
||||
#define TLS_client_method SSLv23_client_method
|
||||
#define TLS_server_method SSLv23_server_method
|
||||
@@ -227,7 +235,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s)
|
||||
return s->tlsext_tick_lifetime_hint;
|
||||
}
|
||||
|
||||
-#endif /* OpenSSL < 1.1.0 or LibreSSL */
|
||||
+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */
|
||||
|
||||
|
||||
enum py_ssl_error {
|
||||
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
|
||||
index ce5bbd85308c..ba4529ae0611 100755
|
||||
--- a/Tools/ssl/multissltests.py
|
||||
+++ b/Tools/ssl/multissltests.py
|
||||
@@ -57,8 +57,9 @@
|
||||
]
|
||||
|
||||
LIBRESSL_RECENT_VERSIONS = [
|
||||
- "2.5.3",
|
||||
"2.5.5",
|
||||
+ "2.6.4",
|
||||
+ "2.7.1",
|
||||
]
|
||||
|
||||
# store files in ../multissl
|
||||
Loading…
Reference in New Issue
Block a user