Thu Sep 23 15:48:37 2021 UTC ()
lang/php80: update to 8.0.11

* pkgsrc change: fix PLIST problem when php-embed PKG_OPTIONS is enabled.
* This release conintas security fix for CVE-2021-21706.

23 Sep 2021, PHP 8.0.11

- Core:
  . Fixed bug #81302 (Stream position after stream filter removed). (cmb)
  . Fixed bug #81346 (Non-seekable streams don't update position after write).
    (cmb)
  . Fixed bug #73122 (Integer Overflow when concatenating strings). (cmb)

-GD:
  . Fixed bug #53580 (During resize gdImageCopyResampled cause colors change).
    (cmb)

- Opcache:
  . Fixed bug #81353 (segfault with preloading and statically bound closure).
    (Nikita)

- Shmop:
  . Fixed bug #81407 (shmop_open won't attach and causes php to crash). (cmb)

- Standard:
  . Fixed bug #71542 (disk_total_space does not work with relative paths). (cmb)
  . Fixed bug #81400 (Unterminated string in dns_get_record() results). (cmb)

- SysVMsg:
  . Fixed bug #78819 (Heap Overflow in msg_send). (cmb)

- XML:
  . Fixed bug #81351 (xml_parse may fail, but has no error code). (cmb, Nikita)

- Zip:
  . Fixed bug #80833 (ZipArchive::getStream doesn't use setPassword). (Remi)
  . Fixed bug #81420 (ZipArchive::extractTo extracts outside of destination).
    (cmb)


