<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2ef7852b9c78560464431444596860d88686a2a4">https://github.com/macports/macports-ports/commit/2ef7852b9c78560464431444596860d88686a2a4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2ef7852b9c78560464431444596860d88686a2a4
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Nov 9 16:10:48 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> php: Fixes to initial changes made when migrating to openssl3
</span>---
lang/php/Portfile | 59 +++++++++++++++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 26 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 014d7ca8421..64737e60fc3 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;'>@@ -5,6 +5,10 @@ PortGroup php 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable by default adding openssl support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Specific sub-ports below enable as required.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch no_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name php
platforms darwin freebsd
maintainers {ryandesign @ryandesign}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -935,9 +939,7 @@ subport ${php}-ftp {
</span> description a PHP extension for accessing file servers using the \
File Transfer Protocol
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span>
if {[vercmp ${branch} 7.4] >= 0} {
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -948,7 +950,8 @@ subport ${php}-ftp {
</span> patchfiles-append patch-${php}-ext-ftp-ftp_ssl_connect.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-openssl-dir=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch [openssl::default_branch]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openssl-dir=[openssl::install_area]
</span> }
subport ${php}-gd {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1604,19 +1607,22 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> }
subport ${php}-openssl {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> switch -- ${version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.2.17 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.3.29 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.4.45 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.5.38 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.6.40 {revision 2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.0.33 {revision 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.1.33 {revision 0}
</span><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.32 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.25 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.0.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.1.0RC5 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.2.17 {revision 3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.3.29 {revision 3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.4.45 {revision 3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.5.38 {revision 3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6.40 {revision 3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.0.33 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.1.33 {revision 1}
</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.32 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.25 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.0.12 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0RC5 {revision 1}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1625,11 +1631,10 @@ subport ${php}-openssl {
</span> and -verification and data-encryption and \
-decryption functions
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span>
depends_lib-append port:kerberos5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libcomerr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libcomerr
</span>
post-extract {
move ${php.build_dirs}/config0.m4 ${php.build_dirs}/config.m4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1638,8 +1643,7 @@ subport ${php}-openssl {
</span> configure.args-append --with-kerberos=${prefix}
if {[vercmp ${branch} 5.6] <= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl.branch 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl.configure pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 1.0
</span>
# This patch is for reordering -I and -L flags during the build to make
# openssl-1.0 directories appear before others
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1650,12 +1654,15 @@ subport ${php}-openssl {
</span> }
configure.args-append --with-openssl=shared
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-openssl=${prefix}
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openssl=[openssl::install_area]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Despite above explicit configuration, will not build if openssl shim port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is active as it is found in preference to the specified version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Until the build configuration can be comnvinced to use the configured openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in preference to whatever it might find in the primary prefix, declare a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build conflict so the user is given clear instructions how to deal with it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build openssl
</span> }
}
</pre><pre style='margin:0'>
</pre>