Commit: e1366ef138d294b5bda663f56ed1ad4601180eff
Parent: d2582dbb39ab9a98f243890e19226a1b28f45279
Author: hovercats
Date: Fri, 2 Feb 2024 12:39:27 +0100
curl: 8.14.1
Drop man page for now. It's no longer distributed, but we'll
eventually need to switch to our own branch, so we can just track
it there when we do.
Diffstat:
11 files changed, 126 insertions(+), 191 deletions(-)
diff --git a/dist/.gitignore b/dist/.gitignore
@@ -1,4 +1,4 @@
-/curl-8.5.0.tar.gz
+/curl-8.14.1.tar.gz
/git-manpages-2.49.0.tar.gz
/hyx-2026.01.11.tar.xz
/less-643.tar.gz
diff --git a/pkg/curl/README.md b/pkg/curl/README.md
@@ -8,6 +8,7 @@ Generated with
--disable-smb \
--with-ca-bundle=/etc/ssl/cert.pem \
--with-bearssl \
+ --without-libpsl \
CPPFLAGS='-I/src/oasis/out/pkg/bearssl/include -I/src/oasis/out/pkg/zlib/include' \
LDFLAGS='-L/src/oasis/out/pkg/bearssl -L/src/oasis/out/pkg/zlib'
diff --git a/pkg/curl/curl_config.h b/pkg/curl/curl_config.h
@@ -1,13 +1,14 @@
-/* #undef CURLDEBUG */
#define CURL_CA_BUNDLE "/etc/ssl/cert.pem"
/* #undef CURL_CA_FALLBACK */
/* #undef CURL_CA_PATH */
+/* #undef CURL_CA_SEARCH_SAFE */
/* #undef CURL_DEFAULT_SSL_BACKEND */
/* #undef CURL_DISABLE_ALTSVC */
/* #undef CURL_DISABLE_AWS */
/* #undef CURL_DISABLE_BASIC_AUTH */
/* #undef CURL_DISABLE_BEARER_AUTH */
/* #undef CURL_DISABLE_BINDLOCAL */
+/* #undef CURL_DISABLE_CA_SEARCH */
/* #undef CURL_DISABLE_COOKIES */
/* #undef CURL_DISABLE_DICT */
/* #undef CURL_DISABLE_DIGEST_AUTH */
@@ -22,6 +23,7 @@
/* #undef CURL_DISABLE_HTTP */
/* #undef CURL_DISABLE_HTTP_AUTH */
/* #undef CURL_DISABLE_IMAP */
+/* #undef CURL_DISABLE_IPFS */
/* #undef CURL_DISABLE_KERBEROS_AUTH */
#define CURL_DISABLE_LDAP 1
#define CURL_DISABLE_LDAPS 1
@@ -37,6 +39,7 @@
/* #undef CURL_DISABLE_PROGRESS_METER */
/* #undef CURL_DISABLE_PROXY */
/* #undef CURL_DISABLE_RTSP */
+/* #undef CURL_DISABLE_SHA512_256 */
/* #undef CURL_DISABLE_SHUFFLE_DNS */
#define CURL_DISABLE_SMB 1
/* #undef CURL_DISABLE_SMTP */
@@ -44,12 +47,13 @@
/* #undef CURL_DISABLE_TELNET */
/* #undef CURL_DISABLE_TFTP */
/* #undef CURL_DISABLE_VERBOSE_STRINGS */
-#define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default")))
-#define CURL_SA_FAMILY_T sa_family_t
+/* #undef CURL_DISABLE_WEBSOCKETS */
+#define CURL_EXTERN_SYMBOL __attribute__((__visibility__("default")))
+#define CURL_OS "oasis"
/* #undef CURL_WITH_MULTI_SSL */
-/* #undef DEBUGBUILD */
-#define ENABLE_IPV6 1
#define GETHOSTNAME_TYPE_ARG2 size_t
+#define HAVE_ACCEPT4 1
+/* #undef HAVE_ADDRESS_FAMILY */
#define HAVE_ALARM 1
/* #undef HAVE_ARC4RANDOM */
#define HAVE_ARPA_INET_H 1
@@ -63,12 +67,10 @@
#define HAVE_CLOCK_GETTIME_MONOTONIC_RAW 1
/* #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_DIRENT_H 1
#define HAVE_DLFCN_H 1
-/* #undef HAVE_ERR_H */
+#define HAVE_EVENTFD 1
#define HAVE_FCNTL 1
#define HAVE_FCNTL_H 1
#define HAVE_FCNTL_O_NONBLOCK 1
@@ -82,7 +84,6 @@
#define HAVE_GETADDRINFO 1
#define HAVE_GETADDRINFO_THREADSAFE 1
#define HAVE_GETEUID 1
-#define HAVE_GETHOSTBYNAME 1
#define HAVE_GETHOSTBYNAME_R 1
/* #undef HAVE_GETHOSTBYNAME_R_3 */
/* #undef HAVE_GETHOSTBYNAME_R_5 */
@@ -105,16 +106,12 @@
/* #undef HAVE_GSSAPI_GSSAPI_H */
/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */
/* #undef HAVE_GSSGNU */
-/* #undef HAVE_GSSHEIMDAL */
-/* #undef HAVE_GSSMIT */
-/* #undef HAVE_HYPER_H */
/* #undef HAVE_IDN2_H */
#define HAVE_IFADDRS_H 1
#define HAVE_IF_NAMETOINDEX 1
#define HAVE_INET_NTOP 1
#define HAVE_INET_PTON 1
#define HAVE_INTTYPES_H 1
-#define HAVE_IOCTL 1
/* #undef HAVE_IOCTLSOCKET */
/* #undef HAVE_IOCTLSOCKET_CAMEL */
/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */
@@ -131,7 +128,7 @@
/* #undef HAVE_LIBBROTLIDEC */
#define HAVE_LIBGEN_H 1
/* #undef HAVE_LIBIDN2 */
-/* #undef HAVE_LIBRESSL */
+/* #undef HAVE_LIBPSL_H */
/* #undef HAVE_LIBRTMP_RTMP_H */
/* #undef HAVE_LIBSSH */
/* #undef HAVE_LIBSSH2 */
@@ -143,7 +140,7 @@
#define HAVE_LOCALE_H 1
#define HAVE_LONGLONG 1
/* #undef HAVE_MACH_ABSOLUTE_TIME */
-/* #undef HAVE_MEMRCHR */
+#define HAVE_MEMRCHR 1
#define HAVE_MSG_NOSIGNAL 1
/* #undef HAVE_MSH3_H */
#define HAVE_NETDB_H 1
@@ -157,7 +154,7 @@
/* #undef HAVE_NGTCP2_NGTCP2_CRYPTO_H */
/* #undef HAVE_NGTCP2_NGTCP2_H */
/* #undef HAVE_OLD_GSSMIT */
-/* #undef HAVE_OPENSSL3 */
+#define HAVE_OPENDIR 1
/* #undef HAVE_OPENSSL_CRYPTO_H */
/* #undef HAVE_OPENSSL_ERR_H */
/* #undef HAVE_OPENSSL_PEM_H */
@@ -165,9 +162,9 @@
/* #undef HAVE_OPENSSL_SRP */
/* #undef HAVE_OPENSSL_SSL_H */
/* #undef HAVE_OPENSSL_X509_H */
-/* #undef HAVE_PEM_H */
#define HAVE_PIPE 1
-#define HAVE_POLL_FINE 1
+#define HAVE_PIPE2 1
+#define HAVE_POLL 1
#define HAVE_POLL_H 1
#define HAVE_POSIX_STRERROR_R 1
/* #undef HAVE_PROTO_BSDSOCKET_H */
@@ -175,13 +172,14 @@
#define HAVE_PWD_H 1
/* #undef HAVE_QUICHE_CONN_SET_QLOG_FD */
/* #undef HAVE_QUICHE_H */
+#define HAVE_REALPATH 1
#define HAVE_RECV 1
-/* #undef HAVE_RSA_H */
+#define HAVE_SA_FAMILY_T 1
#define HAVE_SCHED_YIELD 1
#define HAVE_SELECT 1
#define HAVE_SEND 1
+#define HAVE_SENDMMSG 1
#define HAVE_SENDMSG 1
-#define HAVE_SETJMP_H 1
#define HAVE_SETLOCALE 1
/* #undef HAVE_SETMODE */
#define HAVE_SETRLIMIT 1
@@ -193,10 +191,10 @@
#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
#define HAVE_SOCKET 1
#define HAVE_SOCKETPAIR 1
-/* #undef HAVE_SOCKET_H */
-/* #undef HAVE_SSL_GET_ECH_STATUS */
-/* #undef HAVE_SSL_H */
/* #undef HAVE_SSL_SET0_WBIO */
+/* #undef HAVE_SSL_SET1_ECH_CONFIG_LIST */
+/* #undef HAVE_SSL_SET_QUIC_TLS_CBS */
+/* #undef HAVE_SSL_SET_QUIC_USE_LEGACY_CODEPOINT */
#define HAVE_STDATOMIC_H 1
#define HAVE_STDBOOL_H 1
#define HAVE_STDINT_H 1
@@ -210,11 +208,10 @@
#define HAVE_STRINGS_H 1
#define HAVE_STRING_H 1
#define HAVE_STROPTS_H 1
-#define HAVE_STRTOK_R 1
-#define HAVE_STRTOLL 1
#define HAVE_STRUCT_SOCKADDR_STORAGE 1
#define HAVE_STRUCT_TIMEVAL 1
#define HAVE_SUSECONDS_T 1
+#define HAVE_SYS_EVENTFD_H 1
/* #undef HAVE_SYS_FILIO_H */
#define HAVE_SYS_IOCTL_H 1
#define HAVE_SYS_PARAM_H 1
@@ -228,35 +225,33 @@
#define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_UN_H 1
/* #undef HAVE_SYS_UTIME_H */
-#define HAVE_SYS_WAIT_H 1
#define HAVE_SYS_XATTR_H 1
#define HAVE_TERMIOS_H 1
/* #undef HAVE_TERMIO_H */
/* #undef HAVE_TIME_T_UNSIGNED */
+/* #undef HAVE_UNICODE_UIDNA_H */
#define HAVE_UNISTD_H 1
#define HAVE_UTIME 1
#define HAVE_UTIMES 1
#define HAVE_UTIME_H 1
-/* #undef HAVE_WINDOWS_H */
-/* #undef HAVE_WINSOCK2_H */
+/* #undef HAVE_UV_H */
/* #undef HAVE_WOLFSSH_SSH_H */
+/* #undef HAVE_WOLFSSL_BIO_NEW */
+/* #undef HAVE_WOLFSSL_BIO_SET_SHUTDOWN */
+/* #undef HAVE_WOLFSSL_CTX_GENERATEECHCONFIG */
/* #undef HAVE_WOLFSSL_DES_ECB_ENCRYPT */
-/* #undef HAVE_WOLFSSL_FULL_BIO */
/* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */
+/* #undef HAVE_WOLFSSL_SET_QUIC_USE_LEGACY_CODEPOINT */
/* #undef HAVE_WOLFSSL_USEALPN */
#define HAVE_WRITABLE_ARGV 1
-/* #undef HAVE_WS2TCPIP_H */
-/* #undef HAVE_X509_H */
/* #undef HAVE_ZSTD */
/* #undef HAVE_ZSTD_H */
-/* #undef HAVE__FSEEKI64 */
+/* #undef HAVE__SETMODE */
#define LT_OBJDIR ".libs/"
/* #undef NEED_LBER_H */
/* #undef NEED_REENTRANT */
/* #undef NEED_THREAD_SAFE */
-/* #undef NTLM_WB_ENABLED */
-/* #undef NTLM_WB_FILE */
-#define OS "oasis"
+/* #undef OPENSSL_QUIC_API2 */
#define PACKAGE "curl"
#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"
#define PACKAGE_NAME "curl"
@@ -264,7 +259,6 @@
#define PACKAGE_TARNAME "curl"
#define PACKAGE_URL ""
#define PACKAGE_VERSION "-"
-/* #undef RANDOM_FILE */
#define SIZEOF_CURL_OFF_T 8
#define SIZEOF_CURL_SOCKET_T 4
#define SIZEOF_INT 4
@@ -275,41 +269,41 @@
/* probe SIZEOF_TIME_T */
#define STDC_HEADERS 1
/* #undef USE_AMISSL */
+/* #undef USE_APPLE_IDN */
/* #undef USE_ARES */
#define USE_BEARSSL 1
/* #undef USE_ECH */
/* #undef USE_GNUTLS */
/* #undef USE_GSASL */
-/* #undef USE_HYPER */
+/* #undef USE_HTTPSRR */
+#define USE_IPV6 1
/* #undef USE_LIBPSL */
/* #undef USE_LIBRTMP */
/* #undef USE_LIBSSH */
/* #undef USE_LIBSSH2 */
-/* #undef USE_MANUAL */
+/* #undef USE_LIBUV */
/* #undef USE_MBEDTLS */
/* #undef USE_MSH3 */
/* #undef USE_NGHTTP2 */
/* #undef USE_NGHTTP3 */
/* #undef USE_NGTCP2 */
-/* #undef USE_NGTCP2_CRYPTO_GNUTLS */
-/* #undef USE_NGTCP2_CRYPTO_QUICTLS */
-/* #undef USE_NGTCP2_CRYPTO_WOLFSSL */
/* #undef USE_OPENLDAP */
/* #undef USE_OPENSSL */
+/* #undef USE_OPENSSL_QUIC */
/* #undef USE_QUICHE */
/* #undef USE_RUSTLS */
/* #undef USE_SCHANNEL */
/* #undef USE_SECTRANSP */
+/* #undef USE_SSLS_EXPORT */
#define USE_THREADS_POSIX 1
/* #undef USE_THREADS_WIN32 */
/* #undef USE_TLS_SRP */
#define USE_UNIX_SOCKETS 1
-/* #undef USE_WEBSOCKETS */
+/* #undef USE_WATT32 */
/* #undef USE_WIN32_CRYPTO */
/* #undef USE_WIN32_IDN */
/* #undef USE_WIN32_LARGE_FILES */
/* #undef USE_WIN32_LDAP */
-/* #undef USE_WIN32_SMALL_FILES */
/* #undef USE_WINDOWS_SSPI */
/* #undef USE_WOLFSSH */
/* #undef USE_WOLFSSL */
@@ -320,9 +314,5 @@
/* #undef _FILE_OFFSET_BITS */
/* #undef _LARGE_FILES */
/* #undef const */
-/* #undef in_addr_t */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
/* #undef size_t */
/* #undef ssize_t */
diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua
@@ -1,6 +1,6 @@
-cflags({
+cflags{
'-std=c99', '-Wall', '-Wpedantic', '-Wno-maybe-uninitialized',
- '-D _DEFAULT_SOURCE',
+ '-D _GNU_SOURCE',
'-D HAVE_CONFIG_H',
'-D BUILDING_LIBCURL',
'-D CURL_STATICLIB',
@@ -8,11 +8,12 @@ cflags({
'-I $outdir/include/curl',
'-I $outdir/include',
'-I $srcdir/lib',
+ '-I $srcdir/lib/curlx',
'-I $srcdir/src',
'-isystem $builddir/pkg/bearssl/include',
'-isystem $builddir/pkg/linux-headers/include',
'-isystem $builddir/pkg/zlib/include',
-})
+}
build('cat', '$outdir/curl_config.h', {
'$dir/curl_config.h',
@@ -40,11 +41,10 @@ lib('libcurl.a', [[
altsvc.c
amigaos.c
asyn-ares.c
- asyn-thread.c
- base64.c
+ asyn-base.c
+ asyn-thrdd.c
bufq.c
bufref.c
- c-hyper.c
cf-h1-proxy.c
cf-h2-proxy.c
cf-haproxy.c
@@ -55,6 +55,7 @@ lib('libcurl.a', [[
connect.c
content_encoding.c
cookie.c
+ cshutdn.c
curl_addrinfo.c
curl_des.c
curl_endian.c
@@ -63,24 +64,24 @@ lib('libcurl.a', [[
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_sha512_256.c
curl_sspi.c
curl_threads.c
curl_trc.c
+ cw-out.c
+ cw-pause.c
dict.c
doh.c
- dynbuf.c
dynhds.c
easy.c
easygetopt.c
easyoptions.c
escape.c
+ fake_addrinfo.c
file.c
fileinfo.c
fopen.c
@@ -93,11 +94,9 @@ lib('libcurl.a', [[
hash.c
headers.c
hmac.c
- hostasyn.c
hostip.c
hostip4.c
hostip6.c
- hostsyn.c
hsts.c
http.c
http1.c
@@ -108,11 +107,11 @@ lib('libcurl.a', [[
http_negotiate.c
http_ntlm.c
http_proxy.c
+ httpsrr.c
idn.c
if2ip.c
imap.c
inet_ntop.c
- inet_pton.c
krb5.c
ldap.c
llist.c
@@ -124,8 +123,8 @@ lib('libcurl.a', [[
mprintf.c
mqtt.c
multi.c
+ multi_ev.c
netrc.c
- nonblock.c
noproxy.c
openldap.c
parsedate.c
@@ -135,6 +134,7 @@ lib('libcurl.a', [[
psl.c
rand.c
rename.c
+ request.c
rtsp.c
select.c
sendf.c
@@ -152,21 +152,33 @@ lib('libcurl.a', [[
splay.c
strcase.c
strdup.c
+ strequal.c
strerror.c
- strtok.c
- strtoofft.c
system_win32.c
telnet.c
tftp.c
- timediff.c
- timeval.c
transfer.c
+ uint-bset.c
+ uint-hash.c
+ uint-spbset.c
+ uint-table.c
url.c
urlapi.c
version.c
- version_win32.c
- warnless.c
ws.c
+ curlx/(
+ base64.c
+ dynbuf.c
+ inet_pton.c
+ multibyte.c
+ nonblock.c
+ strparse.c
+ timediff.c
+ timeval.c
+ version_win32.c
+ warnless.c
+ winapi.c
+ )
vauth/(
cleartext.c
cram.c
@@ -184,6 +196,7 @@ lib('libcurl.a', [[
)
vtls/(
bearssl.c
+ cipher_suite.c
gtls.c
hostcheck.c
keylog.c
@@ -195,11 +208,25 @@ lib('libcurl.a', [[
schannel_verify.c
sectransp.c
vtls.c
+ vtls_scache.c
+ vtls_spack.c
wolfssl.c
x509asn1.c
)
- vquic/(curl_msh3.c curl_ngtcp2.c curl_quiche.c vquic.c)
- vssh/(libssh.c libssh2.c wolfssh.c)
+ vquic/(
+ curl_msh3.c
+ curl_ngtcp2.c
+ curl_osslq.c
+ curl_quiche.c
+ vquic.c
+ vquic-tls.c
+ )
+ vssh/(
+ libssh.c
+ libssh2.c
+ curl_path.c
+ wolfssh.c
+ )
)
$builddir/pkg/bearssl/libbearssl.a
$builddir/pkg/zlib/libz.a
@@ -208,14 +235,16 @@ lib('libcurl.a', [[
-- src/src/Makefile.inc:/^CURL_CFILES
exe('curl', [[
src/(
+ config2setopts.c
slist_wc.c
- tool_binmode.c
+ terminal.c
tool_bname.c
tool_cb_dbg.c
tool_cb_hdr.c
tool_cb_prg.c
tool_cb_rea.c
tool_cb_see.c
+ tool_cb_soc.c
tool_cb_wrt.c
tool_cfgable.c
tool_dirhie.c
@@ -240,6 +269,7 @@ exe('curl', [[
tool_progress.c
tool_setopt.c
tool_sleep.c
+ tool_ssls.c
tool_stderr.c
tool_strdup.c
tool_urlglob.c
@@ -254,6 +284,5 @@ exe('curl', [[
]])
file('bin/curl', '755', '$outdir/curl')
-man({'docs/curl.1'})
-fetch('curl')
+fetch 'curl'
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
@@ -1,52 +0,0 @@
-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 | 26 ++++++++++++--------------
- 1 file changed, 12 insertions(+), 14 deletions(-)
-
-diff --git a/lib/dynbuf.h b/lib/dynbuf.h
-index 31a913019..deabeb0e6 100644
---- a/lib/dynbuf.h
-+++ b/lib/dynbuf.h
-@@ -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
- without getting symbol collisions */
--#define Curl_dyn_init(a,b) curlx_dyn_init(a,b)
--#define Curl_dyn_add(a,b) curlx_dyn_add(a,b)
--#define Curl_dyn_addn(a,b,c) curlx_dyn_addn(a,b,c)
--#define Curl_dyn_addf curlx_dyn_addf
--#define Curl_dyn_vaddf curlx_dyn_vaddf
--#define Curl_dyn_free(a) curlx_dyn_free(a)
--#define Curl_dyn_ptr(a) curlx_dyn_ptr(a)
--#define Curl_dyn_uptr(a) curlx_dyn_uptr(a)
--#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 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 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.42.0
-
diff --git a/pkg/curl/patch/0001-bearssl-Remove-unnecessary-CA-blob-length-check.patch b/pkg/curl/patch/0001-bearssl-Remove-unnecessary-CA-blob-length-check.patch
@@ -0,0 +1,29 @@
+From e81451b1773b64d19392a4802b178b7b0f325b2a 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 4b65244..0590d91 100644
+--- a/lib/vtls/bearssl.c
++++ b/lib/vtls/bearssl.c
+@@ -135,9 +135,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.49.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
@@ -1,29 +0,0 @@
-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
-
-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 934149c..32d9a5b 100644
---- a/lib/vtls/bearssl.c
-+++ b/lib/vtls/bearssl.c
-@@ -133,9 +133,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.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
@@ -1,33 +0,0 @@
-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
-
diff --git a/pkg/curl/sha256 b/pkg/curl/sha256
@@ -1 +1 @@
-05fc17ff25b793a437a0906e0484b82172a9f4de02be5ed447e0cab8c3475add curl-8.5.0.tar.gz
+6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4 curl-8.14.1.tar.gz
diff --git a/pkg/curl/url b/pkg/curl/url
@@ -1 +1 @@
-url = "https://curl.se/download/curl-8.5.0.tar.gz"
+url = "https://curl.se/download/curl-8.14.1.tar.gz"
diff --git a/pkg/curl/ver b/pkg/curl/ver
@@ -1 +1 @@
-8.5.0 r0
+8.14.1 r1