<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/5150ca4a13e84c528255d7f900a361bee9e7e132">https://github.com/macports/macports-ports/commit/5150ca4a13e84c528255d7f900a361bee9e7e132</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 5150ca4 py-curl: update to 7.43.0.3
</span>5150ca4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5150ca4a13e84c528255d7f900a361bee9e7e132
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Tue Jun 18 19:21:18 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> py-curl: update to 7.43.0.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * The latest tarball is no longer hosted on Bintray
</span><span style='display:block; white-space:pre;color:#404040;'> * patch-allow-unknown-ssl-backend.diff is merged [1]
</span><span style='display:block; white-space:pre;color:#404040;'> * Drop unused py36 variant
</span><span style='display:block; white-space:pre;color:#404040;'> * ALPN and NPN are available in curl only if the latter is compiled with
</span><span style='display:block; white-space:pre;color:#404040;'> nghttp2 [2]. This behavior appears in curl 7.65.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://github.com/pycurl/pycurl/pull/527
</span><span style='display:block; white-space:pre;color:#404040;'> [2] https://github.com/curl/curl/commit/e91e48161235272ff485ff32bd048c53af731f43#diff-72ee0eef31d053c9e6d4fb22e81d2407R2618
</span>---
python/py-curl/Portfile | 27 ++++++++++++--------
.../files/patch-allow-unknown-ssl-backend.diff | 29 ----------------------
python/py-curl/files/patch-no-http2.diff | 19 ++++++++++++++
python/py-graveyard/Portfile | 1 +
4 files changed, 36 insertions(+), 40 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 6c33df1..4a06545 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;'>@@ -1,11 +1,14 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span> PortGroup python 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup pycurl pycurl 7_43_0_3 REL_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span> name py-curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.43.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version [string map {_ .} ${github.version}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append net devel
platforms darwin
license {MIT LGPL}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,14 +20,12 @@ long_description Python module interface to the cURL library which \
</span> supporting many protocols.
homepage http://pycurl.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://dl.bintray.com/pycurl/pycurl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname pycurl-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 89311d1b3bb42a5dbb88609fdbdee6de \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d6f40fc0f1e3f69bead2c2b9daf71a7195635f2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 214212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 719c76c8c3937d6ba544d08183aa1e91 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6891ba8ee4d79fd5a10e824db47b9083309306b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 553047902a738cc2e6b1cd42783a9d0992e47086773be30027a71e1293493c39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 208879
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 37
</span>
if {${name} ne ${subport}} {
depends_test-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,17 +42,21 @@ if {${name} ne ${subport}} {
</span> patch-fix-fake-curl.diff \
patch-no-nose-show-skipped.diff \
patch-grealpath.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-allow-unknown-ssl-backend.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-http2.diff
</span>
post-patch {
reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/tests/fake-curl/libcurl/Makefile
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${build.dir} "${python.bin} setup.py docstrings"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args --curl-config=${prefix}/bin/curl-config
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX: the test suite uses 8384 port, which is the default port that syncthing uses
</span> test.run yes
test {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete {*}[glob ${worksrcpath}/tests/fake-curl/libcurl/*.so]
</span> # Required variants for curl: +http2+gss+sftp_scp
system -W ${worksrcpath} "extra_attrs=',\!http2,\!gssapi,\!ssh' make do-test PYTHON=${python.bin} NOSETESTS=nosetests-${python.branch} PYFLAKES=pyflakes-${python.branch}"
}
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 20ae766..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-curl/files/patch-allow-unknown-ssl-backend.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5062fa56f66c295394595808094742c63c352d19 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Oleg Pudeyev <oleg@bsdpower.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 4 Jun 2018 09:09:17 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Replace error with a warning for undetected SSL backend.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We don't detect nor do anything special for a multitude of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SSL backends like DarwinSSL, WinSSL and the more obscure ones
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-available on Unices.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git setup.py setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9f124473..06f26c92 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -311,10 +311,11 @@ def configure_unix(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.detect_ssl_backend()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not self.ssl_lib_detected:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- raise ConfigurationError('''\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Curl is configured to use SSL, but we have not been able to determine \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--which SSL backend it is using. Please see PycURL documentation for how to \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--specify the SSL backend manually.''')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.stderr.write('''\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Warning: libcurl is configured to use SSL, but we have not been able to \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+determine which SSL backend it is using. If your Curl is built against \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OpenSSL, LibreSSL, BoringSSL, GnuTLS or NSS please specify the SSL backend \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+manually. For other SSL backends please ignore this message.''')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if self.detect_ssl_option():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.stderr.write("Warning: SSL backend specified manually but libcurl does not use SSL\n")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-curl/files/patch-no-http2.diff b/python/py-curl/files/patch-no-http2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..475d110
</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-no-http2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tests/option_constants_test.py tests/option_constants_test.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d0f999f..78c8a31 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/option_constants_test.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/option_constants_test.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -220,12 +220,14 @@ class OptionConstantsTest(unittest.TestCase):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curl.setopt(curl.UNIX_SOCKET_PATH, '/tmp/socket.sock')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curl.close()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @nose.plugins.attrib.attr('http2')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @util.min_libcurl(7, 36, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_ssl_enable_alpn(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curl = pycurl.Curl()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curl.setopt(curl.SSL_ENABLE_ALPN, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curl.close()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @nose.plugins.attrib.attr('http2')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @util.min_libcurl(7, 36, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def test_ssl_enable_npn(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curl = pycurl.Curl()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graveyard/Portfile b/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c64eee..03c2740 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,6 +101,7 @@ py-cssutils 1.0.2_1 26
</span> py-ctags 1.0.5_1 26
py-ctypeslib2 2.2.2 34 35
py-curl 7.19.0_2 26
<span style='display:block; white-space:pre;background:#e0ffe0;'>+py-curl 7.43.0.2_2 36
</span> py-cvxopt 1.1.9_1 33
py-cycler 0.10.0_1 26 33
py-deap 1.2.2_1 26 33 34
</pre><pre style='margin:0'>
</pre>