CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Apr 15 02:17:14 UTC 2023

Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php82: PLIST distinfo
        pkgsrc/lang/php82/patches: patch-configure

Log Message:
lang/php82: update to 8.2.5

13 Apr 2023, PHP 8.2.5

- Core:
  . Added optional support for max_execution_time in ZTS/Linux builds
    (Kévin Dunglas)
  . Fixed use-after-free in recursive AST evaluation. (ilutov)
  . Fixed bug GH-8646 (Memory leak PHP FPM 8.1). (nielsdos)
  . Re-add some CTE functions that were removed from being CTE by a mistake.
    (mvorisek)
  . Remove CTE flag from array_diff_ukey(), which was added by mistake.
    (mvorisek)
  . Fixed bug GH-10801 (Named arguments in CTE functions cause a segfault).
    (nielsdos)
  . Fixed bug GH-8789 (PHP 8.0.20 (ZTS) zend_signal_handler_defer crashes on
    apache). (nielsdos)
  . Fixed bug GH-10015 (zend_signal_handler_defer crashes on apache shutdown).
    (nielsdos)
  . Fixed bug GH-10810 (Fix NUL byte terminating Exception::__toString()).
    (ilutov)
  . Fix potential memory corruption when mixing __callStatic() and FFI. (ilutov)

- Date:
  . Fixed bug GH-10747 (Private and protected properties in serialized Date*
    objects throw). (Derick)

- FPM:
  . Fixed bug GH-10611 (fpm_env_init_main leaks environ). (nielsdos)
  . Destroy file_handle in fpm_main. (Jakub Zelenka, nielsdos)
  . Fixed bug #74129 (Incorrect SCRIPT_NAME with apache ProxyPassMatch when
    spaces are in path). (Jakub Zelenka)

- FTP:
  . Propagate success status of ftp_close(). (nielsdos)
  . Fixed bug GH-10521 (ftp_get/ftp_nb_get resumepos offset is maximum 10GB).
    (nielsdos)

- IMAP:
  . Fix build failure with Clang 16. (orlitzky)

- MySQLnd:
  . Fixed bug GH-8979 (Possible Memory Leak with SSL-enabled MySQL
    connections). (nielsdos)

- Opcache:
  . Fixed build for macOS to cater with pkg-config settings. (David Carlier)
  . Fixed bug GH-8065 (opcache.consistency_checks > 0 causes segfaults in
    PHP >= 8.1.5 in fpm context). (nielsdos)

- OpenSSL:
  . Add missing error checks on file writing functions. (nielsdos)

- PDO Firebird:
  . Fixed bug GH-10908 (Bus error with PDO Firebird on RPI with 64 bit kernel
    and 32 bit userland). (nielsdos)

- Phar:
  . Fixed bug GH-10766 (PharData archive created with Phar::Zip format does
    not keep files metadata (datetime)). (nielsdos)
  . Add missing error checks on EVP_MD_CTX_create() and EVP_VerifyInit().
    (nielsdos)

- PDO ODBC:
  . Fixed missing and inconsistent error checks on SQLAllocHandle. (nielsdos)

- PGSQL:
  . Fixed typo in the array returned from pg_meta_data (extended mode).
    (David Carlier)

- SPL:
  . Fixed bug GH-10519 (Array Data Address Reference Issue). (Nathan Freeman)
  . Fixed bug GH-10907 (Unable to serialize processed SplFixedArrays in
    PHP 8.2.4). (nielsdos)
  . Fixed bug GH-10844 (ArrayIterator allows modification of readonly props).
    (ilutov)

- Standard:
  . Fixed bug GH-10885 (stream_socket_server context leaks). (ilutov)
  . Fixed bug GH-10052 (Browscap crashes PHP 8.1.12 on request shutdown
    (apache2)). (nielsdos)
  . Fixed oss-fuzz #57392 (Buffer-overflow in php_fgetcsv() with \0 delimiter
    and enclosure). (ilutov)
  . Fixed undefined behaviour in unpack(). (nielsdos)


To generate a diff of this commit:
cvs rdiff -u -r1.393 -r1.394 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php82/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/php82/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/php82/patches/patch-configure

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.393 pkgsrc/lang/php/phpversion.mk:1.394
--- pkgsrc/lang/php/phpversion.mk:1.393 Fri Mar 17 13:53:02 2023
+++ pkgsrc/lang/php/phpversion.mk       Sat Apr 15 02:17:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.393 2023/03/17 13:53:02 taca Exp $
+# $NetBSD: phpversion.mk,v 1.394 2023/04/15 02:17:13 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
@@ -91,7 +91,7 @@ PHP56_VERSION=        5.6.40
 PHP74_VERSION= 7.4.33
 PHP80_VERSION= 8.0.28
 PHP81_VERSION= 8.1.17
-PHP82_VERSION= 8.2.4
+PHP82_VERSION= 8.2.5
 
 # Define API version or initial release of major version.
 PHP56_RELDATE= 20140828

