commit ee66b2b
Randy Palamar
·
2023-10-15 20:07:55 +0000 UTC
parent 0c6f4ba
curl: update to 8.4.0
10 files changed,
+117,
-108
+1,
-1
1@@ -1,2 +1,2 @@
2-/curl-7.85.0.tar.gz
3+/curl-8.4.0.tar.gz
4 /src
+25,
-37
1@@ -4,11 +4,16 @@
2 /* #undef CURL_CA_PATH */
3 /* #undef CURL_DEFAULT_SSL_BACKEND */
4 /* #undef CURL_DISABLE_ALTSVC */
5+/* #undef CURL_DISABLE_AWS */
6+/* #undef CURL_DISABLE_BASIC_AUTH */
7+/* #undef CURL_DISABLE_BEARER_AUTH */
8+/* #undef CURL_DISABLE_BINDLOCAL */
9 /* #undef CURL_DISABLE_COOKIES */
10-/* #undef CURL_DISABLE_CRYPTO_AUTH */
11 /* #undef CURL_DISABLE_DICT */
12+/* #undef CURL_DISABLE_DIGEST_AUTH */
13 /* #undef CURL_DISABLE_DOH */
14 /* #undef CURL_DISABLE_FILE */
15+/* #undef CURL_DISABLE_FORM_API */
16 /* #undef CURL_DISABLE_FTP */
17 /* #undef CURL_DISABLE_GETOPTIONS */
18 /* #undef CURL_DISABLE_GOPHER */
19@@ -17,11 +22,13 @@
20 /* #undef CURL_DISABLE_HTTP */
21 /* #undef CURL_DISABLE_HTTP_AUTH */
22 /* #undef CURL_DISABLE_IMAP */
23+/* #undef CURL_DISABLE_KERBEROS_AUTH */
24 #define CURL_DISABLE_LDAP 1
25 #define CURL_DISABLE_LDAPS 1
26 /* #undef CURL_DISABLE_LIBCURL_OPTION */
27 /* #undef CURL_DISABLE_MIME */
28 /* #undef CURL_DISABLE_MQTT */
29+/* #undef CURL_DISABLE_NEGOTIATE_AUTH */
30 /* #undef CURL_DISABLE_NETRC */
31 /* #undef CURL_DISABLE_NTLM */
32 /* #undef CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG */
33@@ -41,29 +48,25 @@
34 #define CURL_SA_FAMILY_T sa_family_t
35 /* #undef CURL_WITH_MULTI_SSL */
36 /* #undef DEBUGBUILD */
37-/* #undef EGD_SOCKET */
38 #define ENABLE_IPV6 1
39 #define GETHOSTNAME_TYPE_ARG2 size_t
40 #define HAVE_ALARM 1
41+/* #undef HAVE_ARC4RANDOM */
42 #define HAVE_ARPA_INET_H 1
43-#define HAVE_ARPA_TFTP_H 1
44-#define HAVE_ASSERT_H 1
45 #define HAVE_ATOMIC 1
46 #define HAVE_BASENAME 1
47 #define HAVE_BOOL_T 1
48-/* #undef HAVE_BORINGSSL */
49 /* #undef HAVE_BROTLI */
50 /* #undef HAVE_BROTLI_DECODE_H */
51 /* #undef HAVE_BUILTIN_AVAILABLE */
52 #define HAVE_CLOCK_GETTIME_MONOTONIC 1
53+#define HAVE_CLOCK_GETTIME_MONOTONIC_RAW 1
54 /* #undef HAVE_CLOSESOCKET */
55 /* #undef HAVE_CLOSESOCKET_CAMEL */
56-#define HAVE_CONNECT 1
57 /* #undef HAVE_CRYPTO_H */
58 #define HAVE_DECL_GETPWUID_R 1
59 /* #undef HAVE_DECL_GETPWUID_R_MISSING */
60 #define HAVE_DLFCN_H 1
61-#define HAVE_ERRNO_H 1
62 /* #undef HAVE_ERR_H */
63 #define HAVE_FCHMOD 1
64 #define HAVE_FCNTL 1
65@@ -71,6 +74,7 @@
66 #define HAVE_FCNTL_O_NONBLOCK 1
67 #define HAVE_FNMATCH 1
68 #define HAVE_FREEADDRINFO 1
69+#define HAVE_FSEEKO 1
70 #define HAVE_FSETXATTR 1
71 #define HAVE_FSETXATTR_5 1
72 /* #undef HAVE_FSETXATTR_6 */
73@@ -110,13 +114,17 @@
74 #define HAVE_INET_NTOP 1
75 #define HAVE_INET_PTON 1
76 #define HAVE_INTTYPES_H 1
77+#define HAVE_IOCTL 1
78 /* #undef HAVE_IOCTLSOCKET */
79 /* #undef HAVE_IOCTLSOCKET_CAMEL */
80 /* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */
81 /* #undef HAVE_IOCTLSOCKET_FIONBIO */
82+#define HAVE_IOCTL_FIONBIO 1
83+#define HAVE_IOCTL_SIOCGIFADDR 1
84 /* #undef HAVE_IO_H */
85 /* #undef HAVE_LBER_H */
86 /* #undef HAVE_LDAP_H */
87+/* #undef HAVE_LDAP_INIT_FD */
88 #define HAVE_LDAP_SSL 1
89 /* #undef HAVE_LDAP_SSL_H */
90 /* #undef HAVE_LDAP_URL_PARSE */
91@@ -127,8 +135,6 @@
92 /* #undef HAVE_LIBRTMP_RTMP_H */
93 /* #undef HAVE_LIBSSH */
94 /* #undef HAVE_LIBSSH2 */
95-/* #undef HAVE_LIBSSH2_H */
96-/* #undef HAVE_LIBSSH_LIBSSH_H */
97 /* #undef HAVE_LIBSSL */
98 /* #undef HAVE_LIBWOLFSSH */
99 #define HAVE_LIBZ 1
100@@ -161,7 +167,6 @@
101 /* #undef HAVE_OPENSSL_X509_H */
102 /* #undef HAVE_PEM_H */
103 #define HAVE_PIPE 1
104-/* #undef HAVE_PK11_CREATEMANAGEDGENERICOBJECT */
105 #define HAVE_POLL_FINE 1
106 #define HAVE_POLL_H 1
107 #define HAVE_POSIX_STRERROR_R 1
108@@ -170,7 +175,6 @@
109 #define HAVE_PWD_H 1
110 /* #undef HAVE_QUICHE_CONN_SET_QLOG_FD */
111 /* #undef HAVE_QUICHE_H */
112-/* #undef HAVE_RAND_EGD */
113 #define HAVE_RECV 1
114 /* #undef HAVE_RSA_H */
115 #define HAVE_SCHED_YIELD 1
116@@ -184,14 +188,15 @@
117 #define HAVE_SIGACTION 1
118 #define HAVE_SIGINTERRUPT 1
119 #define HAVE_SIGNAL 1
120-#define HAVE_SIGNAL_H 1
121 #define HAVE_SIGSETJMP 1
122+#define HAVE_SNPRINTF 1
123 #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
124 #define HAVE_SOCKET 1
125 #define HAVE_SOCKETPAIR 1
126 /* #undef HAVE_SOCKET_H */
127 /* #undef HAVE_SSL_GET_ECH_STATUS */
128 /* #undef HAVE_SSL_H */
129+/* #undef HAVE_SSL_SET0_WBIO */
130 #define HAVE_STDATOMIC_H 1
131 #define HAVE_STDBOOL_H 1
132 #define HAVE_STDINT_H 1
133@@ -204,6 +209,7 @@
134 /* #undef HAVE_STRICMP */
135 #define HAVE_STRINGS_H 1
136 #define HAVE_STRING_H 1
137+#define HAVE_STROPTS_H 1
138 #define HAVE_STRTOK_R 1
139 #define HAVE_STRTOLL 1
140 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
141@@ -220,7 +226,6 @@
142 #define HAVE_SYS_STAT_H 1
143 #define HAVE_SYS_TIME_H 1
144 #define HAVE_SYS_TYPES_H 1
145-#define HAVE_SYS_UIO_H 1
146 #define HAVE_SYS_UN_H 1
147 /* #undef HAVE_SYS_UTIME_H */
148 #define HAVE_SYS_WAIT_H 1
149@@ -234,26 +239,25 @@
150 #define HAVE_UTIME_H 1
151 #define HAVE_VARIADIC_MACROS_C99 1
152 #define HAVE_VARIADIC_MACROS_GCC 1
153-/* #undef HAVE_WINCRYPT_H */
154 /* #undef HAVE_WINDOWS_H */
155-/* #undef HAVE_WINLDAP_H */
156 /* #undef HAVE_WINSOCK2_H */
157 /* #undef HAVE_WOLFSSH_SSH_H */
158 /* #undef HAVE_WOLFSSL_DES_ECB_ENCRYPT */
159+/* #undef HAVE_WOLFSSL_FULL_BIO */
160 /* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */
161 /* #undef HAVE_WOLFSSL_USEALPN */
162 #define HAVE_WRITABLE_ARGV 1
163 /* #undef HAVE_WS2TCPIP_H */
164 /* #undef HAVE_X509_H */
165-#define HAVE_ZLIB_H 1
166 /* #undef HAVE_ZSTD */
167 /* #undef HAVE_ZSTD_H */
168+/* #undef HAVE__FSEEKI64 */
169 #define LT_OBJDIR ".libs/"
170 /* #undef NEED_LBER_H */
171 /* #undef NEED_REENTRANT */
172 /* #undef NEED_THREAD_SAFE */
173-#define NTLM_WB_ENABLED 1
174-#define NTLM_WB_FILE "/usr/bin/ntlm_auth"
175+/* #undef NTLM_WB_ENABLED */
176+/* #undef NTLM_WB_FILE */
177 #define OS "oasis"
178 #define PACKAGE "curl"
179 #define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"
180@@ -263,23 +267,8 @@
181 #define PACKAGE_URL ""
182 #define PACKAGE_VERSION "-"
183 /* #undef RANDOM_FILE */
184-#define RECV_TYPE_ARG1 int
185-#define RECV_TYPE_ARG2 void *
186-#define RECV_TYPE_ARG3 size_t
187-#define RECV_TYPE_ARG4 int
188-#define RECV_TYPE_RETV ssize_t
189-#define SELECT_QUAL_ARG5
190-#define SELECT_TYPE_ARG1 int
191-#define SELECT_TYPE_ARG234 fd_set *
192-#define SELECT_TYPE_ARG5 struct timeval *
193-#define SELECT_TYPE_RETV int
194-#define SEND_QUAL_ARG2 const
195-#define SEND_TYPE_ARG1 int
196-#define SEND_TYPE_ARG2 void *
197-#define SEND_TYPE_ARG3 size_t
198-#define SEND_TYPE_ARG4 int
199-#define SEND_TYPE_RETV ssize_t
200 #define SIZEOF_CURL_OFF_T 8
201+#define SIZEOF_CURL_SOCKET_T 4
202 #define SIZEOF_INT 4
203 /* probe SIZEOF_LONG */
204 /* #undef SIZEOF_LONG_LONG */
205@@ -305,9 +294,8 @@
206 /* #undef USE_NGHTTP3 */
207 /* #undef USE_NGTCP2 */
208 /* #undef USE_NGTCP2_CRYPTO_GNUTLS */
209-/* #undef USE_NGTCP2_CRYPTO_OPENSSL */
210+/* #undef USE_NGTCP2_CRYPTO_QUICTLS */
211 /* #undef USE_NGTCP2_CRYPTO_WOLFSSL */
212-/* #undef USE_NSS */
213 /* #undef USE_OPENLDAP */
214 /* #undef USE_OPENSSL */
215 /* #undef USE_QUICHE */
216@@ -318,6 +306,7 @@
217 /* #undef USE_THREADS_WIN32 */
218 /* #undef USE_TLS_SRP */
219 #define USE_UNIX_SOCKETS 1
220+/* #undef USE_WEBSOCKETS */
221 /* #undef USE_WIN32_CRYPTO */
222 /* #undef USE_WIN32_IDN */
223 /* #undef USE_WIN32_LARGE_FILES */
224@@ -327,7 +316,6 @@
225 /* #undef USE_WOLFSSH */
226 /* #undef USE_WOLFSSL */
227 #define VERSION "-"
228-/* #undef WANT_IDN_PROTOTYPES */
229 #ifndef _ALL_SOURCE
230 /* # undef _ALL_SOURCE */
231 #endif
+32,
-43
1@@ -21,18 +21,10 @@ build('cat', '$outdir/curl_config.h', {
2 '$builddir/probe/SIZEOF_TIME_T',
3 })
4
5+-- src/include/curl/Makefile.am:/^pkginclude_HEADERS
6 pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', {
7- 'curl.h',
8- 'curlver.h',
9- 'easy.h',
10- 'mprintf.h',
11- 'stdcheaders.h',
12- 'multi.h',
13- 'typecheck-gcc.h',
14- 'system.h',
15- 'urlapi.h',
16- 'options.h',
17- 'header.h',
18+ 'curl.h', 'curlver.h', 'easy.h', 'mprintf.h', 'stdcheaders.h', 'multi.h',
19+ 'typecheck-gcc.h', 'system.h', 'urlapi.h', 'options.h', 'header.h', 'websockets.h',
20 })
21 pkg.deps = {
22 '$outdir/curl_config.h',
23@@ -45,28 +37,29 @@ pkg.deps = {
24 -- src/lib/Makefile.inc:/^CSOURCES
25 lib('libcurl.a', [[
26 lib/(
27- altsvc.c amigaos.c asyn-ares.c asyn-thread.c base64.c bufref.c
28- c-hyper.c conncache.c connect.c content_encoding.c cookie.c
29- curl_addrinfo.c curl_ctype.c curl_des.c curl_endian.c
30- curl_fnmatch.c curl_get_line.c curl_gethostname.c curl_gssapi.c
31- curl_memrchr.c curl_multibyte.c curl_ntlm_core.c curl_ntlm_wb.c
32- curl_path.c curl_range.c curl_rtmp.c curl_sasl.c curl_sspi.c
33- curl_threads.c dict.c doh.c dotdot.c dynbuf.c easy.c
34- easygetopt.c easyoptions.c escape.c file.c fileinfo.c fopen.c
35- formdata.c ftp.c ftplistparser.c getenv.c getinfo.c gopher.c
36- h2h3.c hash.c headers.c hmac.c hostasyn.c hostip.c hostip4.c
37- hostip6.c hostsyn.c hsts.c http.c http2.c http_chunks.c
38- http_digest.c http_negotiate.c http_ntlm.c http_proxy.c
39- http_aws_sigv4.c idn_win32.c if2ip.c imap.c inet_ntop.c
40- inet_pton.c krb5.c ldap.c llist.c md4.c md5.c memdebug.c mime.c
41- mprintf.c mqtt.c multi.c netrc.c nonblock.c openldap.c
42- parsedate.c pingpong.c pop3.c progress.c psl.c rand.c rename.c
43- rtsp.c select.c sendf.c setopt.c sha256.c share.c slist.c smb.c
44- smtp.c socketpair.c socks.c socks_gssapi.c socks_sspi.c
45- speedcheck.c splay.c strcase.c strdup.c strerror.c strtok.c
46- strtoofft.c system_win32.c telnet.c tftp.c timediff.c timeval.c
47- transfer.c url.c urlapi.c version.c version_win32.c warnless.c
48- wildcard.c
49+ altsvc.c amigaos.c asyn-ares.c asyn-thread.c base64.c bufq.c
50+ bufref.c c-hyper.c cf-h1-proxy.c cf-h2-proxy.c cf-haproxy.c
51+ cf-https-connect.c cf-socket.c cfilters.c conncache.c connect.c
52+ content_encoding.c cookie.c curl_addrinfo.c curl_des.c
53+ curl_endian.c curl_fnmatch.c curl_get_line.c curl_gethostname.c
54+ curl_gssapi.c curl_memrchr.c curl_multibyte.c curl_ntlm_core.c
55+ curl_ntlm_wb.c curl_path.c curl_range.c curl_rtmp.c curl_sasl.c
56+ curl_sspi.c curl_threads.c curl_trc.c dict.c doh.c dynbuf.c
57+ dynhds.c easy.c easygetopt.c easyoptions.c escape.c file.c
58+ fileinfo.c fopen.c formdata.c ftp.c ftplistparser.c getenv.c
59+ getinfo.c gopher.c hash.c headers.c hmac.c hostasyn.c hostip.c
60+ hostip4.c hostip6.c hostsyn.c hsts.c http.c http1.c http2.c
61+ http_aws_sigv4.c http_chunks.c http_digest.c http_negotiate.c
62+ http_ntlm.c http_proxy.c idn.c if2ip.c imap.c inet_ntop.c
63+ inet_pton.c krb5.c ldap.c llist.c macos.c md4.c md5.c memdebug.c
64+ mime.c mprintf.c mqtt.c multi.c netrc.c nonblock.c noproxy.c
65+ openldap.c parsedate.c pingpong.c pop3.c progress.c psl.c rand.c
66+ rename.c rtsp.c select.c sendf.c setopt.c sha256.c share.c
67+ slist.c smb.c smtp.c socketpair.c socks.c socks_gssapi.c
68+ socks_sspi.c speedcheck.c splay.c strcase.c strdup.c strerror.c
69+ strtok.c strtoofft.c system_win32.c telnet.c tftp.c timediff.c
70+ timeval.c transfer.c url.c urlapi.c version.c version_win32.c
71+ warnless.c ws.c
72 vauth/(
73 cleartext.c cram.c digest.c digest_sspi.c
74 gsasl.c krb5_gssapi.c krb5_sspi.c ntlm.c
75@@ -74,22 +67,18 @@ lib('libcurl.a', [[
76 spnego_sspi.c vauth.c
77 )
78 vtls/(
79- bearssl.c gskit.c gtls.c hostcheck.c keylog.c mbedtls.c
80- mbedtls_threadlock.c nss.c openssl.c rustls.c schannel.c
81+ bearssl.c gtls.c hostcheck.c keylog.c mbedtls.c
82+ mbedtls_threadlock.c openssl.c rustls.c schannel.c
83 schannel_verify.c sectransp.c vtls.c wolfssl.c
84 x509asn1.c
85 )
86- vquic/(msh3.c ngtcp2.c quiche.c vquic.c)
87+ vquic/(curl_msh3.c curl_ngtcp2.c curl_quiche.c vquic.c)
88 vssh/(libssh.c libssh2.c wolfssh.c)
89 )
90 $builddir/pkg/bearssl/libbearssl.a
91 $builddir/pkg/zlib/libz.a
92 ]])
93
94-build('cc', '$outdir/tool_hugehelp.c.o', {
95- '$dir/tool_hugehelp.c', '||', '$gendir/deps', '$srcdir/src/tool_hugehelp.h',
96-})
97-
98 -- src/src/Makefile.inc:/^CURL_CFILES
99 exe('curl', [[
100 src/(
101@@ -119,21 +108,21 @@ exe('curl', [[
102 tool_msgs.c
103 tool_operate.c
104 tool_operhlp.c
105- tool_panykey.c
106 tool_paramhlp.c
107 tool_parsecfg.c
108 tool_progress.c
109- tool_strdup.c
110 tool_setopt.c
111 tool_sleep.c
112+ tool_stderr.c
113+ tool_strdup.c
114 tool_urlglob.c
115 tool_util.c
116 tool_vms.c
117 tool_writeout.c
118 tool_writeout_json.c
119 tool_xattr.c
120+ var.c
121 )
122- tool_hugehelp.c.o
123 libcurl.a.d
124 ]])
125
1@@ -1,19 +1,19 @@
2-From 04afba4813f504cafb717c48c50de4395fb3ea71 Mon Sep 17 00:00:00 2001
3+From 0c83f671f4f2a1b556a2f6a0cfd664cd13b077e0 Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Fri, 16 Oct 2020 19:09:50 -0700
6 Subject: [PATCH] Reuse dynbuf symbols for curl tool
7
8 ---
9- lib/dynbuf.h | 24 +++++++++++-------------
10- 1 file changed, 11 insertions(+), 13 deletions(-)
11+ lib/dynbuf.h | 26 ++++++++++++--------------
12+ 1 file changed, 12 insertions(+), 14 deletions(-)
13
14 diff --git a/lib/dynbuf.h b/lib/dynbuf.h
15-index c1e97235d..8b9158051 100644
16+index 31a913019..deabeb0e6 100644
17 --- a/lib/dynbuf.h
18 +++ b/lib/dynbuf.h
19-@@ -24,22 +24,20 @@
20- *
21- ***************************************************************************/
22+@@ -26,23 +26,21 @@
23+
24+ #include <curl/curl.h>
25
26 -#ifndef BUILDING_LIBCURL
27 /* this renames the functions so that the tool code can use the same code
28@@ -29,22 +29,24 @@ index c1e97235d..8b9158051 100644
29 -#define Curl_dyn_len(a) curlx_dyn_len(a)
30 -#define Curl_dyn_reset(a) curlx_dyn_reset(a)
31 -#define Curl_dyn_tail(a,b) curlx_dyn_tail(a,b)
32-+#define curlx_dyn_init(a,b) Curl_dyn_init(a,b)
33-+#define curlx_dyn_add(a,b) Curl_dyn_add(a,b)
34-+#define curlx_dyn_addn(a,b,c) Curl_dyn_addn(a,b,c)
35+-#define Curl_dyn_setlen(a,b) curlx_dyn_setlen(a,b)
36++#define curlx_dyn_init Curl_dyn_init
37++#define curlx_dyn_add Curl_dyn_add
38++#define curlx_dyn_addn Curl_dyn_addn
39 +#define curlx_dyn_addf Curl_dyn_addf
40 +#define curlx_dyn_vaddf Curl_dyn_vaddf
41-+#define curlx_dyn_free(a) Curl_dyn_free(a)
42-+#define curlx_dyn_ptr(a) Curl_dyn_ptr(a)
43-+#define curlx_dyn_uptr(a) Curl_dyn_uptr(a)
44-+#define curlx_dyn_len(a) Curl_dyn_len(a)
45-+#define curlx_dyn_reset(a) Curl_dyn_reset(a)
46-+#define curlx_dyn_tail(a,b) Curl_dyn_tail(a,b)
47++#define curlx_dyn_free Curl_dyn_free
48++#define curlx_dyn_ptr Curl_dyn_ptr
49++#define curlx_dyn_uptr Curl_dyn_uptr
50++#define curlx_dyn_len Curl_dyn_len
51++#define curlx_dyn_reset Curl_dyn_reset
52++#define curlx_dyn_tail Curl_dyn_tail
53++#define curlx_dyn_setlen Curl_dyn_setlen
54 #define curlx_dynbuf dynbuf /* for the struct name */
55 -#endif
56
57 struct dynbuf {
58 char *bufr; /* point to a null-terminated allocated buffer */
59 --
60-2.35.1
61+2.42.0
62
1@@ -1,4 +1,4 @@
2-From 643bad651c570c0e2b5889df4d0cb0803fa58b1e Mon Sep 17 00:00:00 2001
3+From f91719c41ecf96fe661a3fa03b5d22b8e6d52402 Mon Sep 17 00:00:00 2001
4 From: Michael Forney <mforney@mforney.org>
5 Date: Mon, 15 Nov 2021 13:10:02 -0800
6 Subject: [PATCH] bearssl: Remove unnecessary CA blob length check
7@@ -11,10 +11,10 @@ than INT_MAX.
8 1 file changed, 3 deletions(-)
9
10 diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c
11-index f14eb66a2..ffa7c1166 100644
12+index 934149c..32d9a5b 100644
13 --- a/lib/vtls/bearssl.c
14 +++ b/lib/vtls/bearssl.c
15-@@ -129,9 +129,6 @@ static CURLcode load_cafile(struct cafile_source *source,
16+@@ -133,9 +133,6 @@ static CURLcode load_cafile(struct cafile_source *source,
17 return CURLE_SSL_CACERT_BADFILE;
18 }
19
20@@ -25,5 +25,5 @@ index f14eb66a2..ffa7c1166 100644
21 ca.in_cert = FALSE;
22 ca.anchors = NULL;
23 --
24-2.35.1
25+2.42.0
26
1@@ -0,0 +1,33 @@
2+From b69fdc6b0b1d9a594f17775e12ee237d8960b88f Mon Sep 17 00:00:00 2001
3+From: Randy Palamar <palamar@ualberta.ca>
4+Date: Sun, 15 Oct 2023 13:11:17 -0600
5+Subject: [PATCH] Reuse base64 for curl tool
6+
7+---
8+ lib/curl_base64.h | 8 +++-----
9+ 1 file changed, 3 insertions(+), 5 deletions(-)
10+
11+diff --git a/lib/curl_base64.h b/lib/curl_base64.h
12+index 7f7cd1d98..19c268549 100644
13+--- a/lib/curl_base64.h
14++++ b/lib/curl_base64.h
15+@@ -24,13 +24,11 @@
16+ *
17+ ***************************************************************************/
18+
19+-#ifndef BUILDING_LIBCURL
20+ /* this renames functions so that the tool code can use the same code
21+ without getting symbol collisions */
22+-#define Curl_base64_encode(a,b,c,d) curlx_base64_encode(a,b,c,d)
23+-#define Curl_base64url_encode(a,b,c,d) curlx_base64url_encode(a,b,c,d)
24+-#define Curl_base64_decode(a,b,c) curlx_base64_decode(a,b,c)
25+-#endif
26++#define curlx_base64_encode Curl_base64_encode
27++#define curlx_base64url_encode Curl_base64url_encode
28++#define curlx_base64_decode Curl_base64_decode
29+
30+ CURLcode Curl_base64_encode(const char *inputbuff, size_t insize,
31+ char **outptr, size_t *outlen);
32+--
33+2.42.0
34+
+1,
-1
1@@ -1 +1 @@
2-78a06f918bd5fde3c4573ef4f9806f56372b32ec1829c9ec474799eeee641c27 curl-7.85.0.tar.gz
3+816e41809c043ff285e8c0f06a75a1fa250211bbfb2dc0a037eeef39f1a9e427 curl-8.4.0.tar.gz
+0,
-3
1@@ -1,3 +0,0 @@
2-/* built-in manual is disabled, blank function */
3-#include "tool_hugehelp.h"
4-void hugehelp(void) {}
+1,
-1
1@@ -1 +1 @@
2-url = "https://curl.se/download/curl-7.85.0.tar.gz"
3+url = "https://curl.se/download/curl-8.4.0.tar.gz"
+1,
-1
1@@ -1 +1 @@
2-7.85.0 r0
3+8.4.0 r0