gentoo auto-resync : 06:02:2024 - 05:42:43

6 files changed, 45 insertions, 7 deletions

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index c7895ee02e55..0dd71872f009 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -4,13 +4,14 @@ AUX apache-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f47f5524
 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
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
 DIST gentoo-apache-2.4.57-r5-20231011.tar.bz2 27081 BLAKE2B 7d98c850cda8b43901b4373e36889e4e951615e2e2769baa564f44e180fba0a74f0af45d2aa552b70ac1609aa3430e240118f2656c5285d31c1dd5edad9f3b6d SHA512 6c445212aaa211a9ad24599763e1d42b5f88394976f8f488175ce3ec3ea7e83b93f87d3c0c4ffc82b4a13ae575e78fba114bc5bacae9324be962eba48d3bc146
 DIST gentoo-apache-2.4.58-20231019.tar.bz2 26224 BLAKE2B 370f36dcbe9d10ed0dd415c2e28016c7897246b5c3f830e849e765c18a08be145c8a363f122dff2c4b8d5b1e53ff504a79d7512a58135899a539136b580524ed SHA512 60f68eb4168a86ee33525e7c90cf5af8da586ed31d12cc294ea6bf3bcb9f254ea7e1a4ca5db4846a0e92b97c1326f095aa3a9d5fdb9ed92c1c4726c5a825ab36
 DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
 DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
-EBUILD apache-2.4.57-r6.ebuild 7755 BLAKE2B ef381c9fd0b6db7a8167486f913b5592a4a91a3ec3a548811f06ea616ccf533e39346a9df0b40f684e3983c54aaf66ba75bbe73602adc6d086ad6c5f49293fb6 SHA512 7e2a0fd580d9bd479f0781c9d3e3fb6c0a0efc5c1622d274fbe98996c5a2005549d58ec7bae77fed4db9b01ae359bbcdfea95ea2a2107e4e5a62ec70e4458f61
-EBUILD apache-2.4.57.ebuild 8147 BLAKE2B 6c1212bb0c062f31369cb2fcf7534cf713d0e4c9e45bccbd808f85c5643ead118b755c7de1453cf7b145cae6031bfd054e0f30f9a023504c40174bbf3766234d SHA512 d759240802b120b9ebc9a096c210f73a0fb47d24c7e09dd89f16ac0109a1712a4c9f9f6134ea2bc67e2ce9afe8a8234d509356ecec69a1c83492b854f65fe1b6
-EBUILD apache-2.4.58-r2.ebuild 7752 BLAKE2B 7d2a5ba93f05205dc575ae29f01671168c9636e3b7b0989954222c89b7f06d840bd8868be490ac28539b3654b18369a46600bc86837863b4563dbc80b7427671 SHA512 abdf1a6c29d3bb3c86055c47fd7ba51b6f6efffaef51cccf3bf4d2d00b66698156db414c8504604c23d30092424224fa25bae8c0c63a902a7fe578fa6522aa64
-EBUILD apache-2.4.58.ebuild 8005 BLAKE2B 5355ad0aac6060a8b9a47df9ad4c12b85e08272a87fd84dcd113fb5af394a2fae256c7f2d155a4b95e00179f5a6282e48060078d669cbc7fc2bffa2c58ca1180 SHA512 4e43e955bff2102aa62d749d57cafddf8e49f15c82f93d6b380bda3aec4a8fa9f26a600bd289cc47cfbfe481ea6d6580b135026ebaa0fb12e15ee922d02da5fb
+EBUILD apache-2.4.57-r6.ebuild 7800 BLAKE2B 7e5ccc64ba38f750cba76aa78a5fc45151ed87829dce575c3c18e4ef0269fd8ae4fad4f0da7fdc135c011bce82f25cee1416f474f371f3cd4e32d88a2710458e SHA512 5fbc2846247de3f79999534bcb314402558679a58ba502689d12062b323109fb40b3ab2affe23fd6e9cbd5459ecae1ad0fdd805b56d961d85f0ffeabc6ab1954
+EBUILD apache-2.4.57.ebuild 8179 BLAKE2B 24731baf1518316ffa203001ff5e10a75cc8621b4a5a28e5d6ac5ea3df29ed73a9c93bc202dcfe7e28163605a1a5cc5fed39e8e3f876b7c83e98390e72f1f278 SHA512 dfaa28cd51e519e36d1cc6fc3162c8c7a4053fd2115fcef258642ea40e4543ea6729bd69b5271de0b9c9d027260fd8fab842d7183d422118977bf97ef81bd959
+EBUILD apache-2.4.58-r2.ebuild 7797 BLAKE2B c83223c828307db5baeb3676c9edfcc79a7f76d1e48e741248653733e847e7bcaa19cdca1322fbd2b5371c95e09a9d94fb3f158005849b307c6bf177c77f7394 SHA512 a311fe307acc94aef1d65f0be6f144141cb87caf5e4207279f73c8e4a1aeabc690b0e37106c394e3b59f30ab8a35ec1d517d124165a23ebe2bb5947188507a81
+EBUILD apache-2.4.58.ebuild 8050 BLAKE2B f47fa1f205d112465f6fa15b0f2103ddbfe686a7610090d308c049b49bda48e143b792347aeeb7bc7d86e02b89379ecf2e024a584250d06858a725cdb1b1c745 SHA512 a7b4e397a5d7e58ab1c569b16479b05f4a845fd33dd3de7e36a8f128f9683d542d46257ca165af0d38623882214d7118455709d138f4eeaa15e80560e67af733
 MISC metadata.xml 978 BLAKE2B 2b2b82339fb2419da3d4e9d77f2c4495235b04a8f5006e61316bf638f307227ea26e2f9eaa26fca5d10118ebdd0bff9fac7319687ae62e2440b49e509e7080e0 SHA512 4a1842f1754473f7168fd38ef4ac2720fddf0f4ad8bfc5df3215b7a50f454cb3fc372e5a84d030a2b84e9744d599f8a38caf3ad5688a93cee7d52bac3d89b43b
