<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/62c3ae01ee27511e0154ea74286ad53c5f03b8ab">https://github.com/macports/macports-ports/commit/62c3ae01ee27511e0154ea74286ad53c5f03b8ab</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 62c3ae0 py-curl: allow building against curl with SSL backends unsupported by pycurl
</span>62c3ae0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62c3ae01ee27511e0154ea74286ad53c5f03b8ab
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Sun Jan 13 09:26:09 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> py-curl: allow building against curl with SSL backends unsupported by pycurl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ref: https://trac.macports.org/ticket/56770
</span>---
python/py-curl/Portfile | 8 ++----
.../files/patch-allow-unknown-ssl-backend.diff | 29 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-curl/Portfile b/python/py-curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4231d0d..fb043a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span>
name py-curl
version 7.43.0.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,15 +36,12 @@ if {${name} ne ${subport}} {
</span>
depends_lib-append port:curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # pycurl accepts curl with OpenSSL/GnuTLS/NSS or no SSL, but not other SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # implementations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants curl {} {darwinssl wolfssl}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles-append \
patch-allow-disable-tests.diff \
patch-fix-fake-curl.diff \
patch-no-nose-show-skipped.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-grealpath.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-grealpath.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-allow-unknown-ssl-backend.diff
</span>
post-patch {
reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/tests/fake-curl/libcurl/Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-curl/files/patch-allow-unknown-ssl-backend.diff b/python/py-curl/files/patch-allow-unknown-ssl-backend.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..20ae766
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-curl/files/patch-allow-unknown-ssl-backend.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5062fa56f66c295394595808094742c63c352d19 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Oleg Pudeyev <oleg@bsdpower.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 4 Jun 2018 09:09:17 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Replace error with a warning for undetected SSL backend.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We don't detect nor do anything special for a multitude of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SSL backends like DarwinSSL, WinSSL and the more obscure ones
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+available on Unices.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git setup.py setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9f124473..06f26c92 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,10 +311,11 @@ def configure_unix(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.detect_ssl_backend()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not self.ssl_lib_detected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- raise ConfigurationError('''\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Curl is configured to use SSL, but we have not been able to determine \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-which SSL backend it is using. Please see PycURL documentation for how to \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-specify the SSL backend manually.''')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sys.stderr.write('''\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Warning: libcurl is configured to use SSL, but we have not been able to \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++determine which SSL backend it is using. If your Curl is built against \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OpenSSL, LibreSSL, BoringSSL, GnuTLS or NSS please specify the SSL backend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++manually. For other SSL backends please ignore this message.''')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.detect_ssl_option():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.stderr.write("Warning: SSL backend specified manually but libcurl does not use SSL\n")
</span></pre><pre style='margin:0'>
</pre>