python: libressl 2.7 fix
This commit is contained in:
parent
d2a5a24efe
commit
3f61da2198
2 changed files with 53 additions and 1 deletions
52
srcpkgs/python/patches/libressl-2.7.patch
Normal file
52
srcpkgs/python/patches/libressl-2.7.patch
Normal file
|
@ -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 {
|
|
@ -4,7 +4,7 @@
|
||||||
#
|
#
|
||||||
pkgname=python
|
pkgname=python
|
||||||
version=2.7.14
|
version=2.7.14
|
||||||
revision=5
|
revision=6
|
||||||
wrksrc="Python-${version}"
|
wrksrc="Python-${version}"
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
|
makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
|
||||||
|
|
Loading…
Reference in a new issue