From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F1CA15808B for ; Wed, 16 Mar 2022 23:57:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6982E092A; Wed, 16 Mar 2022 23:57:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2706BE092A for ; Wed, 16 Mar 2022 23:57:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27AA6343313 for ; Wed, 16 Mar 2022 23:56:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E8BB2D2 for ; Wed, 16 Mar 2022 23:56:39 +0000 (UTC) From: "Quentin Retornaz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Quentin Retornaz" Message-ID: <1647474987.e07dadf93420be2dc3997c7352ca18a228441c8f.quentin@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-lang/python/files/, dev-lang/python/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-lang/python/files/python-3.9.9-r1-libressl.patch dev-lang/python/python-3.9.9-r1.ebuild X-VCS-Directories: dev-lang/python/ dev-lang/python/files/ X-VCS-Committer: quentin X-VCS-Committer-Name: Quentin Retornaz X-VCS-Revision: e07dadf93420be2dc3997c7352ca18a228441c8f X-VCS-Branch: master Date: Wed, 16 Mar 2022 23:56:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e57948da-1ad3-4ac1-b93e-fe8c2ac2e0af X-Archives-Hash: f8f50f3a020b03c4752145bc940306d7 commit: e07dadf93420be2dc3997c7352ca18a228441c8f Author: Mike Skec protonmail ch> AuthorDate: Tue Mar 15 23:44:15 2022 +0000 Commit: Quentin Retornaz retornaz com> CommitDate: Wed Mar 16 23:56:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e07dadf9 dev-lang/python: pull in OpenBSD patches to fix build Signed-off-by: Mike Skec protonmail.ch> Closes: https://github.com/gentoo/libressl/pull/388 Signed-off-by: Quentin Retornaz retornaz.com> .../python/files/python-3.9.9-r1-libressl.patch | 34 ++++++++++++++++++++++ dev-lang/python/python-3.9.9-r1.ebuild | 1 + 2 files changed, 35 insertions(+) diff --git a/dev-lang/python/files/python-3.9.9-r1-libressl.patch b/dev-lang/python/files/python-3.9.9-r1-libressl.patch new file mode 100644 index 0000000..997bc0e --- /dev/null +++ b/dev-lang/python/files/python-3.9.9-r1-libressl.patch @@ -0,0 +1,34 @@ +$OpenBSD: patch-Modules__hashopenssl_c,v 1.3 2022/01/21 04:25:12 kmos Exp $ + +Index: Modules/_hashopenssl.c +--- a/Modules/_hashopenssl.c ++++ b/Modules/_hashopenssl.c +@@ -43,7 +43,8 @@ + # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* OpenSSL < 1.1.0 */ + #define EVP_MD_CTX_new EVP_MD_CTX_create + #define EVP_MD_CTX_free EVP_MD_CTX_destroy + +$OpenBSD: patch-Modules__ssl_c,v 1.3 2021/11/18 15:45:28 tb Exp $ + +XXX maybe this can go away now we have auto-init, I'm not sure exactly +what python's lock protects + +Index: Modules/_ssl.c +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -213,6 +213,9 @@ extern const SSL_METHOD *TLSv1_2_method(void); + #if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) + #define OPENSSL_NO_SSL2 + #endif ++#if defined(LIBRESSL_VERSION_NUMBER) && defined(WITH_THREAD) ++#define HAVE_OPENSSL_CRYPTO_LOCK ++#endif + + #ifndef PY_OPENSSL_1_1_API + /* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ diff --git a/dev-lang/python/python-3.9.9-r1.ebuild b/dev-lang/python/python-3.9.9-r1.ebuild index 0371630..dd18752 100644 --- a/dev-lang/python/python-3.9.9-r1.ebuild +++ b/dev-lang/python/python-3.9.9-r1.ebuild @@ -94,6 +94,7 @@ src_prepare() { local PATCHES=( "${WORKDIR}/${PATCHSET}" + "${FILESDIR}"/${PN}-3.9.9-r1-libressl.patch ) default