Sat Apr 13 02:49:41 2024 UTC (65d)
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)


(taca)
diff -r1.426 -r1.427 pkgsrc/lang/php/phpversion.mk
diff -r1.19 -r1.20 pkgsrc/lang/php82/distinfo
diff -r1.17 -r1.18 pkgsrc/lang/php82/patches/patch-configure
cvs diff -r1.426 -r1.427 pkgsrc/lang/php/phpversion.mk (switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2024/03/17 19:19:38 1.426
+++ pkgsrc/lang/php/phpversion.mk 2024/04/13 02:49:41 1.427
@@ -1,259 +1,259 @@ @@ -1,259 +1,259 @@
1# $NetBSD: phpversion.mk,v 1.426 2024/03/17 19:19:38 jklos Exp $ 1# $NetBSD: phpversion.mk,v 1.427 2024/04/13 02:49:41 taca 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
15# 15#
16# === Infrastructure variables === 16# === Infrastructure variables ===
17# 17#
18# PHP_VERSION_REQD 18# PHP_VERSION_REQD
19# PHP version to use. This variable should not be set in 19# PHP version to use. This variable should not be set in
20# packages. Normally it is used by bulk build tools. 20# packages. Normally it is used by bulk build tools.
21# 21#
22# Possible: ${PHP_VERSIONS_ACCEPTED} 22# Possible: ${PHP_VERSIONS_ACCEPTED}
23# Default: ${PHP_VERSION_DEFAULT} 23# Default: ${PHP_VERSION_DEFAULT}
24# 24#
25# === Package-settable variables === 25# === Package-settable variables ===
26# 26#
27# PHP_VERSIONS_ACCEPTED 27# PHP_VERSIONS_ACCEPTED
28# The PHP versions that are accepted by the package. 28# The PHP versions that are accepted by the package.
29# 29#
30# Possible: 56 74 80 81 82 83 30# Possible: 56 74 80 81 82 83
31# Default: 82 81 83 74 56 80 31# Default: 82 81 83 74 56 80
32# 32#
33# PHP_VERSIONS_INCOMPATIBLE 33# PHP_VERSIONS_INCOMPATIBLE
34# The PHP versions that are not supported by the package. 34# The PHP versions that are not supported by the package.
35# 35#
36# Possible: 56 74 80 81 82 83 36# Possible: 56 74 80 81 82 83
37# Default: (empty) 37# Default: (empty)
38# 38#
39# PHP_CHECK_INSTALLED 39# PHP_CHECK_INSTALLED
40# Check installed version of PHP. Should be only used by 40# Check installed version of PHP. Should be only used by
41# lang/php56, lang/php74, lang/php80, lang/php81, lang/php82 41# lang/php56, lang/php74, lang/php80, lang/php81, lang/php82
42# and lang/php83. 42# and lang/php83.
43# 43#
44# Possible: Yes No 44# Possible: Yes No
45# Default: Yes 45# Default: Yes
46# 46#
47# === Variables defined by this file === 47# === Variables defined by this file ===
48# 48#
49# PKG_PHP_VERSION 49# PKG_PHP_VERSION
50# The selected PHP version. 50# The selected PHP version.
51# 51#
52# Possible: 56 74 80 81 82 83 52# Possible: 56 74 80 81 82 83
53# Default: ${PHP_VERSION_DEFAULT} 53# Default: ${PHP_VERSION_DEFAULT}
54# 54#
55# PHP_BASE_VERS 55# PHP_BASE_VERS
56# The selected PHP's full version depends on PKG_PHP_VERSION 56# The selected PHP's full version depends on PKG_PHP_VERSION
57# 57#
58# PKG_PHP_MAJOR_VERS 58# PKG_PHP_MAJOR_VERS
59# The selected PHP's major version. 59# The selected PHP's major version.
60# 60#
61# Possible: 5 7 8 61# Possible: 5 7 8
62# Default: 8 62# Default: 8
63# 63#
64# PKG_PHP 64# PKG_PHP
65# The same as ${PKG_PHP_VERSION}, prefixed with "php-". 65# The same as ${PKG_PHP_VERSION}, prefixed with "php-".
66# 66#
67# PHPPKGSRCDIR 67# PHPPKGSRCDIR
68# The directory of the PHP implementation, relative to the 68# The directory of the PHP implementation, relative to the
69# package directory. 69# package directory.
70# 70#
71# Example: ../../lang/php81 71# Example: ../../lang/php81
72# 72#
73# PHP_PKG_PREFIX 73# PHP_PKG_PREFIX
74# The prefix that is prepended to the package name. 74# The prefix that is prepended to the package name.
75# 75#
76# Example: php56 php74 php80 php81 php82 php83 76# Example: php56 php74 php80 php81 php82 php83
77# 77#
78# PHP_EXTENSION_DIR 78# PHP_EXTENSION_DIR
79# Relative path to ${PREFIX} for PHP's extensions. It is derived from 79# Relative path to ${PREFIX} for PHP's extensions. It is derived from
80# initial release of major version. 80# initial release of major version.
81# 81#
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)
88PHPVERSION_MK= defined 88PHPVERSION_MK= defined
89 89
90# Define each PHP's version. 90# Define each PHP's version.
91PHP56_VERSION= 5.6.40 91PHP56_VERSION= 5.6.40
92PHP74_VERSION= 7.4.33 92PHP74_VERSION= 7.4.33
93PHP80_VERSION= 8.0.30 93PHP80_VERSION= 8.0.30
94PHP81_VERSION= 8.1.27 94PHP81_VERSION= 8.1.27
95PHP82_VERSION= 8.2.17 95PHP82_VERSION= 8.2.18
96PHP83_VERSION= 8.3.4 96PHP83_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.
99PHP56_RELDATE= 20140828 99PHP56_RELDATE= 20140828
100PHP74_RELDATE= 20191128 100PHP74_RELDATE= 20191128
101PHP80_RELDATE= 20201124 101PHP80_RELDATE= 20201124
102PHP81_RELDATE= 20211125 102PHP81_RELDATE= 20211125
103PHP82_RELDATE= 20220829 103PHP82_RELDATE= 20220829
104PHP83_RELDATE= 20231123 104PHP83_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
109_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 109_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
110 PKG_PHP_MAJOR_VERS 110 PKG_PHP_MAJOR_VERS
111 111
112.include "../../mk/bsd.prefs.mk" 112.include "../../mk/bsd.prefs.mk"
113 113
114PHP_VERSION_DEFAULT?= 82 114PHP_VERSION_DEFAULT?= 82
115PHP_VERSIONS_ACCEPTED?= 82 81 83 74 56 80 115PHP_VERSIONS_ACCEPTED?= 82 81 83 74 56 80
116.for pv in ${PHP_VERSIONS_ACCEPTED} 116.for pv in ${PHP_VERSIONS_ACCEPTED}
117. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv}) 117. if empty(PHP_VERSIONS_INCOMPATIBLE:M${pv})
118_PHP_VERSIONS_ACCEPTED+= ${pv} 118_PHP_VERSIONS_ACCEPTED+= ${pv}
119. endif 119. endif
120.endfor 120.endfor
121 121
122# transform the list into individual variables 122# transform the list into individual variables
123.for pv in ${_PHP_VERSIONS_ACCEPTED} 123.for pv in ${_PHP_VERSIONS_ACCEPTED}
124_PHP_VERSION_${pv}_OK= yes 124_PHP_VERSION_${pv}_OK= yes
125.endfor 125.endfor
126 126
127# check what is installed 127# check what is installed
128.if exists(${LOCALBASE}/lib/php/${PHP83_RELDATE}) 128.if exists(${LOCALBASE}/lib/php/${PHP83_RELDATE})
129_PHP_VERSION_83_INSTALLED= yes 129_PHP_VERSION_83_INSTALLED= yes
130_PHP_INSTALLED= yes 130_PHP_INSTALLED= yes
131.elif exists(${LOCALBASE}/lib/php/${PHP82_RELDATE}) 131.elif exists(${LOCALBASE}/lib/php/${PHP82_RELDATE})
132_PHP_VERSION_82_INSTALLED= yes 132_PHP_VERSION_82_INSTALLED= yes
133_PHP_INSTALLED= yes 133_PHP_INSTALLED= yes
134.elif exists(${LOCALBASE}/lib/php/${PHP81_RELDATE}) 134.elif exists(${LOCALBASE}/lib/php/${PHP81_RELDATE})
135_PHP_VERSION_81_INSTALLED= yes 135_PHP_VERSION_81_INSTALLED= yes
136_PHP_INSTALLED= yes 136_PHP_INSTALLED= yes
137.elif exists(${LOCALBASE}/lib/php/${PHP80_RELDATE}) 137.elif exists(${LOCALBASE}/lib/php/${PHP80_RELDATE})
138_PHP_VERSION_80_INSTALLED= yes 138_PHP_VERSION_80_INSTALLED= yes
139_PHP_INSTALLED= yes 139_PHP_INSTALLED= yes
140.elif exists(${LOCALBASE}/lib/php/${PHP74_RELDATE}) 140.elif exists(${LOCALBASE}/lib/php/${PHP74_RELDATE})
141_PHP_VERSION_74_INSTALLED= yes 141_PHP_VERSION_74_INSTALLED= yes
142_PHP_INSTALLED= yes 142_PHP_INSTALLED= yes
143.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE}) 143.elif exists(${LOCALBASE}/lib/php/${PHP56_RELDATE})
144_PHP_VERSION_56_INSTALLED= yes 144_PHP_VERSION_56_INSTALLED= yes
145_PHP_INSTALLED= yes 145_PHP_INSTALLED= yes
146.endif 146.endif
147 147
148# if a version is explicitly required, take it 148# if a version is explicitly required, take it
149.if defined(PHP_VERSION_REQD) 149.if defined(PHP_VERSION_REQD)
150_PHP_VERSION= ${PHP_VERSION_REQD} 150_PHP_VERSION= ${PHP_VERSION_REQD}
151.endif 151.endif
152# if the default is already installed, it is first choice 152# if the default is already installed, it is first choice
153.if !defined(_PHP_VERSION) 153.if !defined(_PHP_VERSION)
154.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 154.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
155.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED) 155.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_INSTALLED)
156_PHP_VERSION= ${PHP_VERSION_DEFAULT} 156_PHP_VERSION= ${PHP_VERSION_DEFAULT}
157.endif 157.endif
158.endif 158.endif
159.endif 159.endif
160# prefer an already installed version, in order of "accepted" 160# prefer an already installed version, in order of "accepted"
161.if !defined(_PHP_VERSION) 161.if !defined(_PHP_VERSION)
162.for pv in ${_PHP_VERSIONS_ACCEPTED} 162.for pv in ${_PHP_VERSIONS_ACCEPTED}
163.if defined(_PHP_VERSION_${pv}_INSTALLED) 163.if defined(_PHP_VERSION_${pv}_INSTALLED)
164_PHP_VERSION?= ${pv} 164_PHP_VERSION?= ${pv}
165.else 165.else
166# keep information as last resort - see below 166# keep information as last resort - see below
167_PHP_VERSION_FIRSTACCEPTED?= ${pv} 167_PHP_VERSION_FIRSTACCEPTED?= ${pv}
168.endif 168.endif
169.endfor 169.endfor
170.endif 170.endif
171# if the default is OK for the add-on pkg, take this 171# if the default is OK for the add-on pkg, take this
172.if !defined(_PHP_VERSION) 172.if !defined(_PHP_VERSION)
173.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK) 173.if defined(_PHP_VERSION_${PHP_VERSION_DEFAULT}_OK)
174_PHP_VERSION= ${PHP_VERSION_DEFAULT} 174_PHP_VERSION= ${PHP_VERSION_DEFAULT}
175.endif 175.endif
176.endif 176.endif
177# take the first one accepted by the package 177# take the first one accepted by the package
178.if !defined(_PHP_VERSION) 178.if !defined(_PHP_VERSION)
179_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED} 179_PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED}
180.endif 180.endif
181 181
182# 182#
183# Variable assignment for multi-PHP packages 183# Variable assignment for multi-PHP packages
184MULTI+= PHP_VERSION_REQD=${_PHP_VERSION} 184MULTI+= PHP_VERSION_REQD=${_PHP_VERSION}
185 185
186# export some of the internal variables 186# export some of the internal variables
187PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//} 187PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//}
188PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/} 188PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/}
189 189
190# Major version 190# Major version
191PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/} 191PKG_PHP_MAJOR_VERS:= ${_PHP_VERSION:C/^([0-9]).*/\1/}
192 192
193PHP_CHECK_INSTALLED?= Yes 193PHP_CHECK_INSTALLED?= Yes
194 194
195# if installed PHP isn't compatible with required PHP, bail out 195# if installed PHP isn't compatible with required PHP, bail out
196.if empty(PHP_CHECK_INSTALLED:M[nN][oO]) 196.if empty(PHP_CHECK_INSTALLED:M[nN][oO])
197.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED) 197.if defined(_PHP_INSTALLED) && !defined(_PHP_VERSION_${_PHP_VERSION}_INSTALLED)
198PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but a different version is installed" 198PKG_FAIL_REASON+= "Package accepts ${PKG_PHP}, but a different version is installed"
199.endif 199.endif
200.endif 200.endif
201 201
202MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 202MESSAGE_SUBST+= PKG_PHP_VERSION=${PKG_PHP_VERSION} \
203 PKG_PHP=${PKG_PHP} 203 PKG_PHP=${PKG_PHP}
204PLIST_SUBST+= PHP_PKG_PREFIX=${PHP_PKG_PREFIX} \ 204PLIST_SUBST+= PHP_PKG_PREFIX=${PHP_PKG_PREFIX} \
205 PKG_PHP_VERSION=${PKG_PHP_VERSION} \ 205 PKG_PHP_VERSION=${PKG_PHP_VERSION} \
206 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \ 206 PKG_PHP_MAJOR_VERS=${PKG_PHP_MAJOR_VERS} \
207 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} 207 PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
208 208
209# force the selected PHP version for recursive builds 209# force the selected PHP version for recursive builds
210PHP_VERSION_REQD:= ${PKG_PHP_VERSION} 210PHP_VERSION_REQD:= ${PKG_PHP_VERSION}
211 211
212# 212#
213# set variables for the version we decided to use: 213# set variables for the version we decided to use:
214# 214#
215.if ${_PHP_VERSION} == 56 215.if ${_PHP_VERSION} == 56
216PHP_VERSION= ${PHP56_VERSION} 216PHP_VERSION= ${PHP56_VERSION}
217PHP_INITIAL_TEENY= 3 217PHP_INITIAL_TEENY= 3
218PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE} 218PHP_EXTENSION_DIR= lib/php/${PHP56_RELDATE}
219.elif ${_PHP_VERSION} == 74 219.elif ${_PHP_VERSION} == 74
220PHP_VERSION= ${PHP74_VERSION} 220PHP_VERSION= ${PHP74_VERSION}
221PHP_EXTENSION_DIR= lib/php/${PHP74_RELDATE} 221PHP_EXTENSION_DIR= lib/php/${PHP74_RELDATE}
222.elif ${_PHP_VERSION} == 80 222.elif ${_PHP_VERSION} == 80
223PHP_VERSION= ${PHP80_VERSION} 223PHP_VERSION= ${PHP80_VERSION}
224PHP_EXTENSION_DIR= lib/php/${PHP80_RELDATE} 224PHP_EXTENSION_DIR= lib/php/${PHP80_RELDATE}
225.elif ${_PHP_VERSION} == 81 225.elif ${_PHP_VERSION} == 81
226PHP_VERSION= ${PHP81_VERSION} 226PHP_VERSION= ${PHP81_VERSION}
227PHP_EXTENSION_DIR= lib/php/${PHP81_RELDATE} 227PHP_EXTENSION_DIR= lib/php/${PHP81_RELDATE}
228.elif ${_PHP_VERSION} == 82 228.elif ${_PHP_VERSION} == 82
229PHP_VERSION= ${PHP82_VERSION} 229PHP_VERSION= ${PHP82_VERSION}
230PHP_EXTENSION_DIR= lib/php/${PHP82_RELDATE} 230PHP_EXTENSION_DIR= lib/php/${PHP82_RELDATE}
231.elif ${_PHP_VERSION} == 83 231.elif ${_PHP_VERSION} == 83
232PHP_VERSION= ${PHP83_VERSION} 232PHP_VERSION= ${PHP83_VERSION}
233PHP_EXTENSION_DIR= lib/php/${PHP83_RELDATE} 233PHP_EXTENSION_DIR= lib/php/${PHP83_RELDATE}
234.else 234.else
235# force an error 235# force an error
236PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package" 236PKG_FAIL_REASON+= "${PKG_PHP} is not a valid package"
237.endif 237.endif
238 238
239PHP_INITIAL_TEENY?= 0 239PHP_INITIAL_TEENY?= 0
240PHPPKGSRCDIR= ../../lang/php${PKG_PHP_VERSION} 240PHPPKGSRCDIR= ../../lang/php${PKG_PHP_VERSION}
241PHP_PKG_PREFIX= php${PKG_PHP_VERSION} 241PHP_PKG_PREFIX= php${PKG_PHP_VERSION}
242 242
243_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} 243_PHP_VER_MAJOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
244_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} 244_PHP_VER_MINOR= ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
245 245
246PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY} 246PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY}
247 247
248# 248#
249# check installed version against required: 249# check installed version against required:
250# 250#
251.if !empty(PHP_CHECK_INSTALLED:M[nN][oO]) 251.if !empty(PHP_CHECK_INSTALLED:M[nN][oO])
252.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED} 252.if defined(_PHP_VERSION_INSTALLED) && ${_PHP_VERSION} != ${_PHP_VERSION_INSTALLED}
253PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed." 253PKG_FAIL_REASON+= "${PKGBASE} requires ${PKG_PHP}, but php-${_PHP_VERSION_INSTALLED} is already installed."
254.endif 254.endif
255.endif 255.endif
256 256
257MAKEFLAGS+= PHP_VERSION_REQD=${PHP_VERSION_REQD} 257MAKEFLAGS+= PHP_VERSION_REQD=${PHP_VERSION_REQD}
258 258
259.endif # PHPVERSION_MK 259.endif # PHPVERSION_MK
cvs diff -r1.19 -r1.20 pkgsrc/lang/php82/distinfo (switch to unified diff)

