webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

apache2: Apply patch to make work with updated libxml2

Browse Source 
- 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>
This commit is contained in:
Adolf Belka
2023-12-18 18:29:44 +01:00
committed by Peter Müller
parent 55d134a365
commit 4fc6f9cbe2
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/apache2
View File

@@ -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

24
src/patches/apache-2.4.58_mod_xml2enc_remove_dependency_on_xmlstring_header.patch Normal file
View File

@@ -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.") ;