gentoo auto-resync : 26:05:2023 - 15:09:32

3 files changed, 55 insertions, 2 deletions

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index e7654aa9d9d5..2cb132d82217 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,6 +1,7 @@
 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
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
@@ -11,5 +12,5 @@ DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db6
 EBUILD apache-2.4.54-r8.ebuild 8043 BLAKE2B 04908cdb03cd4ec4ac8889a4936e65cfb274f2ef310051ab76cceea1f45c5a0fccd066e4613b317b6422b6e59009f03508d8853b4a9ccb21d925a14640f45a76 SHA512 2ecbf411512740f296b042485a61a2b9661c71e773035e99618a1c914ad930d88a93fa0b7bade75dc5acabbd8a5fa7fd5da2241f88c5ee2094985f3f06db6ab5
 EBUILD apache-2.4.55-r1.ebuild 8043 BLAKE2B 04908cdb03cd4ec4ac8889a4936e65cfb274f2ef310051ab76cceea1f45c5a0fccd066e4613b317b6422b6e59009f03508d8853b4a9ccb21d925a14640f45a76 SHA512 2ecbf411512740f296b042485a61a2b9661c71e773035e99618a1c914ad930d88a93fa0b7bade75dc5acabbd8a5fa7fd5da2241f88c5ee2094985f3f06db6ab5
 EBUILD apache-2.4.56.ebuild 8048 BLAKE2B e4213d13429da7f084141480cbb9ad18b7087baf7448615eb10d845478b754580b8682f633f735d338d5ab27a373183805ddeea44db36b0e7c3d86928b0abaf9 SHA512 1d305810b27000284e458c537df84845e3721b412559351c0a9598c23f58643eca9d664c314864034556d893308c1f2dddc455128670f02bd2044302aa2263b2
-EBUILD apache-2.4.57.ebuild 8050 BLAKE2B 0773473357518f5fd97cef8dcff25a90973dca6df41c094972883d1f0911ce51ae508c23dab75ba767b1db17613d414d2cd6fdd95c7ea3addfca9bca9ba2d988 SHA512 6c74ef0953339f565943dadaa8118ee2cb5f59d21c21be0e5c1ef27b2fab1e51654f90791541e20532494eaada7c4024b4f5474b03375eee5aa113b7a52f248e
+EBUILD apache-2.4.57.ebuild 8108 BLAKE2B 993a6cc592e265cf1645d5179b397341cc6adbc886be6596d2cfdd3e923c2ee050fde743edfb727799650bb0a4b3343c9626a6cbe661dba86d942a2ba1d86ccf SHA512 33d5caf02ffa38f96e9f95c3952f6453d88d935cf3b458bfebc5af26ece176498d715c16fe894479e6ae4636f1d88436bc2e1cb2ec5d4074feb0c67130b33551
 MISC metadata.xml 978 BLAKE2B 2b2b82339fb2419da3d4e9d77f2c4495235b04a8f5006e61316bf638f307227ea26e2f9eaa26fca5d10118ebdd0bff9fac7319687ae62e2440b49e509e7080e0 SHA512 4a1842f1754473f7168fd38ef4ac2720fddf0f4ad8bfc5df3215b7a50f454cb3fc372e5a84d030a2b84e9744d599f8a38caf3ad5688a93cee7d52bac3d89b43b
diff --git a/www-servers/apache/apache-2.4.57.ebuild b/www-servers/apache/apache-2.4.57.ebuild
index be1f9d9f9ca6..6b8092bd3916 100644
--- a/www-servers/apache/apache-2.4.57.ebuild
+++ b/www-servers/apache/apache-2.4.57.ebuild
@@ -149,10 +149,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
 	"${FILESDIR}"/${PN}-2.4.54-libtool.patch # bug #858836
+	"${FILESDIR}"/${P}-rustls-ffi-0.10.0.patch # bug #906523
 )
 
 pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
+	# dependent critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
 	use ssl && MODULE_CRITICAL+=" socache_shmcb"
 	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
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
new file mode 100644
index 000000000000..81869f7bbf00
--- /dev/null
+++ b/www-servers/apache/files/apache-2.4.57-rustls-ffi-0.10.0.patch
@@ -0,0 +1,51 @@
+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 {
+