diff options
| author | Max Kellermann <max@musicpd.org> | 2019-01-21 10:11:50 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2019-01-21 10:11:50 +0100 |
| commit | 008383f24a0adac6502d7207806f41a9c43afb86 (patch) | |
| tree | cba3edc6f252e386159186ddab2265706b680b86 | |
| parent | 4f7d52dbf2eaee15a517363c846650d76f45739f (diff) | |
python/build/libs.py: upgrade CURL to 7.63.0
| -rw-r--r-- | python/build/libs.py | 4 | ||||
| -rw-r--r-- | src/lib/curl/patches/no_netrc.patch | 23 |
2 files changed, 13 insertions, 14 deletions
diff --git a/python/build/libs.py b/python/build/libs.py index 5fba67c41..0bddc70af 100644 --- a/python/build/libs.py +++ b/python/build/libs.py @@ -341,8 +341,8 @@ ffmpeg = FfmpegProject( ) curl = AutotoolsProject( - 'http://curl.haxx.se/download/curl-7.62.0.tar.xz', - 'dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1', + 'http://curl.haxx.se/download/curl-7.63.0.tar.xz', + '9600234c794bfb8a0d3f138e9294d60a20e7a5f10e35ece8cf518e2112d968c4', 'lib/libcurl.a', [ '--disable-shared', '--enable-static', diff --git a/src/lib/curl/patches/no_netrc.patch b/src/lib/curl/patches/no_netrc.patch index 22557d162..9746f1435 100644 --- a/src/lib/curl/patches/no_netrc.patch +++ b/src/lib/curl/patches/no_netrc.patch @@ -1,20 +1,19 @@ -Index: curl-7.58.0/lib/url.c -=================================================================== ---- curl-7.58.0.orig/lib/url.c -+++ curl-7.58.0/lib/url.c -@@ -3503,6 +3503,7 @@ static CURLcode override_login(struct Cu +diff -ur curl-7.63.0.orig/lib/url.c curl-7.63.0/lib/url.c +--- curl-7.63.0.orig/lib/url.c 2019-01-21 10:15:51.368019445 +0100 ++++ curl-7.63.0/lib/url.c 2019-01-21 10:19:16.307523984 +0100 +@@ -3057,6 +3057,7 @@ } conn->bits.netrc = FALSE; +#ifndef __BIONIC__ - if(data->set.use_netrc != CURL_NETRC_IGNORED) { - int ret = Curl_parsenetrc(conn->host.name, - userp, passwdp, -@@ -3524,6 +3525,7 @@ static CURLcode override_login(struct Cu - conn->bits.user_passwd = TRUE; /* enable user+password */ + if(data->set.use_netrc != CURL_NETRC_IGNORED && + (!*userp || !**userp || !*passwdp || !**passwdp)) { + bool netrc_user_changed = FALSE; +@@ -3090,6 +3091,7 @@ + } } } +#endif - return CURLE_OK; - } + /* for updated strings, we update them in the URL */ + if(user_changed) { |