(taca)
diff -r1.339 -r1.340 pkgsrc/lang/php/phpversion.mk
diff -r1.1 -r1.2 pkgsrc/lang/php80/PLIST
diff -r1.1 -r1.2 pkgsrc/lang/php80/options.mk
diff -r1.7 -r1.8 pkgsrc/lang/php80/distinfo
cvs diff -r1.339 -r1.340 pkgsrc/lang/php/phpversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/php/phpversion.mk 2021/09/23 14:11:48 1.339
+++ pkgsrc/lang/php/phpversion.mk 2021/09/23 15:48:37 1.340
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: phpversion.mk,v 1.339 2021/09/23 14:11:48 taca Exp $ 1# $NetBSD: phpversion.mk,v 1.340 2021/09/23 15:48:37 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 73 74 80 13# Possible: 56 73 74 80
14# Default: 74 14# Default: 74
@@ -80,27 +80,27 @@ @@ -80,27 +80,27 @@
80# 80#
81# Example: lib/php/20181200 81# Example: lib/php/20181200
82# 82#
83# Keywords: php 83# Keywords: php
84# 84#
85 85
86.if !defined(PHPVERSION_MK) 86.if !defined(PHPVERSION_MK)
87PHPVERSION_MK= defined 87PHPVERSION_MK= defined
88 88
89# Define each PHP's version. 89# Define each PHP's version.
90PHP56_VERSION= 5.6.40 90PHP56_VERSION= 5.6.40
91PHP73_VERSION= 7.3.31 91PHP73_VERSION= 7.3.31
92PHP74_VERSION= 7.4.23 92PHP74_VERSION= 7.4.23
93PHP80_VERSION= 8.0.10 93PHP80_VERSION= 8.0.11
94 94
95# Define initial release of major version. 95# Define initial release of major version.
96PHP56_RELDATE= 20140828 96PHP56_RELDATE= 20140828
97PHP73_RELDATE= 20181200 97PHP73_RELDATE= 20181200
98PHP74_RELDATE= 20191128 98PHP74_RELDATE= 20191128
99PHP80_RELDATE= 20201124 99PHP80_RELDATE= 20201124
100 100
101_VARGROUPS+= php 101_VARGROUPS+= php
102_USER_VARS.php= PHP_VERSION_DEFAULT 102_USER_VARS.php= PHP_VERSION_DEFAULT
103_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD 103_PKG_VARS.php= PHP_VERSIONS_ACCEPTED PHP_VERSION_REQD
104_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \ 104_SYS_VARS.php= PKG_PHP_VERSION PKG_PHP PHPPKGSRCDIR PHP_PKG_PREFIX \
105 PKG_PHP_MAJOR_VERS 105 PKG_PHP_MAJOR_VERS
106 106
cvs diff -r1.1 -r1.2 pkgsrc/lang/php80/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/php80/PLIST 2021/03/07 13:41:36 1.1
+++ pkgsrc/lang/php80/PLIST 2021/09/23 15:48:37 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2021/03/07 13:41:36 taca Exp $ 1@comment $NetBSD: PLIST,v 1.2 2021/09/23 15:48:37 taca Exp $
2bin/phar 2bin/phar
3bin/phar.phar 3bin/phar.phar
4bin/php 4bin/php
5bin/php-config 5bin/php-config
6bin/phpdbg 6bin/phpdbg
7bin/phpize 7bin/phpize
8include/php/TSRM/TSRM.h 8include/php/TSRM/TSRM.h
9include/php/TSRM/tsrm_win32.h 9include/php/TSRM/tsrm_win32.h
10include/php/Zend/zend.h 10include/php/Zend/zend.h
11include/php/Zend/zend_API.h 11include/php/Zend/zend_API.h
12include/php/Zend/zend_alloc.h 12include/php/Zend/zend_alloc.h
13include/php/Zend/zend_alloc_sizes.h 13include/php/Zend/zend_alloc_sizes.h
14include/php/Zend/zend_arena.h 14include/php/Zend/zend_arena.h
@@ -259,27 +259,27 @@ include/php/main/php_version.h @@ -259,27 +259,27 @@ include/php/main/php_version.h
259include/php/main/rfc1867.h 259include/php/main/rfc1867.h
260include/php/main/snprintf.h 260include/php/main/snprintf.h
261include/php/main/spprintf.h 261include/php/main/spprintf.h
262include/php/main/streams/php_stream_context.h 262include/php/main/streams/php_stream_context.h
263include/php/main/streams/php_stream_filter_api.h 263include/php/main/streams/php_stream_filter_api.h
264include/php/main/streams/php_stream_glob_wrapper.h 264include/php/main/streams/php_stream_glob_wrapper.h
265include/php/main/streams/php_stream_mmap.h 265include/php/main/streams/php_stream_mmap.h
266include/php/main/streams/php_stream_plain_wrapper.h 266include/php/main/streams/php_stream_plain_wrapper.h
267include/php/main/streams/php_stream_transport.h 267include/php/main/streams/php_stream_transport.h
268include/php/main/streams/php_stream_userspace.h 268include/php/main/streams/php_stream_userspace.h
269include/php/main/streams/php_streams_int.h 269include/php/main/streams/php_streams_int.h
270include/php/sapi/cli/cli.h 270include/php/sapi/cli/cli.h
271${PLIST.embed}include/php/sapi/embed/php_embed.h 271${PLIST.embed}include/php/sapi/embed/php_embed.h
272${PLIST.embed}lib/libphp7.so 272${PLIST.embed}lib/libphp.so
273lib/php/build/Makefile.global 273lib/php/build/Makefile.global
274lib/php/build/ax_check_compile_flag.m4 274lib/php/build/ax_check_compile_flag.m4
275lib/php/build/ax_gcc_func_attribute.m4 275lib/php/build/ax_gcc_func_attribute.m4
276lib/php/build/config.guess 276lib/php/build/config.guess
277lib/php/build/config.sub 277lib/php/build/config.sub
278lib/php/build/gen_stub.php 278lib/php/build/gen_stub.php
279lib/php/build/libtool.m4 279lib/php/build/libtool.m4
280lib/php/build/ltmain.sh 280lib/php/build/ltmain.sh
281lib/php/build/php.m4 281lib/php/build/php.m4
282lib/php/build/php_cxx_compile_stdcxx.m4 282lib/php/build/php_cxx_compile_stdcxx.m4
283lib/php/build/phpize.m4 283lib/php/build/phpize.m4
284lib/php/build/pkg.m4 284lib/php/build/pkg.m4
285lib/php/build/run-tests.php 285lib/php/build/run-tests.php
cvs diff -r1.1 -r1.2 pkgsrc/lang/php80/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/php80/options.mk 2021/03/07 13:41:36 1.1
+++ pkgsrc/lang/php80/options.mk 2021/09/23 15:48:37 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.1 2021/03/07 13:41:36 taca Exp $ 1# $NetBSD: options.mk,v 1.2 2021/09/23 15:48:37 taca Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 3PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
4PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed 4PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed
5PKG_SUPPORTED_OPTIONS+= disable-filter-url 5PKG_SUPPORTED_OPTIONS+= disable-filter-url
6PKG_SUGGESTED_OPTIONS+= inet6 ssl readline 6PKG_SUGGESTED_OPTIONS+= inet6 ssl readline
7 7
8.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" 8.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
9PKG_SUPPORTED_OPTIONS+= dtrace 9PKG_SUPPORTED_OPTIONS+= dtrace
10.endif 10.endif
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14.if !empty(PKG_OPTIONS:Minet6) 14.if !empty(PKG_OPTIONS:Minet6)
@@ -59,16 +59,16 @@ CFLAGS+= -DDISABLE_FILTER_URL @@ -59,16 +59,16 @@ CFLAGS+= -DDISABLE_FILTER_URL
59 59
60PLIST_VARS+= embed 60PLIST_VARS+= embed
61 61
62.if !empty(PKGNAME:Mphp-[7-9]*) 62.if !empty(PKGNAME:Mphp-[7-9]*)
63.if !empty(PKG_OPTIONS:Mphp-embed) 63.if !empty(PKG_OPTIONS:Mphp-embed)
64CONFIGURE_ARGS+= --enable-embed 64CONFIGURE_ARGS+= --enable-embed
65INSTALLATION_DIRS+= include/php/sapi/embed 65INSTALLATION_DIRS+= include/php/sapi/embed
66PLIST.embed= yes 66PLIST.embed= yes
67 67
68.PHONY: post-install-embed 68.PHONY: post-install-embed
69post-install: post-install-embed 69post-install: post-install-embed
70post-install-embed: 70post-install-embed:
71 ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/include/php/sapi/embed/ 71 ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/include/php/sapi/embed/
72 ${INSTALL_LIB} ${WRKSRC}/libs/libphp7.so ${DESTDIR}${PREFIX}/lib/ 72 ${INSTALL_LIB} ${WRKSRC}/libs/libphp.so ${DESTDIR}${PREFIX}/lib/
73.endif 73.endif
74.endif 74.endif
cvs diff -r1.7 -r1.8 pkgsrc/lang/php80/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php80/distinfo 2021/08/28 06:24:05 1.7
+++ pkgsrc/lang/php80/distinfo 2021/09/23 15:48:37 1.8
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.7 2021/08/28 06:24:05 taca Exp $ 1$NetBSD: distinfo,v 1.8 2021/09/23 15:48:37 taca Exp $
2 2
3SHA1 (php-8.0.10.tar.xz) = 2a8b7efaaa8e2a34473597575182a8366f7f9ec5 3SHA1 (php-8.0.11.tar.xz) = a69e003e68abe2a511fa7632f1cfa017f32be34d
4RMD160 (php-8.0.10.tar.xz) = 8eb73de80c5db052a7a5895a81a0c2a46ba3ae0b 4RMD160 (php-8.0.11.tar.xz) = 291d6e4d7e331bb43f570ef053b4fb484ff40c3c
5SHA512 (php-8.0.10.tar.xz) = 25f23822a45eab837645a0259c7dbb999766506de35c1bba53e928e2b5935ba70278b931d5085966178e08013ec69407fc68eb041b3ae2e619b81f20ec8ce736 5SHA512 (php-8.0.11.tar.xz) = 2d346959b2691ea0d5334dc9cad225b7a65ec53d6a6493f3b95c4819a0c088bec36aa1bf4ab3c8044a631bcfefb689d85463ff2259d42000e65dac30badcc59d
6Size (php-8.0.10.tar.xz) = 10703088 bytes 6Size (php-8.0.11.tar.xz) = 10804388 bytes
7SHA1 (patch-build_libtool.m4) = e58a2bcebe9e9d7dc7255354fd9fe57878e3f8a6 7SHA1 (patch-build_libtool.m4) = e58a2bcebe9e9d7dc7255354fd9fe57878e3f8a6
8SHA1 (patch-configure) = 6c3d2537eb4d1c2ed05e8e1e411701d316c67d8b 8SHA1 (patch-configure) = 6c3d2537eb4d1c2ed05e8e1e411701d316c67d8b
9SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640 9SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
10SHA1 (patch-ext_enchant_enchant.c) = 74e0ec62928c84998ea41863088203f2511911fd 10SHA1 (patch-ext_enchant_enchant.c) = 74e0ec62928c84998ea41863088203f2511911fd
11SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd 11SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
12SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7 12SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
13SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd 13SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd
14SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462 14SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462
15SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d 15SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d
16SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8 16SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
17SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 17SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
18SHA1 (patch-sapi_fpm_fpm_events_port.c) = 30ecee10f6d34b7422972e1e275b4f73c7fd964d 18SHA1 (patch-sapi_fpm_fpm_events_port.c) = 30ecee10f6d34b7422972e1e275b4f73c7fd964d
19SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0 19SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0