<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/faca54ee617b7cf77bdb165e05e26d15df14c62e">https://github.com/macports/macports-ports/commit/faca54ee617b7cf77bdb165e05e26d15df14c62e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit faca54ee617b7cf77bdb165e05e26d15df14c62e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Mar 17 01:00:33 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> php82: Update to 8.2.4
</span>---
lang/php/Portfile | 81 +++++++++++-----------
.../files/patch-php82-ext-hash-static_assert.diff | 20 ------
2 files changed, 40 insertions(+), 61 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 9230f5b7952..06a3df2f958 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;'>@@ -178,11 +178,11 @@ switch ${subport_branch} {
</span> }
8.2 {
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.2.4
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 bff25f969c4d2da3f9611a066ffa530551440bac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12038240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e16337ed30eb0ee3ce0fbe12f1f0b7b2f1f0d681 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bc7bf4ca7ed0dd17647e3ea870b6f062fcb56b243bfdef3f59ff7f94e96176a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11991796
</span> }
8.3 {
# When this becomes a stable version, remove the overrides for homepage,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,7 +261,6 @@ if {[is_sapi_subport]} {
</span>
if {[vercmp ${branch} >= 8.2]} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-${php}-ext-hash-static_assert.diff \
</span> patch-${php}-atomic.diff
}
if {[vercmp ${branch} 7.0] >= 0 && [vercmp ${branch} 7.2] <= 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -437,7 +436,7 @@ subport ${php} {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,7 +596,7 @@ subport ${php}-apache2handler {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -664,7 +663,7 @@ subport ${php}-cgi {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -707,7 +706,7 @@ subport ${php}-fpm {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -779,7 +778,7 @@ subport ${php}-calendar {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -802,7 +801,7 @@ subport ${php}-curl {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -841,7 +840,7 @@ subport ${php}-dba {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -876,7 +875,7 @@ subport ${php}-enchant {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -928,7 +927,7 @@ subport ${php}-exif {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -944,7 +943,7 @@ subport ${php}-ffi {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -975,7 +974,7 @@ subport ${php}-ftp {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1012,7 +1011,7 @@ subport ${php}-gd {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1077,7 +1076,7 @@ subport ${php}-gettext {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1106,7 +1105,7 @@ subport ${php}-gmp {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1140,7 +1139,7 @@ subport ${php}-iconv {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1169,7 +1168,7 @@ subport ${php}-imap {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1209,7 +1208,7 @@ subport ${php}-intl {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1271,7 +1270,7 @@ subport ${php}-ipc {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1296,7 +1295,7 @@ subport ${php}-ldap {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1335,7 +1334,7 @@ subport ${php}-mbstring {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1425,7 +1424,7 @@ subport ${php}-mysql {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1620,7 +1619,7 @@ subport ${php}-odbc {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1683,7 +1682,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1738,7 +1737,7 @@ subport ${php}-openssl {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1794,7 +1793,7 @@ subport ${php}-oracle {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1835,7 +1834,7 @@ subport ${php}-pcntl {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1867,7 +1866,7 @@ subport ${php}-posix {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1893,7 +1892,7 @@ subport ${php}-postgresql {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2038,7 +2037,7 @@ subport ${php}-pspell {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2067,7 +2066,7 @@ subport ${php}-snmp {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2096,7 +2095,7 @@ subport ${php}-soap {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2128,7 +2127,7 @@ subport ${php}-sockets {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2147,7 +2146,7 @@ subport ${php}-sodium {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2185,7 +2184,7 @@ subport ${php}-sqlite {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2236,7 +2235,7 @@ subport ${php}-tidy {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2340,7 +2339,7 @@ subport ${php}-xsl {
</span> 7.4.33 {revision 0}
8.0.28 {revision 0}
8.1.17 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.3 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.4 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-ext-hash-static_assert.diff b/lang/php/files/patch-php82-ext-hash-static_assert.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 18214871a1b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php82-ext-hash-static_assert.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-No longer depend on `<assert.h>` for XXH_STATIC_ASSERT since some
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-versions are buggy.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use `_Static_assert` instead, which is part of the C11 language.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/Cyan4973/xxHash/issues/671
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/issues/10659
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ext/hash/xxhash/xxhash.h.orig 2021-11-29 12:34:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ext/hash/xxhash/xxhash.h 2021-12-28 19:55:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1546,8 +1546,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* note: use after variable declarations */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef XXH_STATIC_ASSERT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # else
</span></pre><pre style='margin:0'>
</pre>