summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2021-05-17 18:37:38 +0200
committerMax Kellermann <max@musicpd.org>2021-05-17 18:42:05 +0200
commit6f51d910eeef161b9e1a09406cf7e219341d8161 (patch)
treee3dba70eeb5abf3fbdf96f77a7c76cb17f9bd9de /src
parent1215818572b6062c4ec709ba818954d49fbd9311 (diff)
python/build/libs.py: update CURL to 7.76.1
Diffstat (limited to 'src')
-rw-r--r--src/lib/curl/patches/no_netrc.patch19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/curl/patches/no_netrc.patch b/src/lib/curl/patches/no_netrc.patch
index 9746f1435..c825ea36a 100644
--- a/src/lib/curl/patches/no_netrc.patch
+++ b/src/lib/curl/patches/no_netrc.patch
@@ -1,19 +1,20 @@
-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 @@
+Index: curl-7.71.1/lib/url.c
+===================================================================
+--- curl-7.71.1.orig/lib/url.c
++++ curl-7.71.1/lib/url.c
+@@ -2871,6 +2871,7 @@
}
conn->bits.netrc = FALSE;
+#ifndef __BIONIC__
- if(data->set.use_netrc != CURL_NETRC_IGNORED &&
- (!*userp || !**userp || !*passwdp || !**passwdp)) {
+ if(data->set.use_netrc && !data->set.str[STRING_USERNAME]) {
bool netrc_user_changed = FALSE;
-@@ -3090,6 +3091,7 @@
- }
+ bool netrc_passwd_changed = FALSE;
+@@ -2895,6 +2896,7 @@
+ conn->bits.user_passwd = TRUE; /* enable user+password */
}
}
+#endif
/* for updated strings, we update them in the URL */
- if(user_changed) {
+ if(*userp) {