| 1 |
commit: 2cce81cc33feb86c57342c36c94736c0fa5039ff |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 1 17:38:07 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 1 18:06:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cce81cc |
| 7 |
|
| 8 |
www-servers/apache: drop obsolete LibreSSL patch |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
www-servers/apache/apache-2.4.46-r6.ebuild | 4 ---- |
| 13 |
www-servers/apache/apache-2.4.46.ebuild | 4 ---- |
| 14 |
www-servers/apache/apache-2.4.47.ebuild | 4 ---- |
| 15 |
.../apache/files/apache-2.4.41-libressl.patch | 27 ---------------------- |
| 16 |
4 files changed, 39 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-servers/apache/apache-2.4.46-r6.ebuild b/www-servers/apache/apache-2.4.46-r6.ebuild |
| 19 |
index c4b85183a2b..7343e87cea3 100644 |
| 20 |
--- a/www-servers/apache/apache-2.4.46-r6.ebuild |
| 21 |
+++ b/www-servers/apache/apache-2.4.46-r6.ebuild |
| 22 |
@@ -145,10 +145,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~ |
| 23 |
RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )" |
| 24 |
REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )" |
| 25 |
|
| 26 |
-PATCHES=( |
| 27 |
- "${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060 |
| 28 |
-) |
| 29 |
- |
| 30 |
pkg_setup() { |
| 31 |
# dependend critical modules which are not allowed in global scope due |
| 32 |
# to USE flag conditionals (bug #499260) |
| 33 |
|
| 34 |
diff --git a/www-servers/apache/apache-2.4.46.ebuild b/www-servers/apache/apache-2.4.46.ebuild |
| 35 |
index 1f2646bf81e..95d53cb994d 100644 |
| 36 |
--- a/www-servers/apache/apache-2.4.46.ebuild |
| 37 |
+++ b/www-servers/apache/apache-2.4.46.ebuild |
| 38 |
@@ -138,10 +138,6 @@ LICENSE="Apache-2.0 Apache-1.1" |
| 39 |
SLOT="2" |
| 40 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris" |
| 41 |
|
| 42 |
-PATCHES=( |
| 43 |
- "${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060 |
| 44 |
-) |
| 45 |
- |
| 46 |
pkg_setup() { |
| 47 |
# dependend critical modules which are not allowed in global scope due |
| 48 |
# to USE flag conditionals (bug #499260) |
| 49 |
|
| 50 |
diff --git a/www-servers/apache/apache-2.4.47.ebuild b/www-servers/apache/apache-2.4.47.ebuild |
| 51 |
index c4b85183a2b..7343e87cea3 100644 |
| 52 |
--- a/www-servers/apache/apache-2.4.47.ebuild |
| 53 |
+++ b/www-servers/apache/apache-2.4.47.ebuild |
| 54 |
@@ -145,10 +145,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~ |
| 55 |
RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )" |
| 56 |
REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )" |
| 57 |
|
| 58 |
-PATCHES=( |
| 59 |
- "${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060 |
| 60 |
-) |
| 61 |
- |
| 62 |
pkg_setup() { |
| 63 |
# dependend critical modules which are not allowed in global scope due |
| 64 |
# to USE flag conditionals (bug #499260) |
| 65 |
|
| 66 |
diff --git a/www-servers/apache/files/apache-2.4.41-libressl.patch b/www-servers/apache/files/apache-2.4.41-libressl.patch |
| 67 |
deleted file mode 100644 |
| 68 |
index 86a1a7d0236..00000000000 |
| 69 |
--- a/www-servers/apache/files/apache-2.4.41-libressl.patch |
| 70 |
+++ /dev/null |
| 71 |
@@ -1,27 +0,0 @@ |
| 72 |
-From d446b977f28ec79fffc2d2b45c671e037b709f19 Mon Sep 17 00:00:00 2001 |
| 73 |
-From: Stefan Strogin <steils@g.o> |
| 74 |
-Date: Wed, 28 Aug 2019 02:15:42 +0300 |
| 75 |
-Subject: [PATCH] mod_ssl: fix compilation with LibreSSL |
| 76 |
- |
| 77 |
-Upstream-Status: Submitted [https://github.com/apache/httpd/pull/64] |
| 78 |
-Signed-off-by: Stefan Strogin <steils@g.o> |
| 79 |
---- |
| 80 |
- modules/ssl/ssl_engine_init.c | 2 +- |
| 81 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 82 |
- |
| 83 |
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c |
| 84 |
-index f54c922fc7..646c903fea 100644 |
| 85 |
---- a/modules/ssl/ssl_engine_init.c |
| 86 |
-+++ b/modules/ssl/ssl_engine_init.c |
| 87 |
-@@ -1512,7 +1512,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s, |
| 88 |
- X509_STORE_CTX *sctx; |
| 89 |
- X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx); |
| 90 |
- |
| 91 |
--#if OPENSSL_VERSION_NUMBER >= 0x1010100fL |
| 92 |
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) |
| 93 |
- /* For OpenSSL >=1.1.1, turn on client cert support which is |
| 94 |
- * otherwise turned off by default (by design). |
| 95 |
- * https://github.com/openssl/openssl/issues/6933 */ |
| 96 |
--- |
| 97 |
-2.23.0 |
| 98 |
- |
Archives