CVS commit: pkgsrc/www/apache24

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Jan 31 09:38:13 UTC 2024

Modified Files:
        pkgsrc/www/apache24: distinfo
        pkgsrc/www/apache24/patches: patch-modules_filters_mod__xml2enc.c

Log Message:
www/apache24: use upstream fix

Use upstream fix for fixing build problem with libxml2-2.12.4.

NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/www/apache24/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/apache24/patches/patch-modules_filters_mod__xml2enc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/apache24/distinfo
diff -u pkgsrc/www/apache24/distinfo:1.60 pkgsrc/www/apache24/distinfo:1.61
--- pkgsrc/www/apache24/distinfo:1.60   Tue Jan 30 14:41:29 2024
+++ pkgsrc/www/apache24/distinfo        Wed Jan 31 09:38:13 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2024/01/30 14:41:29 taca Exp $
+$NetBSD: distinfo,v 1.61 2024/01/31 09:38:13 taca Exp $
 
 BLAKE2s (httpd-2.4.58.tar.bz2) = 4f2e5e35244b2fe55ddda508b3c2c8bde95de56c60a7c2e53a0972c3362f1b30
 SHA512 (httpd-2.4.58.tar.bz2) = d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
@@ -14,5 +14,5 @@ SHA1 (patch-am) = acdf7198ae8b4353cfc70c
 SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
 SHA1 (patch-configure) = 6a54f65b4ea0ca92ed707d53921ca1d3cd454031
 SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96
-SHA1 (patch-modules_filters_mod__xml2enc.c) = 32771c317350c6f4090f45ba9857730112997de1
+SHA1 (patch-modules_filters_mod__xml2enc.c) = a191e1e6515d5cccd17606f94e15dbfacd92bb7a
 SHA1 (patch-modules_filters_mod_substitute.c) = d47ee06e70942ab522acf119eb2c4b313aed9bbd

Index: pkgsrc/www/apache24/patches/patch-modules_filters_mod__xml2enc.c
diff -u pkgsrc/www/apache24/patches/patch-modules_filters_mod__xml2enc.c:1.1 pkgsrc/www/apache24/patches/patch-modules_filters_mod__xml2enc.c:1.2
--- pkgsrc/www/apache24/patches/patch-modules_filters_mod__xml2enc.c:1.1        Tue Jan 30 14:41:29 2024
+++ pkgsrc/www/apache24/patches/patch-modules_filters_mod__xml2enc.c    Wed Jan 31 09:38:13 2024
@@ -1,14 +1,21 @@
-$NetBSD: patch-modules_filters_mod__xml2enc.c,v 1.1 2024/01/30 14:41:29 taca Exp $
+$NetBSD: patch-modules_filters_mod__xml2enc.c,v 1.2 2024/01/31 09:38:13 taca Exp $
 
-* Fix build with libxml2-2.12.4.
+* Fix build with libxml2-2.12.4 from revision #1914013.
 
 --- modules/filters/mod_xml2enc.c.orig 2020-02-21 00:33:40.000000000 +0000
 +++ modules/filters/mod_xml2enc.c
-@@ -35,6 +35,7 @@
- #endif
- 
- /* libxml2 */
-+#include <libxml/xmlstring.h>
- #include <libxml/encoding.h>
- 
- #if defined(__clang__)
+@@ -206,11 +206,11 @@ static void sniff_encoding(request_rec* 
+             }
+         }
+     }
+-  
++
+     /* 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.") ;