<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/f626ae3bdac927a9218a1da0df36f713f7d99f29">https://github.com/macports/macports-ports/commit/f626ae3bdac927a9218a1da0df36f713f7d99f29</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f626ae3bdac927a9218a1da0df36f713f7d99f29
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 2 22:02:52 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> php72 and later: Add argon2; disable valgrind
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60469
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60003
</span>---
lang/php/Portfile | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 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 a549385fddd..aa8d2ec877d 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;'>@@ -324,6 +324,15 @@ if {[is_sapi_subport]} {
</span> configure.args-append ac_cv_decimal_fp_supported=no
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.2] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:argon2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-password-argon2=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-valgrind
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.universal_args-delete --disable-dependency-tracking
test.run yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -386,10 +395,10 @@ subport ${php} {
</span> 5.6.40 {revision 4}
7.0.33 {revision 3}
7.1.33 {revision 1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.2.34 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.25 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.13 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.0.0 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.2.34 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.0.0 {revision 1}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -536,10 +545,10 @@ subport ${php}-apache2handler {
</span> 5.6.40 {revision 1}
7.0.33 {revision 1}
7.1.33 {revision 1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.2.34 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.25 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.13 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.0.0 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.2.34 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.0.0 {revision 1}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -601,10 +610,10 @@ subport ${php}-cgi {
</span> 5.6.40 {revision 0}
7.0.33 {revision 0}
7.1.33 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.2.34 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.25 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.13 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.0.0 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.2.34 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.0.0 {revision 1}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -642,10 +651,10 @@ subport ${php}-fpm {
</span> 5.6.40 {revision 1}
7.0.33 {revision 1}
7.1.33 {revision 1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.2.34 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.3.25 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.13 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.0.0 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.2.34 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.3.25 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.0.0 {revision 1}
</span> }
description ${php} FPM SAPI
</pre><pre style='margin:0'>
</pre>