CVS commit: pkgsrc/lang/php74

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Jun 14 13:57:10 UTC 2025

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

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

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

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

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/php74/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/php74/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php74/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/php74/Makefile
diff -u pkgsrc/lang/php74/Makefile:1.31 pkgsrc/lang/php74/Makefile:1.32
--- pkgsrc/lang/php74/Makefile:1.31     Wed Jun 11 14:58:26 2025
+++ pkgsrc/lang/php74/Makefile  Sat Jun 14 13:57:10 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2025/06/11 14:58:26 taca Exp $
+# $NetBSD: Makefile,v 1.32 2025/06/14 13:57:10 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 7.4

Index: pkgsrc/lang/php74/distinfo
diff -u pkgsrc/lang/php74/distinfo:1.45 pkgsrc/lang/php74/distinfo:1.46
--- pkgsrc/lang/php74/distinfo:1.45     Wed Jun 11 14:58:26 2025
+++ pkgsrc/lang/php74/distinfo  Sat Jun 14 13:57:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2025/06/11 14:58:26 taca Exp $
+$NetBSD: distinfo,v 1.46 2025/06/14 13:57:10 taca Exp $
 
 BLAKE2s (php-7.4.33.tar.xz) = 11ec78e0a566d33168e9867e60796f25b8edc4efa03868929251a6297021e79d
 SHA512 (php-7.4.33.tar.xz) = 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
@@ -17,6 +17,7 @@ SHA1 (patch-ext_libxml_libxml.c) = 33e19
 SHA1 (patch-ext_openssl_openssl.c) = bbd446bbf89e90749a01319553d666d86d1274e2
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
+SHA1 (patch-ext_xml_compat.c) = 2415549270c38822d702668ae0d1e3b30a4869ec
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
 SHA1 (patch-php.ini-development) = 719cc709ea383691ef656f38e1ab5f30a11ef509
 SHA1 (patch-php.ini-production) = 334fcba211c0b5d864c93b6f79c997e07e1ed70d

Added files:

Index: pkgsrc/lang/php74/patches/patch-ext_xml_compat.c
diff -u /dev/null pkgsrc/lang/php74/patches/patch-ext_xml_compat.c:1.1
--- /dev/null   Sat Jun 14 13:57:10 2025
+++ pkgsrc/lang/php74/patches/patch-ext_xml_compat.c    Sat Jun 14 13:57:10 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-ext_xml_compat.c,v 1.1 2025/06/14 13:57:10 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-06-14 13:53:58.516004875 +0000
++++ ext/xml/compat.c
+@@ -376,7 +376,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)) {