python/build/libs.py: upgrade CURL to 7.63.0

This commit is contained in:
Max Kellermann 2019-01-21 10:11:50 +01:00
parent 4f7d52dbf2
commit 008383f24a
2 changed files with 13 additions and 14 deletions

View File

@ -341,8 +341,8 @@ ffmpeg = FfmpegProject(
) )
curl = AutotoolsProject( curl = AutotoolsProject(
'http://curl.haxx.se/download/curl-7.62.0.tar.xz', 'http://curl.haxx.se/download/curl-7.63.0.tar.xz',
'dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1', '9600234c794bfb8a0d3f138e9294d60a20e7a5f10e35ece8cf518e2112d968c4',
'lib/libcurl.a', 'lib/libcurl.a',
[ [
'--disable-shared', '--enable-static', '--disable-shared', '--enable-static',

View File

@ -1,20 +1,19 @@
Index: curl-7.58.0/lib/url.c 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.58.0.orig/lib/url.c +++ curl-7.63.0/lib/url.c 2019-01-21 10:19:16.307523984 +0100
+++ curl-7.58.0/lib/url.c @@ -3057,6 +3057,7 @@
@@ -3503,6 +3503,7 @@ static CURLcode override_login(struct Cu
} }
conn->bits.netrc = FALSE; conn->bits.netrc = FALSE;
+#ifndef __BIONIC__ +#ifndef __BIONIC__
if(data->set.use_netrc != CURL_NETRC_IGNORED) { if(data->set.use_netrc != CURL_NETRC_IGNORED &&
int ret = Curl_parsenetrc(conn->host.name, (!*userp || !**userp || !*passwdp || !**passwdp)) {
userp, passwdp, bool netrc_user_changed = FALSE;
@@ -3524,6 +3525,7 @@ static CURLcode override_login(struct Cu @@ -3090,6 +3091,7 @@
conn->bits.user_passwd = TRUE; /* enable user+password */ }
} }
} }
+#endif +#endif
return CURLE_OK; /* for updated strings, we update them in the URL */
} if(user_changed) {