From 3f61da2198f89b39b312140b29aebe15059af548 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 27 Apr 2018 07:52:04 +0200 Subject: [PATCH] python: libressl 2.7 fix --- srcpkgs/python/patches/libressl-2.7.patch | 52 +++++++++++++++++++++++ srcpkgs/python/template | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/python/patches/libressl-2.7.patch diff --git a/srcpkgs/python/patches/libressl-2.7.patch b/srcpkgs/python/patches/libressl-2.7.patch new file mode 100644 index 0000000000..1bbcdc7a43 --- /dev/null +++ b/srcpkgs/python/patches/libressl-2.7.patch @@ -0,0 +1,52 @@ +Based on https://github.com/python/cpython/pull/6210. + +--- Modules/_ssl.c.orig ++++ Modules/_ssl.c +@@ -102,6 +102,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 +@@ -149,16 +155,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 + + static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) +@@ -201,7 +209,7 @@ static X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *store) + { + return store->param; + } +-#endif /* OpenSSL < 1.1.0 or LibreSSL */ ++#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ + + + enum py_ssl_error { diff --git a/srcpkgs/python/template b/srcpkgs/python/template index beb8ff28eb..89a50a4dc6 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -4,7 +4,7 @@ # pkgname=python version=2.7.14 -revision=5 +revision=6 wrksrc="Python-${version}" hostmakedepends="pkg-config" makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel