<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1fe718881dee73565cef2108535e28f8703296ba">https://github.com/macports/macports-ports/commit/1fe718881dee73565cef2108535e28f8703296ba</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1fe718881dee73565cef2108535e28f8703296ba
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 26 12:19:21 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> php83: Update to 8.3.2
</span>---
lang/php/Portfile | 84 +++++++++++++---------------
lang/php/files/patch-php83-zend_strnlen.diff | 14 -----
2 files changed, 40 insertions(+), 58 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6aee2c08d0f..f5ec19785b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,11 +186,11 @@ switch ${subport_branch} {
</span> }
8.3 {
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.3.2
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 111e6743cecedf24451d65fa963eb1dca32bcd91 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 56445b1771b2ba5b7573453f9e8a9451e2d810b1741a352fa05259733b1e9758 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12444232
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1c2e72daf36f269cb8835a5b0223cc1e43964e6c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4ffa3e44afc9c590e28dc0d2d31fc61f0139f8b335f11880a121b9f9b9f0634e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12440200
</span> }
8.4 {
# When this becomes a stable version, remove the overrides for homepage,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -449,7 +449,7 @@ subport ${php} {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -477,10 +477,6 @@ subport ${php} {
</span> patchfiles-append patch-${php}-icu-71.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} == 8.3]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-${php}-zend_strnlen.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[vercmp ${branch} < 8.0]} {
post-patch {
# Ensure the build date is the same for all universal archs.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -614,7 +610,7 @@ subport ${php}-apache2handler {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -678,7 +674,7 @@ subport ${php}-cgi {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -722,7 +718,7 @@ subport ${php}-fpm {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -795,7 +791,7 @@ subport ${php}-calendar {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -819,7 +815,7 @@ subport ${php}-curl {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -859,7 +855,7 @@ subport ${php}-dba {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -895,7 +891,7 @@ subport ${php}-enchant {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -948,7 +944,7 @@ subport ${php}-exif {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -965,7 +961,7 @@ subport ${php}-ffi {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -997,7 +993,7 @@ subport ${php}-ftp {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1035,7 +1031,7 @@ subport ${php}-gd {
</span> 8.0.30 {revision 0}
8.1.27 {revision 1}
8.2.14 {revision 1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1109,7 +1105,7 @@ subport ${php}-gettext {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1139,7 +1135,7 @@ subport ${php}-gmp {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1174,7 +1170,7 @@ subport ${php}-iconv {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1204,7 +1200,7 @@ subport ${php}-imap {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1245,7 +1241,7 @@ subport ${php}-intl {
</span> 8.0.30 {revision 1}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1308,7 +1304,7 @@ subport ${php}-ipc {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1334,7 +1330,7 @@ subport ${php}-ldap {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1374,7 +1370,7 @@ subport ${php}-mbstring {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1465,7 +1461,7 @@ subport ${php}-mysql {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1661,7 +1657,7 @@ subport ${php}-odbc {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1725,7 +1721,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1781,7 +1777,7 @@ subport ${php}-openssl {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1838,7 +1834,7 @@ subport ${php}-oracle {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1880,7 +1876,7 @@ subport ${php}-pcntl {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1913,7 +1909,7 @@ subport ${php}-posix {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1940,7 +1936,7 @@ subport ${php}-postgresql {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2086,7 +2082,7 @@ subport ${php}-pspell {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2116,7 +2112,7 @@ subport ${php}-snmp {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2146,7 +2142,7 @@ subport ${php}-soap {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2179,7 +2175,7 @@ subport ${php}-sockets {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2199,7 +2195,7 @@ subport ${php}-sodium {
</span> 8.0.30 {revision 1}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2238,7 +2234,7 @@ subport ${php}-sqlite {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2290,7 +2286,7 @@ subport ${php}-tidy {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2395,7 +2391,7 @@ subport ${php}-xsl {
</span> 8.0.30 {revision 0}
8.1.27 {revision 0}
8.2.14 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.1 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.2 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-zend_strnlen.diff b/lang/php/files/patch-php83-zend_strnlen.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 42321c32950..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php83-zend_strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-zend_strnlen build fix when platform misses strnlen support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/issues/12999
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/commit/a2068ef47b9aad8cd5c52cd11d0c0a65c3b13662
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Zend/zend_operators.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Zend/zend_operators.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -269,7 +269,7 @@ static zend_always_inline size_t zend_strnlen(const char* s, size_t maxlen)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(HAVE_STRNLEN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return strnlen(s, maxlen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const char *p = memchr(s, '\0', maxlen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *p = (const char *)memchr(s, '\0', maxlen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p ? p-s : maxlen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>