<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b7f869fad979006cbd3bebd9767921cf8cde81f3">https://github.com/macports/macports-ports/commit/b7f869fad979006cbd3bebd9767921cf8cde81f3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b7f869fad979006cbd3bebd9767921cf8cde81f3
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 18 16:39:10 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> php83: Update to 8.3.0beta3
</span>---
lang/php/Portfile | 82 +++++++++++++++++-----------------
lang/php/files/patch-php83-atomic.diff | 7 ++-
2 files changed, 47 insertions(+), 42 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 33d7a62934f..3a257a34f85 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;'>@@ -189,13 +189,13 @@ switch ${subport_branch} {
</span> # master_sites and livecheck, and update php.latest_stable_branch in the
# php-1.1 portgroup.
epoch 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.3.0beta2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.3.0beta3
</span> homepage https://qa.php.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://downloads.php.net/~jakub/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://downloads.php.net/~eric/
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b53d7e110f778a00708fcb4cc51a7313ecff94d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 343d4e96648cb41c5313fd2a7e0cb70b3fe0174f1e233c9d5365bf78a839f304 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12358628
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 1aa1d5b76a6f99a913e642f2c242b17dd8e2adc3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5d6dedf413ac045bd38585c5eba7da565f15c8c2c507e3a2ee1e39bd652613a6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12379580
</span> livecheck.url ${homepage}
livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -437,7 +437,7 @@ subport ${php} {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -598,7 +598,7 @@ subport ${php}-apache2handler {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,7 +666,7 @@ subport ${php}-cgi {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -710,7 +710,7 @@ subport ${php}-fpm {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -783,7 +783,7 @@ subport ${php}-calendar {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -807,7 +807,7 @@ subport ${php}-curl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -847,7 +847,7 @@ subport ${php}-dba {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -883,7 +883,7 @@ subport ${php}-enchant {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -936,7 +936,7 @@ subport ${php}-exif {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -953,7 +953,7 @@ subport ${php}-ffi {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -985,7 +985,7 @@ subport ${php}-ftp {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1023,7 +1023,7 @@ subport ${php}-gd {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1089,7 +1089,7 @@ subport ${php}-gettext {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1119,7 +1119,7 @@ subport ${php}-gmp {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1154,7 +1154,7 @@ subport ${php}-iconv {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1184,7 +1184,7 @@ subport ${php}-imap {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1225,7 +1225,7 @@ subport ${php}-intl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1288,7 +1288,7 @@ subport ${php}-ipc {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1314,7 +1314,7 @@ subport ${php}-ldap {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1354,7 +1354,7 @@ subport ${php}-mbstring {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1445,7 +1445,7 @@ subport ${php}-mysql {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1641,7 +1641,7 @@ subport ${php}-odbc {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1705,7 +1705,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1761,7 +1761,7 @@ subport ${php}-openssl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1818,7 +1818,7 @@ subport ${php}-oracle {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1860,7 +1860,7 @@ subport ${php}-pcntl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1893,7 +1893,7 @@ subport ${php}-posix {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1920,7 +1920,7 @@ subport ${php}-postgresql {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2066,7 +2066,7 @@ subport ${php}-pspell {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2096,7 +2096,7 @@ subport ${php}-snmp {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2126,7 +2126,7 @@ subport ${php}-soap {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2159,7 +2159,7 @@ subport ${php}-sockets {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2179,7 +2179,7 @@ subport ${php}-sodium {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2218,7 +2218,7 @@ subport ${php}-sqlite {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2270,7 +2270,7 @@ subport ${php}-tidy {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2375,7 +2375,7 @@ subport ${php}-xsl {
</span> 8.0.30 {revision 0}
8.1.22 {revision 0}
8.2.9 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.3.0beta2 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0beta3 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-atomic.diff b/lang/php/files/patch-php83-atomic.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 781cc717915..d38df9d75c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php83-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php83-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://github.com/php/php-src/issues/8881
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: address argument to atomic operation must be a pointer to non-const _Atomic type ('const _Atomic(bool) *' invalid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/8881
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/11931
</span> --- a/Zend/zend_atomic.h.orig 2023-08-01 06:07:11.000000000 -0500
+++ b/Zend/zend_atomic.h 2023-08-08 23:24:02.000000000 -0500
@@ -23,8 +23,8 @@
</pre><pre style='margin:0'>
</pre>