CVS commit: pkgsrc/lang/php81

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Jun 14 14:00:12 UTC 2025

Modified Files:
        pkgsrc/lang/php81: Makefile distinfo
Added Files:
        pkgsrc/lang/php81/patches: patch-ext_xml_compat.c

Log Message:
lang/php81: fix compatibiltiy with libxml2>=2.13

Fix compatibiltiy with libxml2>=2.13.  This compatibiltiy problem cause
lang/pear break with php.

Found on <https://github.com/php/php-src/issues/14834>.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/php81/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/lang/php81/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php81/patches/patch-ext_xml_compat.c

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

Modified files:

Index: pkgsrc/lang/php81/Makefile
diff -u pkgsrc/lang/php81/Makefile:1.33 pkgsrc/lang/php81/Makefile:1.34
--- pkgsrc/lang/php81/Makefile:1.33     Wed Jun 11 14:58:26 2025
+++ pkgsrc/lang/php81/Makefile  Sat Jun 14 14:00:12 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2025/06/11 14:58:26 taca Exp $
+# $NetBSD: Makefile,v 1.34 2025/06/14 14:00:12 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 8.1

Index: pkgsrc/lang/php81/distinfo
diff -u pkgsrc/lang/php81/distinfo:1.39 pkgsrc/lang/php81/distinfo:1.40
--- pkgsrc/lang/php81/distinfo:1.39     Wed Jun 11 14:58:26 2025
+++ pkgsrc/lang/php81/distinfo  Sat Jun 14 14:00:12 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2025/06/11 14:58:26 taca Exp $
+$NetBSD: distinfo,v 1.40 2025/06/14 14:00:12 taca Exp $
 
 BLAKE2s (php-8.1.32.tar.xz) = b0555666ee77e5fc629cde2879d0336b1d39324032be82d68ab259cd8150444a
 SHA512 (php-8.1.32.tar.xz) = d8084415ead65d685c68c4264e793abb1322b01e120c2ac09c2e33889a13513fb42401621fcb702e36bc1a3239b317a4c10e20c676bb19eb05749a6d6e646318
@@ -10,6 +10,7 @@ SHA1 (patch-disable-filter-url) = 0a2c19
 SHA1 (patch-ext_enchant_enchant.c) = 7924acc5fdadea89b3a385cf744ef982795bf89d
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
+SHA1 (patch-ext_xml_compat.c) = 6c1772a5a0bc59e6118746608c1858c50ffa3f88
 SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd
 SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483
 SHA1 (patch-php.ini-development) = c19d1f756707ead8b73e038ef82b15c24fed5800

Added files:

Index: pkgsrc/lang/php81/patches/patch-ext_xml_compat.c
diff -u /dev/null pkgsrc/lang/php81/patches/patch-ext_xml_compat.c:1.1
--- /dev/null   Sat Jun 14 14:00:12 2025
+++ pkgsrc/lang/php81/patches/patch-ext_xml_compat.c    Sat Jun 14 14:00:12 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-ext_xml_compat.c,v 1.1 2025/06/14 14:00:12 taca Exp $
+
+Fix parse error some XML file so that lang/pear work again.
+<https://github.com/php/php-src/issues/14834>
+
+--- ext/xml/compat.c.orig      2025-03-11 22:09:20.000000000 +0000
++++ ext/xml/compat.c
+@@ -375,7 +375,7 @@ _get_entity(void *user, const xmlChar *n
+               if (ret == NULL)
+                       ret = xmlGetDocEntity(parser->parser->myDoc, name);
+ 
+-              if (ret == NULL || (parser->parser->instate != XML_PARSER_ENTITY_VALUE && parser->parser->instate != XML_PARSER_ATTRIBUTE_VALUE)) {
++              if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) {
+                       if (ret == NULL || ret->etype == XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) {
+                               /* Predefined entities will expand unless no cdata handler is present */
+                               if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) {