diff options
| author |   Aaron Bauman <bman@gentoo.org> | 2018-04-13 18:44:30 -0400 |
|---|---|---|
| committer | Aaron Bauman <bman@gentoo.org> | 2018-04-16 12:14:08 -0400 |
| commit | 9f295e6e7bc5fc6065d735e562ad51996260588f (patch) | |
| tree | 37571f1f9c949d510daeb36f8b595c1bb5d7c542 /dev-lang/python/files | |
| parent | dev-lang/python: compatibility patch for libressl (diff) | |
| download | gentoo-9f295e6e7bc5fc6065d735e562ad51996260588f.tar.gz gentoo-9f295e6e7bc5fc6065d735e562ad51996260588f.tar.bz2 gentoo-9f295e6e7bc5fc6065d735e562ad51996260588f.zip | |
dev-lang/python: compatibility patch for libressl
This patch fixes building with >=dev-libs/libressl-2.7. Additionally,
the slot and subslot modifier have been updated to ensure rebuilds are
properly triggered.
Bug: https://bugs.gentoo.org/651162
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7978
Diffstat (limited to 'dev-lang/python/files')
| -rw-r--r-- | dev-lang/python/files/python-3.5.5-libressl-compatibility.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/dev-lang/python/files/python-3.5.5-libressl-compatibility.patch b/dev-lang/python/files/python-3.5.5-libressl-compatibility.patch new file mode 100644 index 000000000000..67d57d0c138b --- /dev/null +++ b/dev-lang/python/files/python-3.5.5-libressl-compatibility.patch @@ -0,0 +1,69 @@ +# From 8d89a385b71a2e4cce0fba0cfc8d91b63485edc5 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> +# Patch modified by Aaron Bauman <bman@gentoo.org> for 3.5.5 + +--- a/Modules/_ssl.c 2018-04-13 18:33:17.397649561 -0400 ++++ b/Modules/_ssl.c 2018-04-13 18:40:22.319852014 -0400 +@@ -101,6 +101,12 @@ + + #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 +@@ -129,16 +135,18 @@ + #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 + + static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) +@@ -187,7 +195,7 @@ + { + return store->param; + } +-#endif /* OpenSSL < 1.1.0 or LibreSSL */ ++#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ + + + enum py_ssl_error { |