curl: Update to 7.80.0

8 files changed, 36 insertions, 36 deletions

diff --git a/pkg/curl/.gitignore b/pkg/curl/.gitignore
index 598f0356..e29ab438 100644
--- a/pkg/curl/.gitignore
+++ b/pkg/curl/.gitignore
@@ -1,2 +1,2 @@
-/curl-7.78.0.tar.gz
+/curl-7.80.0.tar.gz
 /src
diff --git a/pkg/curl/curl_config.h b/pkg/curl/curl_config.h
index 563e8b05..97a8479b 100644
--- a/pkg/curl/curl_config.h
+++ b/pkg/curl/curl_config.h
@@ -143,7 +143,7 @@
 #define HAVE_LONGLONG 1
 /* #undef HAVE_MACH_ABSOLUTE_TIME */
 #define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
+/* #undef HAVE_MEMORY_H */
 /* #undef HAVE_MEMRCHR */
 #define HAVE_MSG_NOSIGNAL 1
 #define HAVE_NETDB_H 1
@@ -193,8 +193,6 @@
 #define HAVE_SIGNAL 1
 #define HAVE_SIGNAL_H 1
 #define HAVE_SIGSETJMP 1
-#define HAVE_SIG_ATOMIC_T 1
-/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
 #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
 #define HAVE_SOCKET 1
 #define HAVE_SOCKETPAIR 1
@@ -204,6 +202,7 @@
 /* #undef HAVE_SSL_H */
 #define HAVE_STDBOOL_H 1
 #define HAVE_STDINT_H 1
+#define HAVE_STDIO_H 1
 #define HAVE_STDLIB_H 1
 #define HAVE_STRCASECMP 1
 /* #undef HAVE_STRCMPI */
@@ -252,7 +251,6 @@
 /* #undef HAVE_WINDOWS_H */
 /* #undef HAVE_WINLDAP_H */
 /* #undef HAVE_WINSOCK2_H */
-/* #undef HAVE_WINSOCK_H */
 /* #undef HAVE_WOLFSSH_SSH_H */
 /* #undef HAVE_WOLFSSL_DES_ECB_ENCRYPT */
 /* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */
@@ -350,9 +348,6 @@
 #ifndef _ALL_SOURCE
 /* #  undef _ALL_SOURCE */
 #endif
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
 /* #undef _FILE_OFFSET_BITS */
 /* #undef _LARGE_FILES */
 /* #undef const */
diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua
index b6cc0946..b40d72d8 100644
--- a/pkg/curl/gen.lua
+++ b/pkg/curl/gen.lua
@@ -114,6 +114,7 @@ exe('curl', [[
 		tool_helpers.c
 		tool_homedir.c
 		tool_libinfo.c
+		tool_listhelp.c
 		tool_main.c
 		tool_msgs.c
 		tool_operate.c
diff --git a/pkg/curl/patch/0002-Use-double-instead-of-long-double-for-progress-calcu.patch b/pkg/curl/patch/0002-Use-double-instead-of-long-double-for-progress-calcu.patch
deleted file mode 100644
index f4d754d5..00000000
--- a/pkg/curl/patch/0002-Use-double-instead-of-long-double-for-progress-calcu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4a4a14e99d8bdf4f25bbf60ed4f1a62f19ed3a57 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 6 Sep 2021 18:19:30 -0700
-Subject: [PATCH] Use double instead of long double for progress calculation
-
----
- lib/progress.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/progress.c b/lib/progress.c
-index 4bcd615eb..d46a3a06d 100644
---- a/lib/progress.c
-+++ b/lib/progress.c
-@@ -377,7 +377,7 @@ static curl_off_t trspeed(curl_off_t size, /* number of bytes */
- {
-   if(us < 1)
-     return size * 1000000;
--  return (curl_off_t)((long double)size/us * 1000000);
-+  return (curl_off_t)((double)size/us * 1000000);
- }
- 
- /* returns TRUE if it's time to show the progress meter */
--- 
-2.32.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
new file mode 100644
index 00000000..e72a5489
--- /dev/null
+++ b/pkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch
@@ -0,0 +1,29 @@
+From 5d080c8db49bdb91a35ad4763fcc176088214b22 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
+
+BearSSL APIs take a size_t length parameter, so unlike OpenSSL,
+there is no conversion to int and no reason to check that it's less
+than INT_MAX.
+---
+ lib/vtls/bearssl.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c
+index 9b772d064..591eb8715 100644
+--- a/lib/vtls/bearssl.c
++++ b/lib/vtls/bearssl.c
+@@ -124,9 +124,6 @@ static CURLcode load_cafile(struct cafile_source *source,
+       return CURLE_SSL_CACERT_BADFILE;
+   }
+ 
+-  if(source->type == CAFILE_SOURCE_BLOB && source->len > (size_t)INT_MAX)
+-    return CURLE_SSL_CACERT_BADFILE;
+-
+   ca.err = CURLE_OK;
+   ca.in_cert = FALSE;
+   ca.anchors = NULL;
+-- 
+2.32.0
+
diff --git a/pkg/curl/sha256 b/pkg/curl/sha256
index eecc0163..85534e5f 100644
--- a/pkg/curl/sha256
+++ b/pkg/curl/sha256
@@ -1 +1 @@
-ed936c0b02c06d42cf84b39dd12bb14b62d77c7c4e875ade022280df5dcc81d7  curl-7.78.0.tar.gz
+dab997c9b08cb4a636a03f2f7f985eaba33279c1c52692430018fae4a4878dc7  curl-7.80.0.tar.gz
diff --git a/pkg/curl/url b/pkg/curl/url
index 23b600c5..78415250 100644
--- a/pkg/curl/url
+++ b/pkg/curl/url
@@ -1 +1 @@
-url = "https://curl.se/download/curl-7.78.0.tar.gz"
+url = "https://curl.se/download/curl-7.80.0.tar.gz"
diff --git a/pkg/curl/ver b/pkg/curl/ver
index b4ce8d64..b59eaa27 100644
--- a/pkg/curl/ver
+++ b/pkg/curl/ver
@@ -1 +1 @@
-7.78.0 r1
+7.80.0 r0