1 |
commit: c6c5718a40db2adb0084150bf5fb30b4d29e53d5 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 4 07:03:37 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 4 07:16:39 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c5718a |
7 |
|
8 |
www-servers/apache: Added libressl patch |
9 |
|
10 |
Thanks-to: Stefan Strogin <steils <AT> gentoo.org> |
11 |
Closes: https://bugs.gentoo.org/668060 |
12 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
www-servers/apache/apache-2.4.41.ebuild | 4 ++++ |
16 |
.../apache/files/apache-2.4.41-libressl.patch | 27 ++++++++++++++++++++++ |
17 |
2 files changed, 31 insertions(+) |
18 |
|
19 |
diff --git a/www-servers/apache/apache-2.4.41.ebuild b/www-servers/apache/apache-2.4.41.ebuild |
20 |
index 08d40edf1cc..36acc74b412 100644 |
21 |
--- a/www-servers/apache/apache-2.4.41.ebuild |
22 |
+++ b/www-servers/apache/apache-2.4.41.ebuild |
23 |
@@ -160,6 +160,10 @@ RDEPEND+="${CDEPEND}" |
24 |
REQUIRED_USE="apache2_modules_http2? ( ssl ) |
25 |
apache2_modules_md? ( ssl )" |
26 |
|
27 |
+PATCHES=( |
28 |
+ "${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060 |
29 |
+) |
30 |
+ |
31 |
pkg_setup() { |
32 |
# dependend critical modules which are not allowed in global scope due |
33 |
# to USE flag conditionals (bug #499260) |
34 |
|
35 |
diff --git a/www-servers/apache/files/apache-2.4.41-libressl.patch b/www-servers/apache/files/apache-2.4.41-libressl.patch |
36 |
new file mode 100644 |
37 |
index 00000000000..86a1a7d0236 |
38 |
--- /dev/null |
39 |
+++ b/www-servers/apache/files/apache-2.4.41-libressl.patch |
40 |
@@ -0,0 +1,27 @@ |
41 |
+From d446b977f28ec79fffc2d2b45c671e037b709f19 Mon Sep 17 00:00:00 2001 |
42 |
+From: Stefan Strogin <steils@g.o> |
43 |
+Date: Wed, 28 Aug 2019 02:15:42 +0300 |
44 |
+Subject: [PATCH] mod_ssl: fix compilation with LibreSSL |
45 |
+ |
46 |
+Upstream-Status: Submitted [https://github.com/apache/httpd/pull/64] |
47 |
+Signed-off-by: Stefan Strogin <steils@g.o> |
48 |
+--- |
49 |
+ modules/ssl/ssl_engine_init.c | 2 +- |
50 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
51 |
+ |
52 |
+diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c |
53 |
+index f54c922fc7..646c903fea 100644 |
54 |
+--- a/modules/ssl/ssl_engine_init.c |
55 |
++++ b/modules/ssl/ssl_engine_init.c |
56 |
+@@ -1512,7 +1512,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s, |
57 |
+ X509_STORE_CTX *sctx; |
58 |
+ X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx); |
59 |
+ |
60 |
+-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL |
61 |
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) |
62 |
+ /* For OpenSSL >=1.1.1, turn on client cert support which is |
63 |
+ * otherwise turned off by default (by design). |
64 |
+ * https://github.com/openssl/openssl/issues/6933 */ |
65 |
+-- |
66 |
+2.23.0 |
67 |
+ |