From 2cce81cc33feb86c57342c36c94736c0fa5039ff Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 1 May 2021 17:38:07 +0000 Subject: www-servers/apache: drop obsolete LibreSSL patch Signed-off-by: Sam James --- www-servers/apache/apache-2.4.46-r6.ebuild | 4 ---- www-servers/apache/apache-2.4.46.ebuild | 4 ---- www-servers/apache/apache-2.4.47.ebuild | 4 ---- .../apache/files/apache-2.4.41-libressl.patch | 27 ---------------------- 4 files changed, 39 deletions(-) delete mode 100644 www-servers/apache/files/apache-2.4.41-libressl.patch (limited to 'www-servers/apache') diff --git a/www-servers/apache/apache-2.4.46-r6.ebuild b/www-servers/apache/apache-2.4.46-r6.ebuild index c4b85183a2b3..7343e87cea34 100644 --- a/www-servers/apache/apache-2.4.46-r6.ebuild +++ b/www-servers/apache/apache-2.4.46-r6.ebuild @@ -145,10 +145,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~ RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )" REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )" -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/apache-2.4.46.ebuild b/www-servers/apache/apache-2.4.46.ebuild index 1f2646bf81ed..95d53cb994df 100644 --- a/www-servers/apache/apache-2.4.46.ebuild +++ b/www-servers/apache/apache-2.4.46.ebuild @@ -138,10 +138,6 @@ LICENSE="Apache-2.0 Apache-1.1" SLOT="2" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris" -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/apache-2.4.47.ebuild b/www-servers/apache/apache-2.4.47.ebuild index c4b85183a2b3..7343e87cea34 100644 --- a/www-servers/apache/apache-2.4.47.ebuild +++ b/www-servers/apache/apache-2.4.47.ebuild @@ -145,10 +145,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~ RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )" REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )" -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 deleted file mode 100644 index 86a1a7d02361..000000000000 --- a/www-servers/apache/files/apache-2.4.41-libressl.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - -- cgit v1.2.3-65-gdbad