<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/ffa632a3b93568fb316bf08530639cdeda6358f3">https://github.com/macports/macports-ports/commit/ffa632a3b93568fb316bf08530639cdeda6358f3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ffa632a3b93 php: Update php74 to 7.4.12
</span>ffa632a3b93 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ffa632a3b93568fb316bf08530639cdeda6358f3
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Oct 31 10:06:32 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> php: Update php74 to 7.4.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/60988
</span>---
lang/php/Portfile | 82 ++++++++++++++++----------------
lang/php/files/patch-php74-implicit.diff | 16 +++++++
2 files changed, 57 insertions(+), 41 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 017ecfa4b88..13155e81385 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;'>@@ -150,11 +150,11 @@ switch ${subport_branch} {
</span> }
7.4 {
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 7.4.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.4.12
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 85f9886e0cc6837d70b386306bf12602b9cd9637 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5d31675a9b9c21b5bd03389418218c30b26558246870caba8eb54f5856e2d6ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10302076
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 73c684b5b1acdd296b471fd89d06cb205cfd57ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e82d2bcead05255f6b7d2ff4e2561bc334204955820cabc2457b5239fde96b76 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10311980
</span> }
8.0 {
# When this becomes a stable version, remove the overrides for homepage,
<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.3] >= 0} {
</span> patchfiles-append \
patch-${php}-implicit.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -368,7 +368,7 @@ subport ${php} {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -515,7 +515,7 @@ subport ${php}-apache2handler {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -573,7 +573,7 @@ subport ${php}-cgi {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -613,7 +613,7 @@ subport ${php}-fpm {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -682,7 +682,7 @@ subport ${php}-calendar {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -702,7 +702,7 @@ subport ${php}-curl {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -734,7 +734,7 @@ subport ${php}-dba {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -766,7 +766,7 @@ subport ${php}-enchant {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -811,7 +811,7 @@ subport ${php}-exif {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -832,7 +832,7 @@ subport ${php}-ftp {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -867,7 +867,7 @@ subport ${php}-gd {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -929,7 +929,7 @@ subport ${php}-gettext {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -955,7 +955,7 @@ subport ${php}-gmp {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -986,7 +986,7 @@ subport ${php}-iconv {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1012,7 +1012,7 @@ subport ${php}-imap {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1049,7 +1049,7 @@ subport ${php}-intl {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1092,7 +1092,7 @@ subport ${php}-ipc {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1114,7 +1114,7 @@ subport ${php}-ldap {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1150,7 +1150,7 @@ subport ${php}-mbstring {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1235,7 +1235,7 @@ subport ${php}-mysql {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1398,7 +1398,7 @@ subport ${php}-odbc {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1458,7 +1458,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1497,7 +1497,7 @@ subport ${php}-openssl {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1551,7 +1551,7 @@ subport ${php}-oracle {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1589,7 +1589,7 @@ subport ${php}-pcntl {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1618,7 +1618,7 @@ subport ${php}-posix {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1641,7 +1641,7 @@ subport ${php}-postgresql {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1762,7 +1762,7 @@ subport ${php}-pspell {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1788,7 +1788,7 @@ subport ${php}-snmp {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1814,7 +1814,7 @@ subport ${php}-soap {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1843,7 +1843,7 @@ subport ${php}-sockets {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1859,7 +1859,7 @@ subport ${php}-sodium {
</span> switch -- ${version} {
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1894,7 +1894,7 @@ subport ${php}-sqlite {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1942,7 +1942,7 @@ subport ${php}-tidy {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2001,7 +2001,7 @@ subport ${php}-xmlrpc {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2042,7 +2042,7 @@ subport ${php}-xsl {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.24 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.11 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.12 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php74-implicit.diff b/lang/php/files/patch-php74-implicit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e629e2cc48a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php74-implicit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</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: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.php.net/bug.php?id=80171
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.orig 2020-10-30 00:33:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure 2020-10-30 00:53:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83023,7 +83023,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts (dlerror ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit (status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
</span></pre><pre style='margin:0'>
</pre>