CVS commit: pkgsrc/lang/php56

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Oct 28 14:40:58 UTC 2026

Modified Files:
        pkgsrc/lang/php56: distinfo
        pkgsrc/lang/php56/patches: patch-ext_standard_basic__functions.c
Added Files:
        pkgsrc/lang/php56/patches: patch-sapi_embed_php__embed.c

Log Message:
lang/php56: build fix

Add missing parts from previous patches.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/lang/php56/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/php56/patches/patch-sapi_embed_php__embed.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/distinfo
diff -u pkgsrc/lang/php56/distinfo:1.68 pkgsrc/lang/php56/distinfo:1.69
--- pkgsrc/lang/php56/distinfo:1.68     Tue Oct 27 15:30:48 2026
+++ pkgsrc/lang/php56/distinfo  Wed Oct 28 14:40:58 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2026/10/27 15:30:48 taca Exp $
+$NetBSD: distinfo,v 1.69 2026/10/28 14:40:58 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
@@ -47,7 +47,7 @@ SHA1 (patch-ext_phar_phar_phar.php) = 15
 SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
 SHA1 (patch-ext_session_session.c) = 4a2bffc26711f8258632433ddda1d612459d9855
 SHA1 (patch-ext_sqlite3_config0.m4) = 2435e1518a88c7d05eb93cf3c8e716fe4ea0748b
-SHA1 (patch-ext_standard_basic__functions.c) = ca1de427a3d793c3a3e99581fbd2d1fcf99aeb30
+SHA1 (patch-ext_standard_basic__functions.c) = 7c40e82bd756a4ad9bba4c8865e0d88ae0b75975
 SHA1 (patch-ext_standard_basic__functions.h) = 04506f91783498421e0d1b32b8bcc9477e41a077
 SHA1 (patch-ext_standard_php__dns.h) = 8e544eb637044e9428a0becb7402336f64a3a23d
 SHA1 (patch-ext_standard_php__incomplete__class.h) = 5123320a7e1d7ddac12b5e752b130277bf970fea
@@ -69,6 +69,7 @@ SHA1 (patch-sapi_apache2handler_config.m
 SHA1 (patch-sapi_apache_apMakefile.tmpl) = ed1f727d0f2d1cd9afa5d793f29126d96122087c
 SHA1 (patch-sapi_apache_config.m4) = f652333407497fc7a8bed98378b629a8030c4d4c
 SHA1 (patch-sapi_cgi_Makefile.frag) = 7bbe1cd3c5fc1d8a2bd6a4177598a5b93139986c
+SHA1 (patch-sapi_embed_php__embed.c) = fd9328a68cd97f3a20b6f075e564c044ab0c56e4
 SHA1 (patch-sapi_fpm_fpm_events_port.c) = e445f1a12381ffeb9db47655519d62f574334494
 SHA1 (patch-sapi_fpm_fpm_fpm__conf.c) = a9f5aa3c194a812d3a9a6d90dd480c3ad929534e
 SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 564b0a059cb58c671632c6ee8f404f46fe2299f0

Index: pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c
diff -u pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c:1.2 pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c:1.3
--- pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c:1.2 Sat Feb  8 02:57:59 2025
+++ pkgsrc/lang/php56/patches/patch-ext_standard_basic__functions.c     Wed Oct 28 14:40:58 2026
@@ -1,10 +1,18 @@
-$NetBSD: patch-ext_standard_basic__functions.c,v 1.2 2025/02/08 02:57:59 taca Exp $
+$NetBSD: patch-ext_standard_basic__functions.c,v 1.3 2026/10/28 14:40:58 taca Exp $
 
 * Work around VAX FP lack of INF
 
---- ext/standard/basic_functions.c.orig        2014-11-12 13:52:21.000000000 +0000
+--- ext/standard/basic_functions.c.orig        2019-01-09 09:54:13.000000000 +0000
 +++ ext/standard/basic_functions.c
-@@ -3489,7 +3489,7 @@ PHPAPI double php_get_nan(void) /* {{{ *
+@@ -3448,6 +3448,7 @@ static void basic_globals_ctor(php_basic
+       BG(user_tick_functions) = NULL;
+       BG(user_filter_map) = NULL;
+       BG(serialize_lock) = 0;
++      BG(incomplete_classes_only) = 0;
+ 
+       memset(&BG(serialize), 0, sizeof(BG(serialize)));
+       memset(&BG(unserialize), 0, sizeof(BG(unserialize)));
+@@ -3495,7 +3496,7 @@ PHPAPI double php_get_nan(void) /* {{{ *
  
  PHPAPI double php_get_inf(void) /* {{{ */
  {
@@ -13,3 +21,34 @@ $NetBSD: patch-ext_standard_basic__funct
        return HUGE_VAL;
  #elif defined(__i386__) || defined(_X86_) || defined(ALPHA) || defined(_ALPHA) || defined(__alpha)
        double val = 0.0;
+@@ -3716,6 +3717,7 @@ PHP_RINIT_FUNCTION(basic) /* {{{ */
+       memset(BG(strtok_table), 0, 256);
+ 
+       BG(serialize_lock) = 0;
++      BG(incomplete_classes_only) = 0;
+       memset(&BG(serialize), 0, sizeof(BG(serialize)));
+       memset(&BG(unserialize), 0, sizeof(BG(unserialize)));
+ 
+@@ -3814,6 +3816,22 @@ PHP_RSHUTDOWN_FUNCTION(basic) /* {{{ */
+ }
+ /* }}} */
+ 
++/* Called from php_request_startup(), before any request data is processed.
++ * The session upload progress handler (un)serializes the session and
++ * registers the session id with the URL rewriter while the request body is
++ * parsed, before RINIT. A previous request interrupted by a fatal error may
++ * have left these pointing to freed memory (CVE-2026-109619). */
++PHPAPI void php_basic_early_rinit(TSRMLS_D) /* {{{ */
++{
++      BG(serialize_lock) = 0;
++      BG(incomplete_classes_only) = 0;
++      memset(&BG(serialize), 0, sizeof(BG(serialize)));
++      memset(&BG(unserialize), 0, sizeof(BG(unserialize)));
++      /* Everything before tags is zeroed in RINIT, see url_adapt_state_ex_t */
++      memset(&BG(url_adapt_state_ex), 0, XtOffsetOf(url_adapt_state_ex_t, tags));
++}
++/* }}} */
++
+ PHP_MINFO_FUNCTION(basic) /* {{{ */
+ {
+       php_info_print_table_start();

Added files:

Index: pkgsrc/lang/php56/patches/patch-sapi_embed_php__embed.c
diff -u /dev/null pkgsrc/lang/php56/patches/patch-sapi_embed_php__embed.c:1.1
--- /dev/null   Wed Oct 28 14:40:58 2026
+++ pkgsrc/lang/php56/patches/patch-sapi_embed_php__embed.c     Wed Oct 28 14:40:58 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-sapi_embed_php__embed.c,v 1.1 2026/10/28 14:40:58 taca Exp $
+
+Remove one warning.
+
+--- sapi/embed/php_embed.c.orig        2019-01-09 09:54:13.000000000 +0000
++++ sapi/embed/php_embed.c
+@@ -108,7 +108,7 @@ static int php_embed_startup(sapi_module
+       return SUCCESS;
+ }
+ 
+-extern EMBED_SAPI_API sapi_module_struct php_embed_module = {
++EMBED_SAPI_API sapi_module_struct php_embed_module = {
+       "embed",                       /* name */
+       "PHP Embedded Library",        /* pretty name */
+