<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/70f353832d29baef3d4011dc65e19bbf6e2ca4cc">https://github.com/macports/macports-ports/commit/70f353832d29baef3d4011dc65e19bbf6e2ca4cc</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 70f353832d2 curl: Add mbedtls variant
</span>70f353832d2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 70f353832d29baef3d4011dc65e19bbf6e2ca4cc
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 14 14:15:39 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> curl: Add mbedtls variant
</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/52681
</span>---
net/curl/Portfile | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/Portfile b/net/curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 37149ac43d9..46da7fd1198 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,9 +55,9 @@ if {${name} eq ${subport}} {
</span> --without-libmetalink \
--without-librtmp \
--without-libssh2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-mbedtls \
</span> --without-nghttp2 \
--without-nss \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-polarssl \
</span> --without-ssl \
--without-darwinssl \
--disable-ares \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,19 +145,26 @@ if {${name} eq ${subport}} {
</span> configure.args-replace --disable-ares --enable-ares
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant darwinssl conflicts ssl gnutls wolfssl description {Allow secure connections using Apple OS native TLS} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant darwinssl conflicts gnutls mbedtls ssl wolfssl description {Allow secure connections using Apple OS native TLS} {
</span> configure.args-replace --without-darwinssl --with-darwinssl
configure.args-append --without-ca-bundle
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant gnutls conflicts ssl wolfssl darwinssl description {Allow secure connections using GNU TLS} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant gnutls conflicts darwinssl mbedtls ssl wolfssl description {Allow secure connections using GNU TLS} {
</span> depends_lib-append port:gnutls \
path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
configure.args-replace --without-gnutls --with-gnutls
configure.args-append --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant wolfssl conflicts ssl gnutls darwinssl description {Allow secure connections using wolfSSL, formerly CyaSSL} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant mbedtls conflicts darwinssl gnutls ssl wolfssl description {Allow secure connections using mbed TLS (formerly PolarSSL)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mbedtls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-mbedtls --with-mbedtls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant wolfssl conflicts darwinssl mbedtls gnutls ssl description {Allow secure connections using wolfSSL (formerly CyaSSL)} {
</span> depends_lib-append port:wolfssl \
path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
configure.args-replace --without-cyassl --with-cyassl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,14 +198,14 @@ if {${name} eq ${subport}} {
</span> configure.args-replace --without-libssh2 --with-libssh2
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ssl conflicts gnutls wolfssl darwinssl description {Allow secure connections using OpenSSL} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ssl conflicts darwinssl gnutls mbedtls wolfssl description {Allow secure connections using OpenSSL} {
</span> depends_lib-append path:lib/libssl.dylib:openssl \
path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
configure.args-replace --without-ssl --with-ssl=${prefix}
configure.args-append --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset gnutls] && ![variant_isset darwinssl] && ![variant_isset wolfssl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset darwinssl] && ![variant_isset gnutls] && ![variant_isset mbedtls] && ![variant_isset wolfssl]} {
</span> default_variants +ssl
}
</pre><pre style='margin:0'>
</pre>