commit: c6c5718a40db2adb0084150bf5fb30b4d29e53d5 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Sep 4 07:03:37 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <steils <AT> gentoo.org> Closes: https://bugs.gentoo.org/668060 Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Lars Wendler <polynomial-c <AT> 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 <ste...@gentoo.org> +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 <ste...@gentoo.org> +--- + 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 +