Index: pkgsrc/lang/php82/PLIST
diff -u pkgsrc/lang/php82/PLIST:1.1 pkgsrc/lang/php82/PLIST:1.2
--- pkgsrc/lang/php82/PLIST:1.1 Sun Dec 11 14:12:29 2022
+++ pkgsrc/lang/php82/PLIST     Sat Apr 15 02:17:13 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2022/12/11 14:12:29 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/04/15 02:17:13 taca Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -72,6 +72,7 @@ include/php/Zend/zend_list.h
 include/php/Zend/zend_llist.h
 include/php/Zend/zend_long.h
 include/php/Zend/zend_map_ptr.h
+include/php/Zend/zend_max_execution_timer.h
 include/php/Zend/zend_mmap.h
 include/php/Zend/zend_modules.h
 include/php/Zend/zend_multibyte.h

Index: pkgsrc/lang/php82/distinfo
diff -u pkgsrc/lang/php82/distinfo:1.5 pkgsrc/lang/php82/distinfo:1.6
--- pkgsrc/lang/php82/distinfo:1.5      Fri Mar 17 13:53:02 2023
+++ pkgsrc/lang/php82/distinfo  Sat Apr 15 02:17:13 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2023/03/17 13:53:02 taca Exp $
+$NetBSD: distinfo,v 1.6 2023/04/15 02:17:13 taca Exp $
 
-BLAKE2s (php-8.2.4.tar.xz) = d468026ea58d4608bb27da49640971d430d344f3504d71be376f2e161a758e5e
-SHA512 (php-8.2.4.tar.xz) = 997435f3f921f305147a520497c68031aad6d1212365ddf04674d919fd2787d169d2898536a59709b5530857c5746a25cf43e726a2c3a30bcf3372107b2cd388
-Size (php-8.2.4.tar.xz) = 11991796 bytes
+BLAKE2s (php-8.2.5.tar.xz) = 4abf40ccb832df20563def83998ac5f018f91cdc0eb27d2e2c492164c08c7d2a
+SHA512 (php-8.2.5.tar.xz) = ae8aac35a58b342fbfb725044eecdb1065690c461b26e4225445bda3a1719e43eacc4ad5536ccce326cf56a18c20d424b85b1a53277100c7186fc4d54b2d77f0
+Size (php-8.2.5.tar.xz) = 12001192 bytes
 SHA1 (patch-build_libtool.m4) = e58a2bcebe9e9d7dc7255354fd9fe57878e3f8a6
-SHA1 (patch-configure) = 2173fb80501f65860cbdd502c6b3b50ad176c33f
+SHA1 (patch-configure) = 8cb200f069318bd552b4eab1ddbdfd6d4ba31ac9
 SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640

Index: pkgsrc/lang/php82/patches/patch-configure
diff -u pkgsrc/lang/php82/patches/patch-configure:1.5 pkgsrc/lang/php82/patches/patch-configure:1.6
--- pkgsrc/lang/php82/patches/patch-configure:1.5       Fri Mar 17 13:53:03 2023
+++ pkgsrc/lang/php82/patches/patch-configure   Sat Apr 15 02:17:14 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.5 2023/03/17 13:53:03 taca Exp $
+$NetBSD: patch-configure,v 1.6 2023/04/15 02:17:14 taca Exp $
 
 * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS.
 * Don't autodetect maintainer-zts.
 * Shell portability.
 
---- configure.orig     2023-03-14 16:11:05.000000000 +0000
+--- configure.orig     2023-04-11 16:16:23.000000000 +0000
 +++ configure
-@@ -4320,6 +4320,10 @@ EOF
+@@ -3732,6 +3732,10 @@ EOF
     else
      break
     fi
@@ -14,10 +14,10 @@ $NetBSD: patch-configure,v 1.5 2023/03/1
 +       \'PKG_CONFIG\=*)       CURRENT_ARG="'PKG_CONFIG=@TOOLS_PATH.pkg-config@'";;
 +       \'PKG_CONFIG_LIBDIR\=*)        CURRENT_ARG="'PKG_CONFIG_LIBDIR=@PHP_PKGCONFIG_PATH@'";;
 +   esac
-    printf "%s\n" "$CURRENT_ARG \\" >>config.nice
+    $as_echo "$CURRENT_ARG \\" >>config.nice
     CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
    done
-@@ -7550,30 +7554,6 @@ EOF
+@@ -7022,30 +7026,6 @@ EOF
      ;;
    esac
  
@@ -42,18 +42,18 @@ $NetBSD: patch-configure,v 1.5 2023/03/1
 -
 -    fi
 -  fi
--  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--printf "%s\n" "yes" >&6; }
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
 -
    PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
  
  else
-@@ -81015,7 +80995,7 @@ printf "%s\n" "#define HAVE_TIDYBUFFIO_H
+@@ -78373,7 +78353,7 @@ $as_echo "#define HAVE_TIDYBUFFIO_H 1" >
    fi
  
    TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
 -  if test "$TIDY_LIB_NAME" == 'tidyp'; then
 +  if test "$TIDY_LIB_NAME" = 'tidyp'; then
  
- printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h
+ $as_echo "#define HAVE_TIDYP_H 1" >>confdefs.h