gentoo auto-resync : 23:02:2024 - 05:40:46

5 files changed, 0 insertions, 129 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 0e1dce8cd3c1..fe156bb1c383 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 650fefedeb42..1eea275cefc4 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,7 +1,4 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
-AUX apache-2.4.54-libtool.patch 594 BLAKE2B b6bb19901e6eb69adebd8478af34abb544f4a137380d974a5f45bb83e72ef491cbc2160decdc9e573b58f641080ebee07a47a220eb7fcaf3c893f7f5c5e4020e SHA512 f6e512136dd0ea2f9a00dd8c0df4b4455ae053ac5a636580136139b73517be72aa4ab29d33a2fdb10b42e1ef8fcc814dac85e5b1305aca27e4fe87965ec6c428
-AUX apache-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f47f5524ccb1c9a5532b8529091176ea0fc561c0888b74997acb98f4c86cacf8f138f065f248295c2a79779eb84f706173849a SHA512 830125dd90479972715a6b09bc0cef7bfe2c8ce7d198e52765e4284555cd60e400820a622530eb2bffa9b7aec9fd6bdb3f633b948075c68e9fd96a49a7eb41fd
-AUX apache-2.4.57-rustls-ffi-0.10.0.patch 1951 BLAKE2B f6e2cc7057aaabae8ae89763dfea5dbb7c612442b809433176823ea866e0bcf197d14f1be57281023556a87e45009cce41f3771b3a7847b9acf476970dee4b66 SHA512 a5bae20948b21c0dd47b95409ee8d3f567465c093a840e31cf523688ca8cae55040a17170e46010761417ec856482c6f32c5a9354e5a8441dad86de940aafe55
 AUX apache.conf 94 BLAKE2B b0330849adfc5fc048622b3a256ecb727f3bfa339e6cc7f50843597d3e8d7b6d4463986d8f9a73f3580c93ce571d01f9ba571e0328356b62e5680ede913acc4b SHA512 e954c66da825fd6f84753cd7a50ae2da86daf5da27b37dba484019e8e1adaeb57122ba9a8fd1222e80edac04ca78d807265ef8b275278e4eeef12feb6043597b
 AUX apache2.4-hardened.service 933 BLAKE2B 60cbe1a55ded29299ba7fc453a6f13c456bc702ec77a31ede0904a52c9d726d57ec4d477df74d46e4edab157a2bf930750620c8d369a0b6900b049d9a4619a5c SHA512 711899777ea59995cecda007dca8d9ff6d0650b80990ea3b387f914e923df703e0c71ebaee5d967590c46fc5c588d35390d7c34023ef673c1791a60850efd0e8
 AUX libxmlv212.patch 1033 BLAKE2B 514879d60f8e8799c298c63a871a589e1982c458a6f99a3b48597af2d4bc91803ff8bfc29c57b076efb100f6c5f7cb396589b2e5cd91269ff834575a41c4a963 SHA512 09ea8df9613bcd1f09f87522145c4dd19c8a17d8f3529a5fdff0b0ee42816d26fe01af97037687bbf95b4e1b6454566be19f27427cafb2aa85bce848cb9a56e3
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 <orbea@riseup.net>
-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 <icing@apache.org>
-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 {
-