From: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon, 18 Dec 2023 17:29:44 +0000 (+0100)
Subject: apache2: Apply patch to make work with updated libxml2
X-Git-Tag: v2.29-core183~65
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=4fc6f9cbe2dfd43cc6cf6c43119def1e08deadf3

apache2: Apply patch to make work with updated libxml2

- libxml2 since version 2.12.0 has removed a variable that was specified in the apache
   apache mod_xml2enc code.
- This dependency caused the apache2 build to fail with the updated libxml2.
- This patch removes the dependency. It will be able to be removed when the next apache
   update is carried out as the patch was created from an apache commit.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---

diff --git a/lfs/apache2 b/lfs/apache2
index 9a0ad38a98..c1973e6d57 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -75,6 +75,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch
 	### Add IPFire's layout, too
 	echo "# IPFire layout" >> $(DIR_APP)/config.layout
 	echo "<Layout IPFire>" >> $(DIR_APP)/config.layout
diff --git a/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch b/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch
new file mode 100644
index 0000000000..c190a26484
--- /dev/null
+++ b/src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch
@@ -0,0 +1,24 @@
+diff -Naur httpd-2.4.58-orig/changes-entries/xmlchar.txt httpd-2.4.58/changes-entries/xmlchar.txt
+--- httpd-2.4.58-orig/changes-entries/xmlchar.txt	1970-01-01 01:00:00.000000000 +0100
++++ httpd-2.4.58/changes-entries/xmlchar.txt	2023-12-18 12:31:00.719087460 +0100
+@@ -0,0 +1,2 @@
++ *) mod_xml2enc: Tolerate libxml2 2.12.0 and later.
++    [ttachi <tachihara AT hotmail.com>]
+diff -Naur httpd-2.4.58-orig/modules/filters/mod_xml2enc.c httpd-2.4.58/modules/filters/mod_xml2enc.c
+--- httpd-2.4.58-orig/modules/filters/mod_xml2enc.c	2020-02-21 01:33:40.000000000 +0100
++++ httpd-2.4.58/modules/filters/mod_xml2enc.c	2023-12-18 12:32:34.248535392 +0100
+@@ -206,11 +206,11 @@
+             }
+         }
+     }
+-  
++
+     /* to sniff, first we look for BOM */
+     if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) {
+-        ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf,
+-                                             ctx->bytes); 
++        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)
+                           "Got charset from XML rules.") ;