python/build/libs.py: update CURL to 7.84.0

This commit is contained in:
Max Kellermann
2022-07-08 10:11:20 +02:00
parent 2f6ceb4949
commit 9bdc75524b
3 changed files with 17 additions and 15 deletions

View File

@@ -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)

View File

@@ -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;
}