From 6f51d910eeef161b9e1a09406cf7e219341d8161 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Mon, 17 May 2021 18:37:38 +0200
Subject: [PATCH] python/build/libs.py: update CURL to 7.76.1

---
 python/build/libs.py                |  4 ++--
 src/lib/curl/patches/no_netrc.patch | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/python/build/libs.py b/python/build/libs.py
index 3c78bebc2..56e3a29c4 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -385,8 +385,8 @@ openssl = OpenSSLProject(
 )
 
 curl = AutotoolsProject(
-    'http://curl.haxx.se/download/curl-7.74.0.tar.xz',
-    '999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b',
+    'https://curl.se/download/curl-7.76.1.tar.xz',
+    '64bb5288c39f0840c07d077e30d9052e1cbb9fa6c2dc52523824cc859e679145',
     '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 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) {