CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Fri Oct 27 15:02:43 UTC 2023

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

Log Message:
lang/php82: update to 8.2.12

26 Oct 2023, PHP 8.2.12

- Core:
  . Fixed bug GH-12207 (memory leak when class using trait with doc block).
    (rioderelfte)
  . Fixed bug GH-12215 (Module entry being overwritten causes type errors in
    ext/dom). (nielsdos)
  . Fixed bug GH-12273 (__builtin_cpu_init check). (Freaky)
  . Fixed bug #80092 (ZTS + preload = segfault on shutdown). (nielsdos)

- CLI:
  . Ensure a single Date header is present. (coppolafab)

- CType:
  . Fixed bug GH-11997 (ctype_alnum 5 times slower in PHP 8.1 or greater).
    (nielsdos)

- DOM:
  . Restore old namespace reconciliation behaviour. (nielsdos)
  . Fixed bug GH-8996 (DOMNode serialization on PHP ^8.1). (nielsdos)

- Fileinfo:
  . Fixed bug GH-11891 (fileinfo returns text/xml for some svg files). (usarise)

- Filter:
  . Fix explicit FILTER_REQUIRE_SCALAR with FILTER_CALLBACK (ilutov)

- Hash:
  . Fixed bug GH-12186 (segfault copying/cloning a finalized HashContext).
    (MaxSem)

- Intl:
  . Fixed bug GH-12243 (segfault on IntlDateFormatter::construct).
    (David Carlier)
  . Fixed bug GH-12282 (IntlDateFormatter::construct should throw an exception
    on an invalid locale). (David Carlier)

- MySQLnd:
  . Fixed bug GH-12297 (PHP Startup: Invalid library (maybe not a PHP library)
    'mysqlnd.so' in Unknown on line). (nielsdos)

- Opcache:
  . Fixed opcache_invalidate() on deleted file. (mikhainin)
  . Fixed bug GH-12380 (JIT+private array property access inside closure
    accesses private property in child class). (nielsdos)

- PCRE:
  . Fixed bug GH-11956 (Backport upstream fix, PCRE regular expressions with
    JIT enabled gives different result). (nielsdos)

- SimpleXML:
  . Fixed bug GH-12170 (Can't use xpath with comments in SimpleXML). (nielsdos)
  . Fixed bug GH-12223 (Entity reference produces infinite loop in
    var_dump/print_r). (nielsdos)
  . Fixed bug GH-12167 (Unable to get processing instruction contents in
    SimpleXML). (nielsdos)
  . Fixed bug GH-12169 (Unable to get comment contents in SimpleXML).
    (nielsdos)

- Streams:
  . Fixed bug GH-12190 (binding ipv4 address with both address and port at 0).
    (David Carlier)

- XML:
  . Fix return type of stub of xml_parse_into_struct(). (nielsdos)
  . Fix memory leak when calling xml_parse_into_struct() twice. (nielsdos)

- XSL:
  . Fix type error on XSLTProcessor::transformToDoc return value with
    SimpleXML. (nielsdos)


To generate a diff of this commit:
cvs rdiff -u -r1.410 -r1.411 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php82/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/php82/distinfo
cvs rdiff -u -r1.11 -r1.12 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.410 pkgsrc/lang/php/phpversion.mk:1.411
--- pkgsrc/lang/php/phpversion.mk:1.410 Fri Sep 29 15:11:00 2023
+++ pkgsrc/lang/php/phpversion.mk       Fri Oct 27 15:02:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.410 2023/09/29 15:11:00 taca Exp $
+# $NetBSD: phpversion.mk,v 1.411 2023/10/27 15:02:43 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.30
 PHP81_VERSION= 8.1.24
-PHP82_VERSION= 8.2.11
+PHP82_VERSION= 8.2.12
 
 # Define API version or initial release of major version.
 PHP56_RELDATE= 20140828

Index: pkgsrc/lang/php82/Makefile
diff -u pkgsrc/lang/php82/Makefile:1.4 pkgsrc/lang/php82/Makefile:1.5
--- pkgsrc/lang/php82/Makefile:1.4      Tue Oct 24 22:09:38 2023
+++ pkgsrc/lang/php82/Makefile  Fri Oct 27 15:02:43 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2023/10/24 22:09:38 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2023/10/27 15:02:43 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
-PKGREVISION=           1
 
 COMMENT=               PHP Hypertext Preprocessor version 8.2
 LICENSE=               php

Index: pkgsrc/lang/php82/distinfo
diff -u pkgsrc/lang/php82/distinfo:1.13 pkgsrc/lang/php82/distinfo:1.14
--- pkgsrc/lang/php82/distinfo:1.13     Fri Sep 29 15:08:06 2023
+++ pkgsrc/lang/php82/distinfo  Fri Oct 27 15:02:43 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2023/09/29 15:08:06 taca Exp $
+$NetBSD: distinfo,v 1.14 2023/10/27 15:02:43 taca Exp $
 
-BLAKE2s (php-8.2.11.tar.xz) = ee63ca3cecf20547ac0bda9d7280660c0e0ca7c41d4ca3ed2679ca768f16628d
-SHA512 (php-8.2.11.tar.xz) = 3c8db245854c0221a952e0f11fc8fbf8944caf73ae0049a710db0db5ce9c018207444dc8a60e2b3c63a6d025c5d09cd17b0542e1b7df8ad2e49635ef5faf7f45
-Size (php-8.2.11.tar.xz) = 12046180 bytes
-SHA1 (patch-configure) = be51847b1641413b97d1dd998c8188160fce7a4c
+BLAKE2s (php-8.2.12.tar.xz) = 9aa2c22e92bfdf90f289d2272a1ad7796c1b1e8aa3010ae33b58fd76c1cfe694
+SHA512 (php-8.2.12.tar.xz) = d3fa01ade4094cb2a1b36f1d0bbfdf7c590997e13566ffcfdbd5a307b30ad9456099116f44fe2d612158a0017d9f05346932ce47768c760c7cfacfa56acf294e
+Size (php-8.2.12.tar.xz) = 12048788 bytes
+SHA1 (patch-configure) = c8578bf4893665cb8dee242bbdc866d100912436
 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.11 pkgsrc/lang/php82/patches/patch-configure:1.12
--- pkgsrc/lang/php82/patches/patch-configure:1.11      Fri Sep 29 15:08:06 2023
+++ pkgsrc/lang/php82/patches/patch-configure   Fri Oct 27 15:02:43 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.11 2023/09/29 15:08:06 taca Exp $
+$NetBSD: patch-configure,v 1.12 2023/10/27 15:02:43 taca Exp $
 
 * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS.
 * Don't autodetect maintainer-zts.
 * Shell portability.
 
---- configure.orig     2023-09-26 11:11:58.000000000 +0000
+--- configure.orig     2023-10-24 19:22:16.000000000 +0000
 +++ configure
-@@ -4323,6 +4323,10 @@ EOF
+@@ -3732,6 +3732,10 @@ EOF
     else
      break
     fi
@@ -14,10 +14,10 @@ $NetBSD: patch-configure,v 1.11 2023/09/
 +       \'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
-@@ -7554,30 +7558,6 @@ EOF
+@@ -7023,30 +7027,6 @@ EOF
      ;;
    esac
  
@@ -42,18 +42,18 @@ $NetBSD: patch-configure,v 1.11 2023/09/
 -
 -    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
-@@ -81253,7 +81233,7 @@ printf "%s\n" "#define HAVE_TIDYBUFFIO_H
+@@ -78641,7 +78621,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