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 583FD138334 for ; Wed, 4 Sep 2019 07:17:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA214E081A; Wed, 4 Sep 2019 07:16:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 08BDBE081A for ; Wed, 4 Sep 2019 07:16:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C281634AB94 for ; Wed, 4 Sep 2019 07:16:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38529776 for ; Wed, 4 Sep 2019 07:16:55 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1567581399.c6c5718a40db2adb0084150bf5fb30b4d29e53d5.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/, www-servers/apache/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/apache/apache-2.4.41.ebuild www-servers/apache/files/apache-2.4.41-libressl.patch X-VCS-Directories: www-servers/apache/ www-servers/apache/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c6c5718a40db2adb0084150bf5fb30b4d29e53d5 X-VCS-Branch: master Date: Wed, 4 Sep 2019 07:16:55 +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: e426f001-e993-4b04-bcb3-bf740659a748 X-Archives-Hash: 628f2bf8efd6a3a93259a72427701002 commit: c6c5718a40db2adb0084150bf5fb30b4d29e53d5 Author: Lars Wendler gentoo org> AuthorDate: Wed Sep 4 07:03:37 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Sep 4 07:16:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c5718a www-servers/apache: Added libressl patch Thanks-to: Stefan Strogin gentoo.org> Closes: https://bugs.gentoo.org/668060 Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> www-servers/apache/apache-2.4.41.ebuild | 4 ++++ .../apache/files/apache-2.4.41-libressl.patch | 27 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/www-servers/apache/apache-2.4.41.ebuild b/www-servers/apache/apache-2.4.41.ebuild index 08d40edf1cc..36acc74b412 100644 --- a/www-servers/apache/apache-2.4.41.ebuild +++ b/www-servers/apache/apache-2.4.41.ebuild @@ -160,6 +160,10 @@ RDEPEND+="${CDEPEND}" REQUIRED_USE="apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl )" +PATCHES=( + "${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060 +) + pkg_setup() { # dependend critical modules which are not allowed in global scope due # to USE flag conditionals (bug #499260) diff --git a/www-servers/apache/files/apache-2.4.41-libressl.patch b/www-servers/apache/files/apache-2.4.41-libressl.patch new file mode 100644 index 00000000000..86a1a7d0236 --- /dev/null +++ b/www-servers/apache/files/apache-2.4.41-libressl.patch @@ -0,0 +1,27 @@ +From d446b977f28ec79fffc2d2b45c671e037b709f19 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Wed, 28 Aug 2019 02:15:42 +0300 +Subject: [PATCH] mod_ssl: fix compilation with LibreSSL + +Upstream-Status: Submitted [https://github.com/apache/httpd/pull/64] +Signed-off-by: Stefan Strogin +--- + modules/ssl/ssl_engine_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c +index f54c922fc7..646c903fea 100644 +--- a/modules/ssl/ssl_engine_init.c ++++ b/modules/ssl/ssl_engine_init.c +@@ -1512,7 +1512,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s, + X509_STORE_CTX *sctx; + X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx); + +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) + /* For OpenSSL >=1.1.1, turn on client cert support which is + * otherwise turned off by default (by design). + * https://github.com/openssl/openssl/issues/6933 */ +-- +2.23.0 +