--- pkgsrc/lang/php82/distinfo 2024/03/17 16:46:05 1.19
+++ pkgsrc/lang/php82/distinfo 2024/04/13 02:49:41 1.20
@@ -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.20 2024/04/13 02:49:41 taca Exp $
2 2
3BLAKE2s (php-8.2.17.tar.xz) = 8aa7f3dd3e671ce1aadf71668e71a5edc3ab95fab0a1d6cdb19744f5d30d30da 3BLAKE2s (php-8.2.18.tar.xz) = 6571715c96a8064a61bd868f483f27a85ce0594cb540cd7c28a226abe1eb29c0
4SHA512 (php-8.2.17.tar.xz) = 113cd8c6a481770aba7e21f1bc22500c93dfa41ff85a7b54e1abbfd5b5a32f51501c91eb45c29a5e2d8ec5f61861060c193a96e27224c97f8cad7979f378bde8 4SHA512 (php-8.2.18.tar.xz) = 8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f
5Size (php-8.2.17.tar.xz) = 12092404 bytes 5Size (php-8.2.18.tar.xz) = 12089400 bytes
6SHA1 (patch-configure) = c80956e91c562a1035ba8ae93403f762e149ae47 6SHA1 (patch-configure) = 80256ba9788c66d960954516394620c9f789d744
7SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b 7SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b
8SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd 8SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
9SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640 9SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640
10SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7 10SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
11SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd 11SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd
12SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483 12SHA1 (patch-main_streams_streams.c) = d699ce7d3a300ffb39494b3f1fa5e0958f714483
13SHA1 (patch-php.ini-development) = 373d76cc7a022b578f1d5e296d1f0ac88bc26b72 13SHA1 (patch-php.ini-development) = 373d76cc7a022b578f1d5e296d1f0ac88bc26b72
14SHA1 (patch-php.ini-production) = 5ab7fa6bf8403907160b0a62b56c1ee527f8eda6 14SHA1 (patch-php.ini-production) = 5ab7fa6bf8403907160b0a62b56c1ee527f8eda6
15SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8 15SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
16SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 16SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
17SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0 17SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0
cvs diff -r1.17 -r1.18 pkgsrc/lang/php82/patches/patch-configure (switch to unified diff)

--- pkgsrc/lang/php82/patches/patch-configure 2024/03/17 16:46:05 1.17
+++ pkgsrc/lang/php82/patches/patch-configure 2024/04/13 02:49:41 1.18
@@ -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.18 2024/04/13 02:49:41 taca 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