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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8B8A61382C5 for ; Mon, 16 Apr 2018 16:14:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92347E0968; Mon, 16 Apr 2018 16:14:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54C66E0969 for ; Mon, 16 Apr 2018 16:14:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0D23335C7E for ; Mon, 16 Apr 2018 16:14:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44E88285 for ; Mon, 16 Apr 2018 16:14:19 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1523895248.9f295e6e7bc5fc6065d735e562ad51996260588f.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/, dev-lang/python/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/python/files/python-3.5.5-libressl-compatibility.patch dev-lang/python/python-3.5.5.ebuild X-VCS-Directories: dev-lang/python/ dev-lang/python/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 9f295e6e7bc5fc6065d735e562ad51996260588f X-VCS-Branch: master Date: Mon, 16 Apr 2018 16:14:19 +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-Archives-Salt: 5dcfa934-b328-49bf-bc8d-5cb3b8ac5912 X-Archives-Hash: 9cc073aca041e56e7935a1b8ee64df29 commit: 9f295e6e7bc5fc6065d735e562ad51996260588f Author: Aaron Bauman gentoo org> AuthorDate: Fri Apr 13 22:44:30 2018 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Mon Apr 16 16:14:08 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f295e6e 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 .../python-3.5.5-libressl-compatibility.patch | 69 ++++++++++++++++++++++ dev-lang/python/python-3.5.5.ebuild | 3 +- 2 files changed, 71 insertions(+), 1 deletion(-) 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 00000000000..67d57d0c138 --- /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 +# 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 . +# (cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1) + +# Co-authored-by: Christian Heimes +# Patch modified by Aaron Bauman 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 { diff --git a/dev-lang/python/python-3.5.5.ebuild b/dev-lang/python/python-3.5.5.ebuild index 51ef212e0f8..64ccaa26cb3 100644 --- a/dev-lang/python/python-3.5.5.ebuild +++ b/dev-lang/python/python-3.5.5.ebuild @@ -38,7 +38,7 @@ RDEPEND="app-arch/bzip2:0= sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= @@ -74,6 +74,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch" epatch "${FILESDIR}/${PN}-3.5-distutils-OO-build.patch" epatch "${FILESDIR}/3.6-disable-nis.patch" + epatch "${FILESDIR}/python-3.5.5-libressl-compatibility.patch" epatch_user