commit: 3cdcb3fd70a84534e73a4d943b16b7dfaa2b9f67 Author: Francisco Javier Félix <web <AT> inode64 <DOT> com> AuthorDate: Wed Jan 31 18:05:09 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 6 03:24:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cdcb3fd
www-servers/apache: Fix build with >=dev-libs/libxml2-2.12.0 See the pull https://github.com/apache/httpd/pull/393. Signed-off-by: INODE64 <web <AT> inode64.com> Closes: https://github.com/gentoo/gentoo/pull/35118 Signed-off-by: Sam James <sam <AT> gentoo.org> www-servers/apache/apache-2.4.57-r6.ebuild | 6 +++++- www-servers/apache/apache-2.4.57.ebuild | 3 ++- www-servers/apache/apache-2.4.58-r2.ebuild | 6 +++++- www-servers/apache/apache-2.4.58.ebuild | 4 ++++ www-servers/apache/files/libxmlv212.patch | 22 ++++++++++++++++++++++ 5 files changed, 38 insertions(+), 3 deletions(-) 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..0ec544d04c13 --- /dev/null +++ b/www-servers/apache/files/libxmlv212.patch @@ -0,0 +1,22 @@ +From bd2c4e466e0949f6f770bbb2569ce5ae9b3965c0 Mon Sep 17 00:00:00 2001 +From: ttachi <tachih...@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)
