CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Apr 13 15:56:19 UTC 2025

Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php83: distinfo
        pkgsrc/lang/php83/patches: patch-build_Makefile.global

Log Message:
lang/php83: update to 8.3.20

This is a bug fix release.

PHP 8.3.20 (2025-04-10)

Core:

* Fixed bug GH-17961 (use-after-free during dl()'ed module class
  destruction).
* Fixed bug GH-15367 (dl() of module with aliased class crashes in
  shutdown).
* Fixed bug GH-13193 again (Significant performance degradation in
  'foreach').

DOM:
* Fix weird unpack behaviour in DOM.
* Fix xinclude destruction of live attributes.

Embed:
* Fixed bug GH-8533 (Unable to link dynamic libphp on Mac).

Fuzzer:
* Fixed bug GH-18081 (Memory leaks in error paths of fuzzer SAPI).

GD:
* Fixed bug GH-17984 (calls with arguments as array with references).

Intl:
* Fix locale_compose and locale_lookup to work with their array argument
  with values as references.
* Fix dateformat_format when the time is an array of references.
* Fix UConverter::transcode with substitutes as references.

Mbstring:
* Fixed bug GH-17989 (mb_output_handler crash with unset
  http_output_conv_mimetypes).

Opcache:
* Fixed bug GH-18112 (NULL access with preloading and INI option).
* Fixed bug GH-18107 (Opcache CFG jmp optimization with try-finally breaks
  the exception table).

PDO:
* Fix memory leak when destroying PDORow.

SOAP:
* Fixed bug #66049 (Typemap can break parsing in parse_packet_soap leading
  to a segfault) .

SPL:
* Fixed bug GH-18018 (RC1 data returned from offsetGet causes UAF in
  ArrayObject).

Treewide:
* Fixed bug GH-17736 (Assertion failure zend_reference_destroy()).

Windows:
* Fixed bug GH-17836 (zend_vm_gen.php shouldn't break on Windows line
  endings).


To generate a diff of this commit:
cvs rdiff -u -r1.460 -r1.461 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/php83/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/php83/patches/patch-build_Makefile.global

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

Modified files:

Index: pkgsrc/lang/php/phpversion.mk
diff -u pkgsrc/lang/php/phpversion.mk:1.460 pkgsrc/lang/php/phpversion.mk:1.461
--- pkgsrc/lang/php/phpversion.mk:1.460 Thu Mar 27 12:40:55 2025
+++ pkgsrc/lang/php/phpversion.mk       Sun Apr 13 15:56:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.460 2025/03/27 12:40:55 gdt Exp $
+# $NetBSD: phpversion.mk,v 1.461 2025/04/13 15:56:18 taca Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -112,7 +112,7 @@ PHP56_VERSION=      5.6.40
 PHP74_VERSION= 7.4.33
 PHP81_VERSION= 8.1.32
 PHP82_VERSION= 8.2.28
-PHP83_VERSION= 8.3.19
+PHP83_VERSION= 8.3.20
 PHP84_VERSION= 8.4.5
 
 _VARGROUPS+=   php

Index: pkgsrc/lang/php83/distinfo
diff -u pkgsrc/lang/php83/distinfo:1.21 pkgsrc/lang/php83/distinfo:1.22
--- pkgsrc/lang/php83/distinfo:1.21     Mon Apr  7 17:33:36 2025
+++ pkgsrc/lang/php83/distinfo  Sun Apr 13 15:56:18 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.21 2025/04/07 17:33:36 taca Exp $
+$NetBSD: distinfo,v 1.22 2025/04/13 15:56:18 taca Exp $
 
