CVS commit: pkgsrc/lang/php56

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Jun  7 15:51:49 UTC 2025

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

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

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

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

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/lang/php56/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/lang/php56/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php56/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/php56/Makefile
diff -u pkgsrc/lang/php56/Makefile:1.43 pkgsrc/lang/php56/Makefile:1.44
--- pkgsrc/lang/php56/Makefile:1.43     Sat May 17 05:37:25 2025
+++ pkgsrc/lang/php56/Makefile  Sat Jun  7 15:51:49 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2025/05/17 05:37:25 taca Exp $
+# $NetBSD: Makefile,v 1.44 2025/06/07 15:51:49 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 5.6

Index: pkgsrc/lang/php56/distinfo
diff -u pkgsrc/lang/php56/distinfo:1.64 pkgsrc/lang/php56/distinfo:1.65
--- pkgsrc/lang/php56/distinfo:1.64     Fri Apr 18 15:54:30 2025
+++ pkgsrc/lang/php56/distinfo  Sat Jun  7 15:51:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2025/04/18 15:54:30 wiz Exp $
+$NetBSD: distinfo,v 1.65 2025/06/07 15:51:49 taca Exp $
 
 BLAKE2s (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 9eaf6505d80e90147fd0b993fb501620030eea24ccd69e42c49d8faf50d47775
 SHA512 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = bbe39ad27a5a82c705692c921b214c5630227ed9852f0432340f74533b5e618d9bea01bff75a4b7a1f1b72876b6d092d2db4533758d9a927f274cff7361f3eb4
@@ -39,6 +39,7 @@ SHA1 (patch-ext_sqlite3_config0.m4) = 24
 SHA1 (patch-ext_standard_basic__functions.c) = ca1de427a3d793c3a3e99581fbd2d1fcf99aeb30
 SHA1 (patch-ext_standard_php__dns.h) = 8e544eb637044e9428a0becb7402336f64a3a23d
 SHA1 (patch-ext_tidy_tidy.c) = 8f075f17ac913f21e65f4b704574c0ae5ffdfc84
+SHA1 (patch-ext_xml_compat.c) = fbea14c738728d33cdaf38405688ed6361f8894d
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
 SHA1 (patch-makedist) = 091d5c0ba3e890ade475faa33446c8f97bcb7bc3
 SHA1 (patch-php.ini-development) = e1a187070a9dfc28762d7476d9acc796a93c7fac

Added files:

Index: pkgsrc/lang/php56/patches/patch-ext_xml_compat.c
diff -u /dev/null pkgsrc/lang/php56/patches/patch-ext_xml_compat.c:1.1
--- /dev/null   Sat Jun  7 15:51:49 2025
+++ pkgsrc/lang/php56/patches/patch-ext_xml_compat.c    Sat Jun  7 15:51:49 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-ext_xml_compat.c,v 1.1 2025/06/07 15:51:49 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      2019-01-09 09:54:13.000000000 +0000
++++ ext/xml/compat.c
+@@ -382,7 +382,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)) {