<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/7e8bac398e39c0dab1bc13f7c843a189b4adcd70">https://github.com/macports/macports-ports/commit/7e8bac398e39c0dab1bc13f7c843a189b4adcd70</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7e8bac398e39c0dab1bc13f7c843a189b4adcd70
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Sep 3 03:28:33 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> php82: Update to 8.2.23
</span>---
lang/php/Portfile | 84 +++++++++++-----------
...php82-conditional-Wno-implicit-fallthrough.diff | 45 ------------
lang/php/files/patch-php82-opcache.diff | 23 ------
3 files changed, 42 insertions(+), 110 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 bfe5f41db75..85ceb2c1fd8 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.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.2.23
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 70e0935aea3b850130e15366e7340550015798dd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8566229bc88ad1f4aadc10700ab5fbcec81587c748999d985f11cf3b745462df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12099476
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 444390cf855e2be0a294f2348906c28e82cccadf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 81c5ae6ba44e262a076349ee54a2e468638a4571085d80bff37f6fd308e1d8d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12118028
</span> }
8.3 {
epoch 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,7 +278,7 @@ if {[is_sapi_subport]} {
</span> patch-${php}-libxml2-2.12.diff
}
if {[vercmp ${branch} >= 8.0]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} < 8.3]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} < 8.2]} {
</span> patchfiles-append \
patch-${php}-conditional-Wno-implicit-fallthrough.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -471,7 +471,7 @@ subport ${php} {
</span> 7.4.33 {revision 1}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -633,7 +633,7 @@ subport ${php}-apache2handler {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -698,7 +698,7 @@ subport ${php}-cgi {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -743,7 +743,7 @@ subport ${php}-fpm {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -817,7 +817,7 @@ subport ${php}-calendar {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -842,7 +842,7 @@ subport ${php}-curl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -883,7 +883,7 @@ subport ${php}-dba {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -920,7 +920,7 @@ subport ${php}-enchant {
</span> 7.4.33 {revision 0}
8.0.30 {revision 1}
8.1.29 {revision 1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -976,7 +976,7 @@ subport ${php}-exif {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -994,7 +994,7 @@ subport ${php}-ffi {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1027,7 +1027,7 @@ subport ${php}-ftp {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1066,7 +1066,7 @@ subport ${php}-gd {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1141,7 +1141,7 @@ subport ${php}-gettext {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1172,7 +1172,7 @@ subport ${php}-gmp {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1208,7 +1208,7 @@ subport ${php}-iconv {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1240,7 +1240,7 @@ subport ${php}-imap {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1283,7 +1283,7 @@ subport ${php}-intl {
</span> 7.4.33 {revision 2}
8.0.30 {revision 1}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1347,7 +1347,7 @@ subport ${php}-ipc {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1374,7 +1374,7 @@ subport ${php}-ldap {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1415,7 +1415,7 @@ subport ${php}-mbstring {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1507,7 +1507,7 @@ subport ${php}-mysql {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1740,7 +1740,7 @@ subport ${php}-odbc {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1805,7 +1805,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1838,7 +1838,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> legacysupport.newest_darwin_requires_legacy 15
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} >= 8.1] && [vercmp ${branch} < 8.3]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} == 8.1]} {
</span> patchfiles-append patch-${php}-opcache.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1866,7 +1866,7 @@ subport ${php}-openssl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1925,7 +1925,7 @@ subport ${php}-oracle {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1969,7 +1969,7 @@ subport ${php}-pcntl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2003,7 +2003,7 @@ subport ${php}-posix {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2031,7 +2031,7 @@ subport ${php}-postgresql {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2095,7 +2095,7 @@ subport ${php}-pspell {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2127,7 +2127,7 @@ subport ${php}-snmp {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2158,7 +2158,7 @@ subport ${php}-soap {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2197,7 +2197,7 @@ subport ${php}-sockets {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2218,7 +2218,7 @@ subport ${php}-sodium {
</span> 7.4.33 {revision 1}
8.0.30 {revision 1}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2258,7 +2258,7 @@ subport ${php}-sqlite {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2311,7 +2311,7 @@ subport ${php}-tidy {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2417,7 +2417,7 @@ subport ${php}-xsl {
</span> 7.4.33 {revision 0}
8.0.30 {revision 0}
8.1.29 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.2.22 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2.23 {revision 0}
</span> 8.3.11 {revision 0}
8.4.0beta4 {revision 0}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-conditional-Wno-implicit-fallthrough.diff b/lang/php/files/patch-php82-conditional-Wno-implicit-fallthrough.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a68b172d987..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php82-conditional-Wno-implicit-fallthrough.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,45 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ext/date/config0.m4 2024-04-09 13:46:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ext/date/config0.m4 2024-04-16 06:34:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Check for strtoll, atoll
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNCS(strtoll atoll)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ext/hash/config.m4 2024-04-09 13:46:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ext/hash/config.m4 2024-04-16 06:34:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,8 +28,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Add -Wno-implicit-fallthrough flag as it happens on 32 bit builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PHP_HASH_CFLAGS="-Wno-implicit-fallthrough -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ext/pcre/config0.m4 2024-04-09 13:46:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ext/pcre/config0.m4 2024-04-16 06:34:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +66,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c pcre2lib/pcre2_substring.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-opcache.diff b/lang/php/files/patch-php82-opcache.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cae911de4ef..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php82-opcache.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/opcache/config.m4.orig 2024-04-09 13:46:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/opcache/config.m4 2024-04-16 06:00:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -317,6 +317,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT([$have_shm_mmap_posix])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_NEW_EXTENSION(opcache,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ZendAccelerator.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- zend_accelerator_blacklist.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -332,7 +334,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shared_alloc_mmap.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shared_alloc_posix.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ZEND_JIT_SRC,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- shared,,"-Wno-implicit-fallthrough -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shared,,"$PHP_OPCACHE_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ADD_EXTENSION_DEP(opcache, pcre)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>