fritzkink
2023-11-29 ff71f29ccefac21156dcc3d11f1a90ced02a34d1
apache24 - fix compile issue with new libxml version 2.12

1 files added
2 files modified
15 ■■■■ changed files
components/web/apache24/Makefile 2 ●●● patch | view | raw | blame | history
components/web/apache24/patches/xmlChar.patch 12 ●●●●● patch | view | raw | blame | history
components/web/apache24/pkg5 1 ●●●● patch | view | raw | blame | history
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
components/web/apache24/patches/xmlChar.patch
New file
@@ -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)
components/web/apache24/pkg5
@@ -15,7 +15,6 @@
        "library/zlib",
        "runtime/lua",
        "runtime/perl",
        "runtime/perl-538",
        "shell/ksh93",
        "system/library",
        "system/library/math",