From ff71f29ccefac21156dcc3d11f1a90ced02a34d1 Mon Sep 17 00:00:00 2001
From: fritzkink <96341974+fritzkink@users.noreply.github.com>
Date: Wed, 29 Nov 2023 20:21:11 +0100
Subject: [PATCH] apache24 - fix compile issue with new libxml version 2.12
---
components/web/apache24/Makefile | 2 +-
components/web/apache24/pkg5 | 1 -
components/web/apache24/patches/xmlChar.patch | 12 ++++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/components/web/apache24/Makefile b/components/web/apache24/Makefile
index 6e148ab..7c9f2bd 100644
--- a/components/web/apache24/Makefile
+++ b/components/web/apache24/Makefile
@@ -30,6 +30,7 @@
COMPONENT_NAME= apache2
COMPONENT_VERSION= 2.4.58
+COMPONENT_REVISION= 1
COMPONENT_PROJECT_URL= https://httpd.apache.org/
COMPONENT_SRC_NAME= httpd
COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
@@ -91,7 +92,6 @@
$(TOUCH) $(BUILD_DIR)
# Auto-generated dependencies
-PERL_REQUIRED_PACKAGES += runtime/perl
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += library/apr
REQUIRED_PACKAGES += library/apr-util
diff --git a/components/web/apache24/patches/xmlChar.patch b/components/web/apache24/patches/xmlChar.patch
new file mode 100644
index 0000000..cacdaa4
--- /dev/null
+++ b/components/web/apache24/patches/xmlChar.patch
@@ -0,0 +1,12 @@
+# see https://github.com/apache/httpd/pull/393
+--- modules/filters/mod_xml2enc.c 2020-02-21 01:33:40.000000000 +0100
++++ modules/filters/mod_xml2enc.c.new 2023-11-29 19:31:15.134240536 +0100
+@@ -209,7 +209,7 @@
+
+ /* 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)
diff --git a/components/web/apache24/pkg5 b/components/web/apache24/pkg5
index 4dbf7da..de8c912 100644
--- a/components/web/apache24/pkg5
+++ b/components/web/apache24/pkg5
@@ -15,7 +15,6 @@
"library/zlib",
"runtime/lua",
"runtime/perl",
- "runtime/perl-538",
"shell/ksh93",
"system/library",
"system/library/math",
--
Gitblit v1.9.3