curl: update to 8.4.0

3 files changed, 56 insertions, 21 deletions

diff --git a/pkg/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch b/pkg/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch
index 3fb92ce6..9c2c0756 100644
--- a/pkg/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch
+++ b/pkg/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch
@@ -1,19 +1,19 @@
-From 04afba4813f504cafb717c48c50de4395fb3ea71 Mon Sep 17 00:00:00 2001
+From 0c83f671f4f2a1b556a2f6a0cfd664cd13b077e0 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 16 Oct 2020 19:09:50 -0700
 Subject: [PATCH] Reuse dynbuf symbols for curl tool
 
 ---
- lib/dynbuf.h | 24 +++++++++++-------------
- 1 file changed, 11 insertions(+), 13 deletions(-)
+ lib/dynbuf.h | 26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
 
 diff --git a/lib/dynbuf.h b/lib/dynbuf.h
-index c1e97235d..8b9158051 100644
+index 31a913019..deabeb0e6 100644
 --- a/lib/dynbuf.h
 +++ b/lib/dynbuf.h
-@@ -24,22 +24,20 @@
-  *
-  ***************************************************************************/
+@@ -26,23 +26,21 @@
+ 
+ #include <curl/curl.h>
  
 -#ifndef BUILDING_LIBCURL
  /* this renames the functions so that the tool code can use the same code
@@ -29,22 +29,24 @@ index c1e97235d..8b9158051 100644
 -#define Curl_dyn_len(a) curlx_dyn_len(a)
 -#define Curl_dyn_reset(a) curlx_dyn_reset(a)
 -#define Curl_dyn_tail(a,b) curlx_dyn_tail(a,b)
-+#define curlx_dyn_init(a,b) Curl_dyn_init(a,b)
-+#define curlx_dyn_add(a,b) Curl_dyn_add(a,b)
-+#define curlx_dyn_addn(a,b,c) Curl_dyn_addn(a,b,c)
+-#define Curl_dyn_setlen(a,b) curlx_dyn_setlen(a,b)
++#define curlx_dyn_init Curl_dyn_init
++#define curlx_dyn_add Curl_dyn_add
++#define curlx_dyn_addn Curl_dyn_addn
 +#define curlx_dyn_addf Curl_dyn_addf
 +#define curlx_dyn_vaddf Curl_dyn_vaddf
-+#define curlx_dyn_free(a) Curl_dyn_free(a)
-+#define curlx_dyn_ptr(a) Curl_dyn_ptr(a)
-+#define curlx_dyn_uptr(a) Curl_dyn_uptr(a)
-+#define curlx_dyn_len(a) Curl_dyn_len(a)
-+#define curlx_dyn_reset(a) Curl_dyn_reset(a)
-+#define curlx_dyn_tail(a,b) Curl_dyn_tail(a,b)
++#define curlx_dyn_free Curl_dyn_free
++#define curlx_dyn_ptr Curl_dyn_ptr
++#define curlx_dyn_uptr Curl_dyn_uptr
++#define curlx_dyn_len Curl_dyn_len
++#define curlx_dyn_reset Curl_dyn_reset
++#define curlx_dyn_tail Curl_dyn_tail
++#define curlx_dyn_setlen Curl_dyn_setlen
  #define curlx_dynbuf dynbuf /* for the struct name */
 -#endif
  
  struct dynbuf {
    char *bufr;    /* point to a null-terminated allocated buffer */
 -- 
-2.35.1
+2.42.0
 
diff --git a/pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch b/pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch
index 4b1cdf75..6c48f4ed 100644
--- a/pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch
+++ b/pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch
@@ -1,4 +1,4 @@
-From 643bad651c570c0e2b5889df4d0cb0803fa58b1e Mon Sep 17 00:00:00 2001
+From f91719c41ecf96fe661a3fa03b5d22b8e6d52402 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 15 Nov 2021 13:10:02 -0800
 Subject: [PATCH] bearssl: Remove unnecessary CA blob length check
@@ -11,10 +11,10 @@ than INT_MAX.
  1 file changed, 3 deletions(-)
 
 diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c
-index f14eb66a2..ffa7c1166 100644
+index 934149c..32d9a5b 100644
 --- a/lib/vtls/bearssl.c
 +++ b/lib/vtls/bearssl.c
-@@ -129,9 +129,6 @@ static CURLcode load_cafile(struct cafile_source *source,
+@@ -133,9 +133,6 @@ static CURLcode load_cafile(struct cafile_source *source,
        return CURLE_SSL_CACERT_BADFILE;
    }
  
@@ -25,5 +25,5 @@ index f14eb66a2..ffa7c1166 100644
    ca.in_cert = FALSE;
    ca.anchors = NULL;
 -- 
-2.35.1
+2.42.0
 
diff --git a/pkg/curl/patch/0003-Reuse-base64-for-curl-tool.patch b/pkg/curl/patch/0003-Reuse-base64-for-curl-tool.patch
new file mode 100644
index 00000000..57bc1d45
--- /dev/null
+++ b/pkg/curl/patch/0003-Reuse-base64-for-curl-tool.patch
@@ -0,0 +1,33 @@
+From b69fdc6b0b1d9a594f17775e12ee237d8960b88f Mon Sep 17 00:00:00 2001
+From: Randy Palamar <palamar@ualberta.ca>
+Date: Sun, 15 Oct 2023 13:11:17 -0600
+Subject: [PATCH] Reuse base64 for curl tool
+
+---
+ lib/curl_base64.h | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/curl_base64.h b/lib/curl_base64.h
+index 7f7cd1d98..19c268549 100644
+--- a/lib/curl_base64.h
++++ b/lib/curl_base64.h
+@@ -24,13 +24,11 @@
+  *
+  ***************************************************************************/
+ 
+-#ifndef BUILDING_LIBCURL
+ /* this renames functions so that the tool code can use the same code
+    without getting symbol collisions */
+-#define Curl_base64_encode(a,b,c,d) curlx_base64_encode(a,b,c,d)
+-#define Curl_base64url_encode(a,b,c,d) curlx_base64url_encode(a,b,c,d)
+-#define Curl_base64_decode(a,b,c) curlx_base64_decode(a,b,c)
+-#endif
++#define curlx_base64_encode Curl_base64_encode
++#define curlx_base64url_encode Curl_base64url_encode
++#define curlx_base64_decode Curl_base64_decode
+ 
+ CURLcode Curl_base64_encode(const char *inputbuff, size_t insize,
+                             char **outptr, size_t *outlen);
+-- 
+2.42.0
+