Pullup ticket #6847 - requested by taca lang/php82: security fix Revisions pulled up: - lang/php/phpversion.mk 1.427 - lang/php82/distinfo 1.20 - lang/php82/patches/patch-configure 1.18 --- Module Name: pkgsrc Committed By: taca Date: Sat Apr 13 02:49:41 UTC 2024 Modified Files: pkgsrc/lang/php: phpversion.mk pkgsrc/lang/php82: distinfo pkgsrc/lang/php82/patches: patch-configure Log Message: lang/php82: update to 8.2.18 This release includes security fixes. 11 Apr 2024, PHP 8.2.18 - Core: . Fixed bug GH-13612 (Corrupted memory in destructor with weak references). (nielsdos) . Fixed bug GH-13784 (AX_GCC_FUNC_ATTRIBUTE failure). (Remi) . Fixed bug GH-13670 (GC does not scale well with a lot of objects created in destructor). (Arnaud) - DOM: . Add some missing ZPP checks. (nielsdos) . Fix potential memory leak in XPath evaluation results. (nielsdos) . Fix phpdoc for DOMDocument load methods. (VincentLanglet) - FPM . Fix incorrect check in fpm_shm_free(). (nielsdos) - GD: . Fixed bug GH-12019 (add GDLIB_CFLAGS in feature tests). (Michael Orlitzky) - Gettext: . Fixed sigabrt raised with dcgettext/dcngettext calls with gettext 0.22.5 with category set to LC_ALL. (David Carlier) - MySQLnd: . Fix GH-13452 (Fixed handshake response [mysqlnd]). (Saki Takamachi) . Fix incorrect charset length in check_mb_eucjpms(). (nielsdos) - Opcache: . Fixed GH-13508 (JITed QM_ASSIGN may be optimized out when op1 is null). (Arnaud, Dmitry) . Fixed GH-13712 (Segmentation fault for enabled observers when calling trait method of internal trait when opcache is loaded). (Bob) - PDO: . Fix various PDORow bugs. (Girgias) - Random: . Fixed bug GH-13544 (Pre-PHP 8.2 compatibility for mt_srand with unknown modes). (timwolla) . Fixed bug GH-13690 (Global Mt19937 is not properly reset in-between requests when MT_RAND_PHP is used). (timwolla) - Session: . Fixed bug GH-13680 (Segfault with session_decode and compilation error). (nielsdos) - Sockets: . Fixed bug GH-13604 (socket_getsockname returns random characters in the end of the socket name). (David Carlier) - SPL: . Fixed bug GH-13531 (Unable to resize SplfixedArray after being unserialized in PHP 8.2.15). (nielsdos) . Fixed bug GH-13685 (Unexpected null pointer in zend_string.h). (nielsdos) - Standard: . Fixed bug GH-11808 (Live filesystem modified by tests). (nielsdos) . Fixed GH-13402 (Added validation of `\n` in $additional_headers of mail()). (SakiTakamachi) . Fixed bug GH-13203 (file_put_contents fail on strings over 4GB on Windows). (divinity76) . Fixed bug GHSA-pc52-254m-w9w7 (Command injection via array-ish $command parameter of proc_open). (CVE-2024-1874) (Jakub Zelenka) . Fixed bug GHSA-wpj3-hf5j-x4v4 (__Host-/__Secure- cookie bypass due to partial CVE-2022-31629 fix). (CVE-2024-2756) (nielsdos) . Fixed bug GHSA-h746-cjrr-wfmr (password_verify can erroneously return true, opening ATO risk). (CVE-2024-3096) (Jakub Zelenka) - XML: . Fixed bug GH-13517 (Multiple test failures when building with --with-expat). (nielsdos)diff -r1.426 -r1.426.2.1 pkgsrc/lang/php/phpversion.mk
(bsiegert)
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: phpversion.mk,v 1.426 2024/03/17 19:19:38 jklos Exp $ | 1 | # $NetBSD: phpversion.mk,v 1.426.2.1 2024/04/22 12:36:39 bsiegert Exp $ | |
2 | # | 2 | # | |
3 | # This file selects a PHP version, based on the user's preferences and | 3 | # This file selects a PHP version, based on the user's preferences and | |
4 | # the installed packages. It does not add a dependency on the PHP | 4 | # the installed packages. It does not add a dependency on the PHP | |
5 | # package. | 5 | # package. | |
6 | # | 6 | # | |
7 | # === User-settable variables === | 7 | # === User-settable variables === | |
8 | # | 8 | # | |
9 | # PHP_VERSION_DEFAULT | 9 | # PHP_VERSION_DEFAULT | |
10 | # The PHP version to choose when more than one is acceptable to | 10 | # The PHP version to choose when more than one is acceptable to | |
11 | # the package. | 11 | # the package. | |
12 | # | 12 | # | |
13 | # Possible: 56 74 80 81 82 83 | 13 | # Possible: 56 74 80 81 82 83 | |
14 | # Default: 82 | 14 | # Default: 82 | |
@@ -82,27 +82,27 @@ | @@ -82,27 +82,27 @@ | |||
82 | # Example: lib/php/20181200 | 82 | # Example: lib/php/20181200 | |
83 | # | 83 | # | |
84 | # Keywords: php | 84 | # Keywords: php | |
85 | # | 85 | # | |
86 | 86 | |||
87 | .if !defined(PHPVERSION_MK) | 87 | .if !defined(PHPVERSION_MK) | |
88 | PHPVERSION_MK= defined | 88 | PHPVERSION_MK= defined | |
89 | 89 | |||
90 | # Define each PHP's version. | 90 | # Define each PHP's version. | |
91 | PHP56_VERSION= 5.6.40 | 91 | PHP56_VERSION= 5.6.40 | |
92 | PHP74_VERSION= 7.4.33 | 92 | PHP74_VERSION= 7.4.33 | |
93 | PHP80_VERSION= 8.0.30 | 93 | PHP80_VERSION= 8.0.30 | |
94 | PHP81_VERSION= 8.1.27 | 94 | PHP81_VERSION= 8.1.27 | |
95 | PHP82_VERSION= 8.2.17 | 95 | PHP82_VERSION= 8.2.18 | |
96 | PHP83_VERSION= 8.3.4 | 96 | PHP83_VERSION= 8.3.4 | |
97 | 97 | |||
98 | # Define API version or initial release of major version. | 98 | # Define API version or initial release of major version. | |
99 | PHP56_RELDATE= 20140828 | 99 | PHP56_RELDATE= 20140828 | |
100 | PHP74_RELDATE= 20191128 | 100 | PHP74_RELDATE= 20191128 | |
101 | PHP80_RELDATE= 20201124 | 101 | PHP80_RELDATE= 20201124 | |
102 | PHP81_RELDATE= 20211125 | 102 | PHP81_RELDATE= 20211125 | |
103 | PHP82_RELDATE= 20220829 | 103 | PHP82_RELDATE= 20220829 | |
104 | PHP83_RELDATE= 20231123 | 104 | PHP83_RELDATE= 20231123 | |
105 | 105 | |||
106 | _VARGROUPS+= php | 106 | _VARGROUPS+= php | |
107 | _USER_VARS.php= PHP_VERSION_DEFAULT | 107 | _USER_VARS.php= PHP_VERSION_DEFAULT | |
108 | _PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD | 108 | _PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: distinfo,v 1.19 2024/03/17 16:46:05 taca Exp $ | 1 | $NetBSD: distinfo,v 1.19.2.1 2024/04/22 12:36:39 bsiegert Exp $ | |
2 | 2 | |||
3 | BLAKE2s (php-8.2.17.tar.xz) = 8aa7f3dd3e671ce1aadf71668e71a5edc3ab95fab0a1d6cdb19744f5d30d30da | 3 | BLAKE2s (php-8.2.18.tar.xz) = 6571715c96a8064a61bd868f483f27a85ce0594cb540cd7c28a226abe1eb29c0 | |
4 | SHA512 (php-8.2.17.tar.xz) = 113cd8c6a481770aba7e21f1bc22500c93dfa41ff85a7b54e1abbfd5b5a32f51501c91eb45c29a5e2d8ec5f61861060c193a96e27224c97f8cad7979f378bde8 | 4 | SHA512 (php-8.2.18.tar.xz) = 8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f | |
5 | Size (php-8.2.17.tar.xz) = 12092404 bytes | 5 | Size (php-8.2.18.tar.xz) = 12089400 bytes | |
6 | SHA1 (patch-configure) = c80956e91c562a1035ba8ae93403f762e149ae47 | 6 | SHA1 (patch-configure) = 80256ba9788c66d960954516394620c9f789d744 | |
7 | SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b | 7 | SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b | |
8 | SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd | 8 | SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd | |
9 | SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640 | 9 | SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640 | |
10 | SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7 | 10 | SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7 | |
11 | SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd | 11 | SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd | |
12 | SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483 | 12 | SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483 | |
13 | SHA1 (patch-php.ini-development) = 373d76cc7a022b578f1d5e296d1f0ac88bc26b72 | 13 | SHA1 (patch-php.ini-development) = 373d76cc7a022b578f1d5e296d1f0ac88bc26b72 | |
14 | SHA1 (patch-php.ini-production) = 5ab7fa6bf8403907160b0a62b56c1ee527f8eda6 | 14 | SHA1 (patch-php.ini-production) = 5ab7fa6bf8403907160b0a62b56c1ee527f8eda6 | |
15 | SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8 | 15 | SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8 | |
16 | SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 | 16 | SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 | |
17 | SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0 | 17 | SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0 |
@@ -1,59 +1,59 @@ | @@ -1,59 +1,59 @@ | |||
1 | $NetBSD: patch-configure,v 1.17 2024/03/17 16:46:05 taca Exp $ | 1 | $NetBSD: patch-configure,v 1.17.2.1 2024/04/22 12:36:39 bsiegert Exp $ | |
2 | 2 | |||
3 | * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS. | 3 | * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS. | |
4 | * Don't autodetect maintainer-zts. | 4 | * Don't autodetect maintainer-zts. | |
5 | * Shell portability. | 5 | * Shell portability. | |
6 | 6 | |||
7 | --- configure.orig 2024-03-12 14:26:30.000000000 +0000 | 7 | --- configure.orig 2024-04-09 18:46:23.000000000 +0000 | |
8 | +++ configure | 8 | +++ configure | |
9 | @@ -4365,6 +4365,10 @@ EOF | 9 | @@ -3732,6 +3732,10 @@ EOF | |
10 | else | 10 | else | |
11 | break | 11 | break | |
12 | fi | 12 | fi | |
13 | + case "$CURRENT_ARG" in | 13 | + case "$CURRENT_ARG" in | |
14 | + \'PKG_CONFIG\=*) CURRENT_ARG="'PKG_CONFIG=@TOOLS_PATH.pkg-config@'";; | 14 | + \'PKG_CONFIG\=*) CURRENT_ARG="'PKG_CONFIG=@TOOLS_PATH.pkg-config@'";; | |
15 | + \'PKG_CONFIG_LIBDIR\=*) CURRENT_ARG="'PKG_CONFIG_LIBDIR=@PHP_PKGCONFIG_PATH@'";; | 15 | + \'PKG_CONFIG_LIBDIR\=*) CURRENT_ARG="'PKG_CONFIG_LIBDIR=@PHP_PKGCONFIG_PATH@'";; | |
16 | + esac | 16 | + esac | |
17 | printf "%s\n" "$CURRENT_ARG \\" >>config.nice | 17 | $as_echo "$CURRENT_ARG \\" >>config.nice | |
18 | CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG" | 18 | CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG" | |
19 | done | 19 | done | |
20 | @@ -7805,30 +7809,6 @@ EOF | 20 | @@ -7023,30 +7027,6 @@ EOF | |
21 | ;; | 21 | ;; | |
22 | esac | 22 | esac | |
23 | 23 | |||
24 | - if test "$APACHE_VERSION" -lt 2004001; then | 24 | - if test "$APACHE_VERSION" -lt 2004001; then | |
25 | - APXS_MPM=`$APXS -q MPM_NAME` | 25 | - APXS_MPM=`$APXS -q MPM_NAME` | |
26 | - if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then | 26 | - if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then | |
27 | - | 27 | - | |
28 | - enable_zts=yes | 28 | - enable_zts=yes | |
29 | - if test "$pthreads_working" != "yes"; then | 29 | - if test "$pthreads_working" != "yes"; then | |
30 | - as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 | 30 | - as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 | |
31 | - fi | 31 | - fi | |
32 | - | 32 | - | |
33 | - fi | 33 | - fi | |
34 | - else | 34 | - else | |
35 | - APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'` | 35 | - APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'` | |
36 | - if test -n "$APACHE_THREADED_MPM"; then | 36 | - if test -n "$APACHE_THREADED_MPM"; then | |
37 | - | 37 | - | |
38 | - enable_zts=yes | 38 | - enable_zts=yes | |
39 | - if test "$pthreads_working" != "yes"; then | 39 | - if test "$pthreads_working" != "yes"; then | |
40 | - as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 | 40 | - as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 | |
41 | - fi | 41 | - fi | |
42 | - | 42 | - | |
43 | - fi | 43 | - fi | |
44 | - fi | 44 | - fi | |
45 | - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 45 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |
46 | -printf "%s\n" "yes" >&6; } | 46 | -$as_echo "yes" >&6; } | |
47 | - | 47 | - | |
48 | PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" | 48 | PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" | |
49 | 49 | |||
50 | else | 50 | else | |
51 | @@ -82926,7 +82906,7 @@ printf "%s\n" "#define HAVE_TIDYBUFFIO_H | 51 | @@ -78313,7 +78293,7 @@ $as_echo "#define HAVE_TIDYBUFFIO_H 1" > | |
52 | fi | 52 | fi | |
53 | 53 | |||
54 | TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR | 54 | TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR | |
55 | - if test "$TIDY_LIB_NAME" == 'tidyp'; then | 55 | - if test "$TIDY_LIB_NAME" == 'tidyp'; then | |
56 | + if test "$TIDY_LIB_NAME" = 'tidyp'; then | 56 | + if test "$TIDY_LIB_NAME" = 'tidyp'; then | |
57 | 57 | |||
58 | printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h | 58 | $as_echo "#define HAVE_TIDYP_H 1" >>confdefs.h | |
59 | 59 |