commit: 80bf1768d6e5bb3dd4a44ff6e91e56ba4450930d Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Feb 18 14:01:19 2024 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Fri Feb 23 01:05:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80bf1768
www-servers/apache: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/35410 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../apache/files/apache-2.4.54-libtool.patch | 21 --------- .../apache/files/apache-2.4.54-no-which.patch | 54 ---------------------- .../files/apache-2.4.57-rustls-ffi-0.10.0.patch | 51 -------------------- 3 files changed, 126 deletions(-) diff --git a/www-servers/apache/files/apache-2.4.54-libtool.patch b/www-servers/apache/files/apache-2.4.54-libtool.patch deleted file mode 100644 index a0d55d885fd8..000000000000 --- a/www-servers/apache/files/apache-2.4.54-libtool.patch +++ /dev/null @@ -1,21 +0,0 @@ -Bug: https://bugs.gentoo.org/858836 - -From: orbea <[email protected]> -Date: Tue, 19 Jul 2022 07:46:36 -0700 -Subject: [PATCH] build: Fix the build with slibtool - -Adding LT_INIT to configure.in generates the libtool script in the build -directory which is required by rlibtool to determine if the build is -shared or static. - ---- a/configure.in -+++ b/configure.in -@@ -398,7 +398,7 @@ AC_PATH_PROG(RSYNC, rsync) - AC_PATH_PROG(SVN, svn) - AC_PROG_AWK - AC_PROG_LN_S --AC_CHECK_TOOL(RANLIB, ranlib, true) -+LT_INIT - dnl AC_PATH_PROG(PERL_PATH, perl) - AC_CHECK_PROGS(LYNX_PATH,[lynx links elinks], [lynx]) - diff --git a/www-servers/apache/files/apache-2.4.54-no-which.patch b/www-servers/apache/files/apache-2.4.54-no-which.patch deleted file mode 100644 index 65764dfe022a..000000000000 --- a/www-servers/apache/files/apache-2.4.54-no-which.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/844868 -https://bz.apache.org/bugzilla/show_bug.cgi?id=66130 ---- a/build/aix/buildaix.ksh -+++ b/build/aix/buildaix.ksh -@@ -26,14 +26,14 @@ export CFLAGS='-O2 -qlanglvl=extc99' - lslpp -L bos.adt.insttools >/dev/null - [[ $? -ne 0 ]] && echo "must have bos.adt.insttools installed" && exit -1 - --apr_config=`which apr-1-config` --apu_config=`which apu-1-config` -+apr_config=`command -v apr-1-config 2>/dev/null` -+apu_config=`command -v apu-1-config 2>/dev/null` - - if [[ -z ${apr_config} && -z ${apu_config} ]] - then - export PATH=/opt/bin:${PATH} -- apr_config=`which apr-1-config` -- apu_config=`which apu-1-config` -+ apr_config=`command -v apr-1-config 2>/dev/null` -+ apu_config=`command -v apu-1-config 2>/dev/null` - fi - - while test $# -gt 0 ---- a/build/pkg/buildpkg.sh -+++ b/build/pkg/buildpkg.sh -@@ -24,8 +24,8 @@ PREFIX=/usr/local/apache2 - TEMPDIR=/var/tmp/$USER/httpd-root - rm -rf $TEMPDIR - --apr_config=`which apr-1-config` --apu_config=`which apu-1-config` -+apr_config=`command -v apr-1-config 2>/dev/null` -+apu_config=`command -v apu-1-config 2>/dev/null` - - while test $# -gt 0 - do ---- a/configure.in -+++ b/configure.in -@@ -216,13 +216,13 @@ AC_ARG_WITH(pcre, - APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library)) - if test "x$with_pcre" = "x" || test "$with_pcre" = "yes"; then - with_pcre="$PATH" --else if which $with_pcre 2>/dev/null; then :; else -+else if command -v $with_pcre 2>/dev/null; then :; else - with_pcre="$with_pcre/bin:$with_pcre" - fi - fi - - AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config], -- [`which $with_pcre 2>/dev/null`], $with_pcre) -+ [`command -v $with_pcre 2>/dev/null`], $with_pcre) - - if test "x$PCRE_CONFIG" != "x"; then - if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else diff --git a/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch b/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch deleted file mode 100644 index 81869f7bbf00..000000000000 --- a/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://github.com/apache/httpd/commit/0495a95f511c0bc7f34dc1b706d6d8276865743b -https://bugs.gentoo.org/906523 - -From 0495a95f511c0bc7f34dc1b706d6d8276865743b Mon Sep 17 00:00:00 2001 -From: Stefan Eissing <[email protected]> -Date: Tue, 2 May 2023 09:21:07 +0000 -Subject: [PATCH] Backport of r1909558 from trunk: - - *) mod_tls: updating to rustls-ffi version 0.9.2 or higher. - Checking in configure for proper version installed. Code - fixes for changed clienthello member name. - - - -git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909561 13f79535-47bb-0310-9956-ffa450edef68 ---- /dev/null -+++ b/changes-entries/tls-rustls-update.txt -@@ -0,0 +1,4 @@ -+ *) mod_tls: updating to rustls-ffi version 0.9.2 or higher. -+ Checking in configure for proper version installed. Code -+ fixes for changed clienthello member name. -+ [Stefan Eissing] -\ No newline at end of file ---- a/modules/tls/config2.m4 -+++ b/modules/tls/config2.m4 -@@ -109,9 +109,10 @@ AC_DEFUN([APACHE_CHECK_RUSTLS],[ - fi - fi - -- AC_MSG_CHECKING([for rustls version >= 0.8.2]) -+ AC_MSG_CHECKING([for rustls version >= 0.9.2]) - AC_TRY_COMPILE([#include <rustls.h>],[ - rustls_version(); -+rustls_acceptor_new(); - ], - [AC_MSG_RESULT(OK) - ac_cv_rustls=yes], ---- a/modules/tls/tls_core.c -+++ b/modules/tls/tls_core.c -@@ -507,8 +507,8 @@ static const rustls_certified_key *extract_client_hello_values( - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c, "extract client hello values"); - if (!cc) goto cleanup; - cc->client_hello_seen = 1; -- if (hello->sni_name.len > 0) { -- cc->sni_hostname = apr_pstrndup(c->pool, hello->sni_name.data, hello->sni_name.len); -+ if (hello->server_name.len > 0) { -+ cc->sni_hostname = apr_pstrndup(c->pool, hello->server_name.data, hello->server_name.len); - ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, "sni detected: %s", cc->sni_hostname); - } - else { -