-BLAKE2s (php-8.3.19.tar.xz) = c5119f2fa7692da110db99b803c46d67c004a29cc67a1b0b4ad3a7ae46c7b932
-SHA512 (php-8.3.19.tar.xz) = 2872639f6a6de1680540da5a2df43db7ceeb7e25690b6f66d73373779ee3f9b0c2fe74aeeb7181749c9738b64f8d41b8a6f496751778c1df10b7f9aab43f21f7
-Size (php-8.3.19.tar.xz) = 12560852 bytes
+BLAKE2s (php-8.3.20.tar.xz) = 87a88cc7b033c94aac11f1a29718ea8fef7ca0d879e8c351c592c76bc264ce1d
+SHA512 (php-8.3.20.tar.xz) = 2641a721ca0cbcb05200217ba38c7d0707b6294c355e109486180beccf0f5fa4822f92caab479a473bfccf93558a5bc34d42ef271355022701d62e2d11afeff9
+Size (php-8.3.20.tar.xz) = 12549020 bytes
 SHA1 (patch-TSRM_TSRM.c) = 278007810b74fa7a9cd971dac051d6a2ea0ad90d
 SHA1 (patch-TSRM_TSRM.h) = 70ebc03a611124d76d6813f619ff18b3a8fbf1e8
-SHA1 (patch-build_Makefile.global) = 87c533087a536649b5f51108ef4f4b72c8efc5b2
+SHA1 (patch-build_Makefile.global) = 25ee73157c012aa731a2979cb0546ea94aa5ee16
 SHA1 (patch-build_php.m4) = 4a99c91785e7de3095cab08ed2fad6053b4a94e0
 SHA1 (patch-configure.ac) = 11600400f69e0db2b429f4d37d70477550b0cd6a
 SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b

Index: pkgsrc/lang/php83/patches/patch-build_Makefile.global
diff -u pkgsrc/lang/php83/patches/patch-build_Makefile.global:1.1 pkgsrc/lang/php83/patches/patch-build_Makefile.global:1.2
--- pkgsrc/lang/php83/patches/patch-build_Makefile.global:1.1   Sat Feb  8 02:59:57 2025
+++ pkgsrc/lang/php83/patches/patch-build_Makefile.global       Sun Apr 13 15:56:19 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-build_Makefile.global,v 1.1 2025/02/08 02:59:57 taca Exp $
+$NetBSD: patch-build_Makefile.global,v 1.2 2025/04/13 15:56:19 taca Exp $
 
 * Adjust PHP library name.
 
---- build/Makefile.global.orig 2024-12-17 11:39:23.000000000 +0000
+--- build/Makefile.global.orig 2025-04-08 20:21:18.000000000 +0000
 +++ build/Makefile.global
-@@ -15,22 +15,22 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND
+@@ -15,26 +15,26 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND
  
  build-binaries: $(PHP_BINARIES)
  
@@ -13,6 +13,11 @@ $NetBSD: patch-build_Makefile.global,v 1
        $(LIBTOOL) --tag=CC --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
        -@$(LIBTOOL) --silent --tag=CC --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
  
+-libphp.dylib: libphp.la
++libphp$(PHP_VER).dylib: libphp$(PHP_VER).la
+       $(LIBTOOL) --tag=CC --mode=link $(CC) -dynamiclib $(LIBPHP_CFLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -rpath $(phptempdir) -install_name @rpath/$@ $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+       -@$(LIBTOOL) --silent --tag=CC --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+ 
 -libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 -      $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ 
&& cp $@ libs/libphp.so
 +libs/libphp$(PHP_VER).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
@@ -33,7 +38,7 @@ $NetBSD: patch-build_Makefile.global,v 1
                                break; \
                        fi; \
                done; \
-@@ -118,7 +118,7 @@ clean:
+@@ -122,7 +122,7 @@ clean:
        find . -name \*.la -o -name \*.a | xargs rm -f
        find . -name \*.so | xargs rm -f
        find . -name .libs -a -type d|xargs rm -rf
@@ -42,7 +47,7 @@ $NetBSD: patch-build_Makefile.global,v 1
        rm -f ext/opcache/jit/zend_jit_x86.c
        rm -f ext/opcache/jit/zend_jit_arm64.c
        rm -f ext/opcache/minilua
-@@ -143,7 +143,7 @@ prof-clean:
+@@ -147,7 +147,7 @@ prof-clean:
        find . -name \*.lo -o -name \*.o | xargs rm -f
        find . -name \*.la -o -name \*.a | xargs rm -f
        find . -name \*.so | xargs rm -f