<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3601d719a3521316a864c89fc7d95114b02974e5">https://github.com/macports/macports-ports/commit/3601d719a3521316a864c89fc7d95114b02974e5</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 3601d719a35 curl: Fix build against libressl
</span>3601d719a35 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3601d719a3521316a864c89fc7d95114b02974e5
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Tue Aug 18 16:20:27 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> curl: Fix build against libressl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
net/curl/Portfile | 3 ++-
net/curl/files/libressl.patch | 15 +++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
<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 3eeb92f8219..6ed01d904fe 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;'>@@ -44,7 +44,8 @@ if {${name} eq ${subport}} {
</span>
# Prevent curl-config from telling curl's dependents that they have to
# link with all of curl's dependencies as well.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles configure.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles configure.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libressl.patch
</span>
configure.args --disable-silent-rules \
--enable-ipv6 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/libressl.patch b/net/curl/files/libressl.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b4a609e5c6b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/files/libressl.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cc18b8c815f..1685a4aa4cb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/vtls/openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/vtls/openssl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -619,7 +619,9 @@ SSL_CTX_use_certificate_chain_bio(SSL_CTX *ctx, BIO* in,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *key_passwd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* SSL_CTX_add1_chain_cert introduced in OpenSSL 1.0.2 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) /* 1.0.2 or later */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* OpenSSL 1.0.2 or later */ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !(defined(LIBRESSL_VERSION_NUMBER) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (LIBRESSL_VERSION_NUMBER < 0x2090100fL)) /* LibreSSL 2.9.1 or later */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X509 *x = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *passwd_callback_userdata = (void *)key_passwd;
</span></pre><pre style='margin:0'>
</pre>