diff --git a/www-servers/apache/apache-2.4.57-r6.ebuild b/www-servers/apache/apache-2.4.57-r6.ebuild
index bf8fd0ba00f5..dc912ab557f7 100644
--- a/www-servers/apache/apache-2.4.57-r6.ebuild
+++ b/www-servers/apache/apache-2.4.57-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -148,6 +148,10 @@ LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
 
+PATCHES=(
+	"${FILESDIR}"/libxmlv212.patch
+)
+
 pkg_setup() {
 	# dependent 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.57.ebuild b/www-servers/apache/apache-2.4.57.ebuild
index cf939d694848..3d01a3dbe425 100644
--- a/www-servers/apache/apache-2.4.57.ebuild
+++ b/www-servers/apache/apache-2.4.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -153,6 +153,7 @@ 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
+	"${FILESDIR}"/libxmlv212.patch
 )
 
 pkg_setup() {
diff --git a/www-servers/apache/apache-2.4.58-r2.ebuild b/www-servers/apache/apache-2.4.58-r2.ebuild
index 5b5e4fb1a034..44dfbad8d9c8 100644
--- a/www-servers/apache/apache-2.4.58-r2.ebuild
+++ b/www-servers/apache/apache-2.4.58-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -148,6 +148,10 @@ LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
 
+PATCHES=(
+	"${FILESDIR}"/libxmlv212.patch
+)
+
 pkg_setup() {
 	# dependent 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.58.ebuild b/www-servers/apache/apache-2.4.58.ebuild
index 9c2078b6af2f..4924d8ce9518 100644
--- a/www-servers/apache/apache-2.4.58.ebuild
+++ b/www-servers/apache/apache-2.4.58.ebuild
@@ -151,6 +151,10 @@ LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
 
+PATCHES=(
+	"${FILESDIR}"/libxmlv212.patch
+)
+
 pkg_setup() {
 	# dependent critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
diff --git a/www-servers/apache/files/libxmlv212.patch b/www-servers/apache/files/libxmlv212.patch
new file mode 100644
index 000000000000..281633b27ca7
--- /dev/null
+++ b/www-servers/apache/files/libxmlv212.patch
@@ -0,0 +1,24 @@
+https://github.com/apache/httpd/pull/393
+
+From bd2c4e466e0949f6f770bbb2569ce5ae9b3965c0 Mon Sep 17 00:00:00 2001
+From: ttachi <tachihara@hotmail.com>
+Date: Fri, 17 Nov 2023 22:24:45 +0900
+Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header
+
+---
+ modules/filters/mod_xml2enc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
+index 34f8e8ee090..0d3d13c1239 100644
+--- a/modules/filters/mod_xml2enc.c
++++ b/modules/filters/mod_xml2enc.c
+@@ -209,7 +209,7 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx)
+   
+     /* to sniff, first we look for BOM */
+     if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
+-        ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
++        ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf,
+                                              ctx->bytes); 
+         if (HAVE_ENCODING(ctx->xml2enc)) {
+             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432)