From 9bdc75524b1276f1c79d79815d44a33bdde3d6df Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Fri, 8 Jul 2022 10:11:20 +0200
Subject: [PATCH] python/build/libs.py: update CURL to 7.84.0

---
 python/build/libs.py                           |  4 ++--
 .../no_CMAKE_C_IMPLICIT_LINK_LIBRARIES.patch   | 10 ++++++----
 src/lib/curl/patches/no_netrc.patch            | 18 +++++++++---------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/python/build/libs.py b/python/build/libs.py
index 061557c26..0fca3daca 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -388,8 +388,8 @@ openssl = OpenSSLProject(
 )
 
 curl = CmakeProject(
-    'https://curl.se/download/curl-7.83.1.tar.xz',
-    '2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4',
+    'https://curl.se/download/curl-7.84.0.tar.xz',
+    '2d118b43f547bfe5bae806d8d47b4e596ea5b25a6c1f080aef49fbcd817c5db8',
     'lib/libcurl.a',
     [
         '-DBUILD_CURL_EXE=OFF',
diff --git a/src/lib/curl/patches/no_CMAKE_C_IMPLICIT_LINK_LIBRARIES.patch b/src/lib/curl/patches/no_CMAKE_C_IMPLICIT_LINK_LIBRARIES.patch
index d7d0ed678..dfa126374 100644
--- a/src/lib/curl/patches/no_CMAKE_C_IMPLICIT_LINK_LIBRARIES.patch
+++ b/src/lib/curl/patches/no_CMAKE_C_IMPLICIT_LINK_LIBRARIES.patch
@@ -1,6 +1,8 @@
---- curl-7.75.0.orig/CMakeLists.txt	2021-02-02 09:26:24.000000000 +0100
-+++ curl-7.75.0/CMakeLists.txt	2021-03-25 20:17:25.445684029 +0100
-@@ -1453,7 +1453,7 @@
+Index: curl-7.84.0/CMakeLists.txt
+===================================================================
+--- curl-7.84.0.orig/CMakeLists.txt
++++ curl-7.84.0/CMakeLists.txt
+@@ -1536,7 +1536,7 @@ set(includedir              "\${prefix}/
  set(LDFLAGS                 "${CMAKE_SHARED_LINKER_FLAGS}")
  set(LIBCURL_LIBS            "")
  set(libdir                  "${CMAKE_INSTALL_PREFIX}/lib")
@@ -8,4 +10,4 @@
 +foreach(_lib ${CURL_LIBS})
    if(TARGET "${_lib}")
      set(_libname "${_lib}")
-     get_target_property(_libtype "${_libname}" TYPE)
+     get_target_property(_imported "${_libname}" IMPORTED)
diff --git a/src/lib/curl/patches/no_netrc.patch b/src/lib/curl/patches/no_netrc.patch
index c825ea36a..35b83b621 100644
--- a/src/lib/curl/patches/no_netrc.patch
+++ b/src/lib/curl/patches/no_netrc.patch
@@ -1,20 +1,20 @@
-Index: curl-7.71.1/lib/url.c
+Index: curl-7.84.0/lib/url.c
 ===================================================================
---- curl-7.71.1.orig/lib/url.c
-+++ curl-7.71.1/lib/url.c
-@@ -2871,6 +2871,7 @@
-   }
+--- curl-7.84.0.orig/lib/url.c
++++ curl-7.84.0/lib/url.c
+@@ -3003,6 +3003,7 @@ static CURLcode override_login(struct Cu
  
+ #ifndef CURL_DISABLE_NETRC
    conn->bits.netrc = FALSE;
 +#ifndef __BIONIC__
    if(data->set.use_netrc && !data->set.str[STRING_USERNAME]) {
      bool netrc_user_changed = FALSE;
      bool netrc_passwd_changed = FALSE;
-@@ -2895,6 +2896,7 @@
-       conn->bits.user_passwd = TRUE; /* enable user+password */
+@@ -3079,6 +3080,7 @@ static CURLcode override_login(struct Cu
+         return CURLE_OUT_OF_MEMORY;
      }
    }
 +#endif
  
-   /* for updated strings, we update them in the URL */
-   if(*userp) {
+   return CURLE_OK;
+ }