curl: update to 8.4.0

1 files changed, 32 insertions, 43 deletions

diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua
index 1b1d2d10..41614655 100644
--- a/pkg/curl/gen.lua
+++ b/pkg/curl/gen.lua
@@ -21,18 +21,10 @@ build('cat', '$outdir/curl_config.h', {
 	'$builddir/probe/SIZEOF_TIME_T',
 })
 
+-- src/include/curl/Makefile.am:/^pkginclude_HEADERS
 pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', {
-	'curl.h',
-	'curlver.h',
-	'easy.h',
-	'mprintf.h',
-	'stdcheaders.h',
-	'multi.h',
-	'typecheck-gcc.h',
-	'system.h',
-	'urlapi.h',
-	'options.h',
-	'header.h',
+	'curl.h', 'curlver.h', 'easy.h', 'mprintf.h', 'stdcheaders.h', 'multi.h',
+	'typecheck-gcc.h', 'system.h', 'urlapi.h', 'options.h', 'header.h', 'websockets.h',
 })
 pkg.deps = {
 	'$outdir/curl_config.h',
@@ -45,28 +37,29 @@ pkg.deps = {
 -- src/lib/Makefile.inc:/^CSOURCES
 lib('libcurl.a', [[
 	lib/(
-		altsvc.c amigaos.c asyn-ares.c asyn-thread.c base64.c bufref.c
-		c-hyper.c conncache.c connect.c content_encoding.c cookie.c
-		curl_addrinfo.c curl_ctype.c curl_des.c curl_endian.c
-		curl_fnmatch.c curl_get_line.c curl_gethostname.c curl_gssapi.c
-		curl_memrchr.c curl_multibyte.c curl_ntlm_core.c curl_ntlm_wb.c
-		curl_path.c curl_range.c curl_rtmp.c curl_sasl.c curl_sspi.c
-		curl_threads.c dict.c doh.c dotdot.c dynbuf.c easy.c
-		easygetopt.c easyoptions.c escape.c file.c fileinfo.c fopen.c
-		formdata.c ftp.c ftplistparser.c getenv.c getinfo.c gopher.c
-		h2h3.c hash.c headers.c hmac.c hostasyn.c hostip.c hostip4.c
-		hostip6.c hostsyn.c hsts.c http.c http2.c http_chunks.c
-		http_digest.c http_negotiate.c http_ntlm.c http_proxy.c
-		http_aws_sigv4.c idn_win32.c if2ip.c imap.c inet_ntop.c
-		inet_pton.c krb5.c ldap.c llist.c md4.c md5.c memdebug.c mime.c
-		mprintf.c mqtt.c multi.c netrc.c nonblock.c openldap.c
-		parsedate.c pingpong.c pop3.c progress.c psl.c rand.c rename.c
-		rtsp.c select.c sendf.c setopt.c sha256.c share.c slist.c smb.c
-		smtp.c socketpair.c socks.c socks_gssapi.c socks_sspi.c
-		speedcheck.c splay.c strcase.c strdup.c strerror.c strtok.c
-		strtoofft.c system_win32.c telnet.c tftp.c timediff.c timeval.c
-		transfer.c url.c urlapi.c version.c version_win32.c warnless.c
-		wildcard.c
+		altsvc.c amigaos.c asyn-ares.c asyn-thread.c base64.c bufq.c
+		bufref.c c-hyper.c cf-h1-proxy.c cf-h2-proxy.c cf-haproxy.c
+		cf-https-connect.c cf-socket.c cfilters.c conncache.c connect.c
+		content_encoding.c cookie.c curl_addrinfo.c curl_des.c
+		curl_endian.c curl_fnmatch.c curl_get_line.c curl_gethostname.c
+		curl_gssapi.c curl_memrchr.c curl_multibyte.c curl_ntlm_core.c
+		curl_ntlm_wb.c curl_path.c curl_range.c curl_rtmp.c curl_sasl.c
+		curl_sspi.c curl_threads.c curl_trc.c dict.c doh.c dynbuf.c
+		dynhds.c easy.c easygetopt.c easyoptions.c escape.c file.c
+		fileinfo.c fopen.c formdata.c ftp.c ftplistparser.c getenv.c
+		getinfo.c gopher.c hash.c headers.c hmac.c hostasyn.c hostip.c
+		hostip4.c hostip6.c hostsyn.c hsts.c http.c http1.c http2.c
+		http_aws_sigv4.c http_chunks.c http_digest.c http_negotiate.c
+		http_ntlm.c http_proxy.c idn.c if2ip.c imap.c inet_ntop.c
+		inet_pton.c krb5.c ldap.c llist.c macos.c md4.c md5.c memdebug.c
+		mime.c mprintf.c mqtt.c multi.c netrc.c nonblock.c noproxy.c
+		openldap.c parsedate.c pingpong.c pop3.c progress.c psl.c rand.c
+		rename.c rtsp.c select.c sendf.c setopt.c sha256.c share.c
+		slist.c smb.c smtp.c socketpair.c socks.c socks_gssapi.c
+		socks_sspi.c speedcheck.c splay.c strcase.c strdup.c strerror.c
+		strtok.c strtoofft.c system_win32.c telnet.c tftp.c timediff.c
+		timeval.c transfer.c url.c urlapi.c version.c version_win32.c
+		warnless.c ws.c
 		vauth/(
 			cleartext.c cram.c digest.c digest_sspi.c
 			gsasl.c krb5_gssapi.c krb5_sspi.c ntlm.c
@@ -74,22 +67,18 @@ lib('libcurl.a', [[
 			spnego_sspi.c vauth.c
 		)
 		vtls/(
-			bearssl.c gskit.c gtls.c hostcheck.c keylog.c mbedtls.c
-			mbedtls_threadlock.c nss.c openssl.c rustls.c schannel.c
+			bearssl.c gtls.c hostcheck.c keylog.c mbedtls.c
+			mbedtls_threadlock.c openssl.c rustls.c schannel.c
 			schannel_verify.c sectransp.c vtls.c wolfssl.c
 			x509asn1.c
 		)
-		vquic/(msh3.c ngtcp2.c quiche.c vquic.c)
+		vquic/(curl_msh3.c curl_ngtcp2.c curl_quiche.c vquic.c)
 		vssh/(libssh.c libssh2.c wolfssh.c)
 	)
 	$builddir/pkg/bearssl/libbearssl.a
 	$builddir/pkg/zlib/libz.a
 ]])
 
-build('cc', '$outdir/tool_hugehelp.c.o', {
-	'$dir/tool_hugehelp.c', '||', '$gendir/deps', '$srcdir/src/tool_hugehelp.h',
-})
-
 -- src/src/Makefile.inc:/^CURL_CFILES
 exe('curl', [[
 	src/(
@@ -119,21 +108,21 @@ exe('curl', [[
 		tool_msgs.c
 		tool_operate.c
 		tool_operhlp.c
-		tool_panykey.c
 		tool_paramhlp.c
 		tool_parsecfg.c
 		tool_progress.c
-		tool_strdup.c
 		tool_setopt.c
 		tool_sleep.c
+		tool_stderr.c
+		tool_strdup.c
 		tool_urlglob.c
 		tool_util.c
 		tool_vms.c
 		tool_writeout.c
 		tool_writeout_json.c
 		tool_xattr.c
+		var.c
 	)
-	tool_hugehelp.c.o
 	libcurl.a.d
 ]])