Commit: 4f9dab9d0d33ae4f83f096625a5cc5528f75b903
Parent: 8eb4a9c34e7e479f3a90640ef23479ead7b9ca22
Author: Michael Forney
Date: Mon, 1 Jan 2024 13:50:46 -0800
curl: Update to 8.5.0
Diffstat:
9 files changed, 27 insertions(+), 64 deletions(-)
diff --git a/pkg/net/curl/.gitignore b/pkg/net/curl/.gitignore
@@ -1,2 +1,2 @@
-/curl-8.4.0.tar.gz
+/curl-8.5.0.tar.gz
/src
diff --git a/pkg/net/curl/curl_config.h b/pkg/net/curl/curl_config.h
@@ -64,11 +64,11 @@
/* #undef HAVE_CLOSESOCKET */
/* #undef HAVE_CLOSESOCKET_CAMEL */
/* #undef HAVE_CRYPTO_H */
+#define HAVE_DECL_FSEEKO 1
#define HAVE_DECL_GETPWUID_R 1
/* #undef HAVE_DECL_GETPWUID_R_MISSING */
#define HAVE_DLFCN_H 1
/* #undef HAVE_ERR_H */
-#define HAVE_FCHMOD 1
#define HAVE_FCNTL 1
#define HAVE_FCNTL_H 1
#define HAVE_FCNTL_O_NONBLOCK 1
@@ -237,8 +237,6 @@
#define HAVE_UTIME 1
#define HAVE_UTIMES 1
#define HAVE_UTIME_H 1
-#define HAVE_VARIADIC_MACROS_C99 1
-#define HAVE_VARIADIC_MACROS_GCC 1
/* #undef HAVE_WINDOWS_H */
/* #undef HAVE_WINSOCK2_H */
/* #undef HAVE_WOLFSSH_SSH_H */
diff --git a/pkg/net/curl/gen.lua b/pkg/net/curl/gen.lua
@@ -21,24 +21,13 @@ build('cat', '$outdir/curl_config.h', {
'$builddir/probe/SIZEOF_TIME_T',
})
-build('touch', '$outdir/include/curl/websockets.h')
-
+-- src/include/curl/Makefile.am:/^pkginclude_HEADERS
pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', {
- 'curl.h',
- 'curlver.h',
- 'easy.h',
- 'header.h',
- 'mprintf.h',
- 'multi.h',
- 'options.h',
- 'stdcheaders.h',
- 'system.h',
- 'typecheck-gcc.h',
- 'urlapi.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',
- '$outdir/include/curl/websockets.h',
'$gendir/headers',
'pkg/libs/bearssl/headers',
'pkg/devel/linux-headers/headers',
@@ -113,6 +102,7 @@ exe('curl', [[
tool_getpass.c
tool_help.c
tool_helpers.c
+ tool_ipfs.c
tool_libinfo.c
tool_listhelp.c
tool_main.c
diff --git a/pkg/net/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch b/pkg/net/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch
@@ -1,6 +1,6 @@
-From 78a6d851168c533469e8e22f210ba1654d377a78 Mon Sep 17 00:00:00 2001
+From 0c83f671f4f2a1b556a2f6a0cfd664cd13b077e0 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
-Date: Sun, 15 Oct 2023 08:33:50 -0600
+Date: Fri, 16 Oct 2020 19:09:50 -0700
Subject: [PATCH] Reuse dynbuf symbols for curl tool
---
@@ -8,7 +8,7 @@ Subject: [PATCH] Reuse dynbuf symbols for curl tool
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/lib/dynbuf.h b/lib/dynbuf.h
-index 31a9130..507f5f5 100644
+index 31a913019..deabeb0e6 100644
--- a/lib/dynbuf.h
+++ b/lib/dynbuf.h
@@ -26,23 +26,21 @@
@@ -30,18 +30,18 @@ index 31a9130..507f5f5 100644
-#define Curl_dyn_reset(a) curlx_dyn_reset(a)
-#define Curl_dyn_tail(a,b) curlx_dyn_tail(a,b)
-#define Curl_dyn_setlen(a,b) curlx_dyn_setlen(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 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_setlen(a,b) Curl_dyn_setlen(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
diff --git a/pkg/net/curl/patch/0003-Reuse-base64-for-curl-tool.patch b/pkg/net/curl/patch/0003-Reuse-base64-for-curl-tool.patch
@@ -1,4 +1,4 @@
-From 82e6a93c229a40c8fdb2f0289bfc5aad83e69bc1 Mon Sep 17 00:00:00 2001
+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
@@ -8,7 +8,7 @@ Subject: [PATCH] Reuse base64 for curl tool
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib/curl_base64.h b/lib/curl_base64.h
-index 7f7cd1d..e6958d9 100644
+index 7f7cd1d98..19c268549 100644
--- a/lib/curl_base64.h
+++ b/lib/curl_base64.h
@@ -24,13 +24,11 @@
@@ -22,9 +22,9 @@ index 7f7cd1d..e6958d9 100644
-#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(a,b,c,d) Curl_base64_encode(a,b,c,d)
-+#define curlx_base64url_encode(a,b,c,d) Curl_base64url_encode(a,b,c,d)
-+#define curlx_base64_decode(a,b,c) Curl_base64_decode(a,b,c)
++#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);
diff --git a/pkg/net/curl/patch/0004-HACK-manually-expand-broken-macro.patch b/pkg/net/curl/patch/0004-HACK-manually-expand-broken-macro.patch
@@ -1,25 +0,0 @@
-From e5088b6fecc4897180f601d736c46093a834a162 Mon Sep 17 00:00:00 2001
-From: Randy Palamar <palamar@ualberta.ca>
-Date: Sun, 15 Oct 2023 13:08:51 -0600
-Subject: [PATCH] HACK: manually expand broken macro
-
----
- src/tool_setopt.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tool_setopt.c b/src/tool_setopt.c
-index de3b78f..774f34d 100644
---- a/src/tool_setopt.c
-+++ b/src/tool_setopt.c
-@@ -222,7 +222,7 @@ static char *c_escape(const char *str, curl_off_t len)
- cutoff = 3;
- }
-
-- result = curlx_dyn_addn(&escaped, STRCONST(""));
-+ result = curlx_dyn_addn(&escaped, "", sizeof("") - 1);
- for(s = str; !result && len; s++, len--) {
- /* escape question marks as well, to prevent generating accidental
- trigraphs */
---
-2.42.0
-
diff --git a/pkg/net/curl/sha256 b/pkg/net/curl/sha256
@@ -1 +1 @@
-816e41809c043ff285e8c0f06a75a1fa250211bbfb2dc0a037eeef39f1a9e427 curl-8.4.0.tar.gz
+05fc17ff25b793a437a0906e0484b82172a9f4de02be5ed447e0cab8c3475add curl-8.5.0.tar.gz
diff --git a/pkg/net/curl/url b/pkg/net/curl/url
@@ -1 +1 @@
-url = "https://curl.se/download/curl-8.4.0.tar.gz"
+url = "https://curl.se/download/curl-8.5.0.tar.gz"
diff --git a/pkg/net/curl/ver b/pkg/net/curl/ver
@@ -1 +1 @@
-8.4.0 r0
+8.5.0 r0