From 66d2df4cadd7a5fceb7ad56fdc3f35b5e926f226 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sat, 14 Dec 2024 14:03:32 +0100
Subject: [PATCH] Updated patches for new cURL version.

---
 patch/curl_tool_doswin.diff   |  6 +++---
 patch/curl_tool_getparam.diff | 13 ++++++++-----
 patch/curl_tool_operate.diff  |  4 ++--
 patch/curl_tool_util.diff     |  8 ++++----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/patch/curl_tool_doswin.diff b/patch/curl_tool_doswin.diff
index 77033e2..cdd0a91 100644
--- a/patch/curl_tool_doswin.diff
+++ b/patch/curl_tool_doswin.diff
@@ -2,10 +2,10 @@
  1 file changed, 8 insertions(+)
 
 diff --git a/src/tool_doswin.c b/src/tool_doswin.c
-index 70b263113..28489a521 100644
+index 301b2974e..6720ad5d7 100644
 --- a/src/tool_doswin.c
 +++ b/src/tool_doswin.c
-@@ -739,6 +739,8 @@ bool tool_isVistaOrGreater;
+@@ -741,6 +741,8 @@ bool tool_isVistaOrGreater;
  
  CURLcode win32_init(void)
  {
@@ -14,7 +14,7 @@ index 70b263113..28489a521 100644
    /* curlx_verify_windows_version must be called during init at least once
       because it has its own initialization routine. */
    if(curlx_verify_windows_version(6, 0, 0, PLATFORM_WINNT,
-@@ -753,6 +755,12 @@ CURLcode win32_init(void)
+@@ -755,6 +757,12 @@ CURLcode win32_init(void)
    init_terminal();
  #endif
  
diff --git a/patch/curl_tool_getparam.diff b/patch/curl_tool_getparam.diff
index b4018b2..c495d5c 100644
--- a/patch/curl_tool_getparam.diff
+++ b/patch/curl_tool_getparam.diff
@@ -1,7 +1,10 @@
-diff --git "a/src/tool_getparam.c" "b/src/tool_getparam.c"
-index 1231b3bd6..434e9ddd3 100644
---- "a/src/tool_getparam.c"
-+++ "b/src/tool_getparam.c"
+ src/tool_getparam.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/tool_getparam.c b/src/tool_getparam.c
+index d352c80a5..f0c42ddc8 100644
+--- a/src/tool_getparam.c
++++ b/src/tool_getparam.c
 @@ -23,6 +23,10 @@
   ***************************************************************************/
  #include "tool_setup.h"
@@ -13,7 +16,7 @@ index 1231b3bd6..434e9ddd3 100644
  #include "strcase.h"
  
  #include "curlx.h"
-@@ -554,8 +558,13 @@ static void cleanarg(argv_item_t str)
+@@ -557,8 +561,13 @@ static void cleanarg(argv_item_t str)
     * argument out so that the username:password is not displayed in the
     * system process list */
    if(str) {
diff --git a/patch/curl_tool_operate.diff b/patch/curl_tool_operate.diff
index 4763085..75c92f6 100644
--- a/patch/curl_tool_operate.diff
+++ b/patch/curl_tool_operate.diff
@@ -2,10 +2,10 @@
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/tool_operate.c b/src/tool_operate.c
-index a1212c9dd..d88fa3242 100644
+index 2309495d8..2c494e63f 100644
 --- a/src/tool_operate.c
 +++ b/src/tool_operate.c
-@@ -3007,11 +3007,15 @@ static CURLcode cacertpaths(struct OperationConfig *config)
+@@ -3017,11 +3017,15 @@ static CURLcode cacertpaths(struct OperationConfig *config)
  #ifdef _WIN32
    if(!env) {
  #if defined(CURL_CA_SEARCH_SAFE)
diff --git a/patch/curl_tool_util.diff b/patch/curl_tool_util.diff
index a85a869..1e441c3 100644
--- a/patch/curl_tool_util.diff
+++ b/patch/curl_tool_util.diff
@@ -3,10 +3,10 @@
  2 files changed, 14 insertions(+), 21 deletions(-)
 
 diff --git a/src/tool_util.c b/src/tool_util.c
-index e657dacf0..7044ca008 100644
+index 69b1d2b42..00557fdba 100644
 --- a/src/tool_util.c
 +++ b/src/tool_util.c
-@@ -191,28 +191,21 @@ int tool_ftruncate64(int fd, curl_off_t where)
+@@ -228,28 +228,21 @@ int tool_ftruncate64(int fd, curl_off_t where)
  #endif /* USE_TOOL_FTRUNCATE */
  
  #ifdef _WIN32
@@ -49,10 +49,10 @@ index e657dacf0..7044ca008 100644
    }
  
 diff --git a/src/tool_util.h b/src/tool_util.h
-index 9fec7e873..93d7ef9fc 100644
+index 9a4e87dc4..8092c1409 100644
 --- a/src/tool_util.h
 +++ b/src/tool_util.h
-@@ -40,7 +40,7 @@ int struplocompare(const char *p1, const char *p2);
+@@ -49,7 +49,7 @@ int struplocompare(const char *p1, const char *p2);
  int struplocompare4sort(const void *p1, const void *p2);
  
  #ifdef _WIN32