commit: 3c4696063762a5bd2701b8cf624a365caf8673f3
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Feb 25 02:09:10 2024 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Sun Feb 25 02:10:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3c469606
www-servers/apache: sync ::gentoo
Signed-off-by: orbea <orbea <AT> riseup.net>
www-servers/apache/apache-2.4.58-r2.ebuild | 7 +++++--
www-servers/apache/apache-2.4.58.ebuild | 5 ++++-
www-servers/apache/files/libxmlv212.patch | 24 ++++++++++++++++++++++++
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/www-servers/apache/apache-2.4.58-r2.ebuild
b/www-servers/apache/apache-2.4.58-r2.ebuild
index 4126678..325bd5b 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,7 +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}"/${PN}-2.4.57-libressl.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.57-libressl.patch
+ "${FILESDIR}"/libxmlv212.patch
+)
pkg_setup() {
# dependent critical modules which are not allowed in global scope due
diff --git a/www-servers/apache/apache-2.4.58.ebuild
b/www-servers/apache/apache-2.4.58.ebuild
index 2ad153c..7eddca0 100644
--- a/www-servers/apache/apache-2.4.58.ebuild
+++ b/www-servers/apache/apache-2.4.58.ebuild
@@ -151,7 +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}"/${PN}-2.4.57-libressl.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.57-libressl.patch
+ "${FILESDIR}"/libxmlv212.patch
+)
pkg_setup() {
# dependent critical modules which are not allowed in global scope due
diff --git a/www-servers/apache/files/libxmlv212.patch
b/www-servers/apache/files/libxmlv212.patch
new file mode 100644
index 0000000..281633b
--- /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 <[email protected]>
+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)
