<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/e8597fe3f20d4b0322b71432df42fe339004ee4e">https://github.com/macports/macports-ports/commit/e8597fe3f20d4b0322b71432df42fe339004ee4e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e8597fe3f20d4b0322b71432df42fe339004ee4e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 2 09:41:22 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> php73: Update to 7.3.25
</span>---
lang/php/Portfile | 84 +++++++++++-----------
lang/php/files/patch-php73-iODBC.diff | 12 ++--
lang/php/files/patch-php73-implicit.diff | 16 -----
.../patch-php73-sapi-fpm-php-fpm.conf.in.diff | 6 +-
lang/php/files/patch-php73-unixODBC.diff | 12 ++--
5 files changed, 57 insertions(+), 73 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 7f105ec94e3..e36f75314f8 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;'>@@ -142,11 +142,11 @@ switch ${subport_branch} {
</span> }
7.3 {
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 7.3.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.3.25
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 94247454b0bdc790ad6d7701790c1821179a93db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 78b0b417a147ab7572c874334d11654e3c61ec5b3f2170098e5db02fb0c89888 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12138212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 97b218179d7a1ec03b057d101f1c94c33531780f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c71c00ad03079efb78d1a6b8623ca4f725be697dbd9a46debacbcc9a2475f329 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12136668
</span> }
7.4 {
epoch 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,7 +224,7 @@ if {[is_sapi_subport]} {
</span> patchfiles-append \
patch-${php}-bison-re2c-version.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} 7.3] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] >= 0} {
</span> patchfiles-append \
patch-${php}-implicit.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -367,7 +367,7 @@ subport ${php} {
</span> 7.0.33 {revision 3}
7.1.33 {revision 1}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -514,7 +514,7 @@ subport ${php}-apache2handler {
</span> 7.0.33 {revision 1}
7.1.33 {revision 1}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -572,7 +572,7 @@ subport ${php}-cgi {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -612,7 +612,7 @@ subport ${php}-fpm {
</span> 7.0.33 {revision 1}
7.1.33 {revision 1}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -681,7 +681,7 @@ subport ${php}-calendar {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -701,7 +701,7 @@ subport ${php}-curl {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -733,7 +733,7 @@ subport ${php}-dba {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -765,7 +765,7 @@ subport ${php}-enchant {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -810,7 +810,7 @@ subport ${php}-exif {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -831,7 +831,7 @@ subport ${php}-ftp {
</span> 7.0.33 {revision 1}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -866,7 +866,7 @@ subport ${php}-gd {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -928,7 +928,7 @@ subport ${php}-gettext {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -954,7 +954,7 @@ subport ${php}-gmp {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -985,7 +985,7 @@ subport ${php}-iconv {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1011,7 +1011,7 @@ subport ${php}-imap {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1048,7 +1048,7 @@ subport ${php}-intl {
</span> 7.0.33 {revision 2}
7.1.33 {revision 1}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1091,7 +1091,7 @@ subport ${php}-ipc {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1113,7 +1113,7 @@ subport ${php}-ldap {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1149,7 +1149,7 @@ subport ${php}-mbstring {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1234,7 +1234,7 @@ subport ${php}-mysql {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1397,7 +1397,7 @@ subport ${php}-odbc {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1457,7 +1457,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 7.0.33 {revision 1}
7.1.33 {revision 1}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1496,7 +1496,7 @@ subport ${php}-openssl {
</span> 7.0.33 {revision 1}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1550,7 +1550,7 @@ subport ${php}-oracle {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1588,7 +1588,7 @@ subport ${php}-pcntl {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1617,7 +1617,7 @@ subport ${php}-posix {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1640,7 +1640,7 @@ subport ${php}-postgresql {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1768,7 +1768,7 @@ subport ${php}-pspell {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1794,7 +1794,7 @@ subport ${php}-snmp {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1820,7 +1820,7 @@ subport ${php}-soap {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1849,7 +1849,7 @@ subport ${php}-sockets {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1865,7 +1865,7 @@ if {[vercmp ${branch} 7.2] >= 0} {
</span> subport ${php}-sodium {
switch -- ${version} {
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1900,7 +1900,7 @@ subport ${php}-sqlite {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1948,7 +1948,7 @@ subport ${php}-tidy {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1980,7 +1980,7 @@ subport ${php}-wddx {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2007,7 +2007,7 @@ subport ${php}-xmlrpc {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2048,7 +2048,7 @@ subport ${php}-xsl {
</span> 7.0.33 {revision 0}
7.1.33 {revision 0}
7.2.34 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.24 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 0}
</span> 7.4.12 {revision 0}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php73-iODBC.diff b/lang/php/files/patch-php73-iODBC.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 83823d5f00d..9e010ef1db2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php73-iODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php73-iODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/odbc/config.m4.orig 2015-04-15 13:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/odbc/config.m4 2015-04-17 20:15:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,6 +104,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/odbc/config.m4.orig 2020-11-24 05:10:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2020-12-02 15:59:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,6 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0350)
</span>
+:<<'MACPORTS_DISABLED'
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(adabas,,
[ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -386,6 +387,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -312,6 +313,7 @@
</span> fi
fi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php73-implicit.diff b/lang/php/files/patch-php73-implicit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0d6f8882d72..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php73-implicit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.php.net/bug.php?id=80171
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.orig 2020-10-27 06:02:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure 2020-10-30 09:21:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96763,7 +96763,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts (dlerror ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit (status);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php73-sapi-fpm-php-fpm.conf.in.diff b/lang/php/files/patch-php73-sapi-fpm-php-fpm.conf.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a6ff7df5ce..5a6ac62f04a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php73-sapi-fpm-php-fpm.conf.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php73-sapi-fpm-php-fpm.conf.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sapi/fpm/php-fpm.conf.in.orig 2016-08-19 01:48:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sapi/fpm/php-fpm.conf.in 2016-08-20 10:16:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sapi/fpm/php-fpm.conf.in.orig 2020-11-24 05:10:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sapi/fpm/php-fpm.conf.in 2020-12-02 15:47:09.000000000 -0600
</span> @@ -14,14 +14,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span>
; Log level
; Possible Values: alert, error, warning, notice, debug
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,8 +77,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,8 +95,9 @@
</span> ; process.priority = -19
; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php73-unixODBC.diff b/lang/php/files/patch-php73-unixODBC.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b3bbb5c4030..7589beac800 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php73-unixODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php73-unixODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/odbc/config.m4.orig 2015-04-15 13:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/odbc/config.m4 2015-04-17 20:13:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,6 +104,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/odbc/config.m4.orig 2020-11-24 05:10:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2020-12-02 15:58:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,6 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0350)
</span>
+:<<'MACPORTS_DISABLED'
if test -z "$ODBC_TYPE"; then
PHP_ARG_WITH(adabas,,
[ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -446,6 +447,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -372,6 +373,7 @@
</span> fi
fi
</pre><pre style='margin:0'>
</pre>