logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 63490ce27818d1b7985d851fb1ee19eaa4d71f37
parent 1fa0f436fb58f6804f63668262c34b8f7046fb6d
Author: Michael Forney <mforney@mforney.org>
Date:   Thu,  8 Sep 2022 13:43:33 -0700

curl: Update to 7.85.0

Diffstat:

Mpkg/curl/.gitignore2+-
Mpkg/curl/README.md1-
Mpkg/curl/curl_config.h37++++++++++---------------------------
Mpkg/curl/gen.lua44++++++++++++++++++++++----------------------
Mpkg/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch8++++----
Mpkg/curl/patch/0002-bearssl-Remove-unnecessary-CA-blob-length-check.patch8++++----
Mpkg/curl/sha2562+-
Mpkg/curl/url2+-
Mpkg/curl/ver2+-
9 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/pkg/curl/.gitignore b/pkg/curl/.gitignore @@ -1,2 +1,2 @@ -/curl-7.80.0.tar.gz +/curl-7.85.0.tar.gz /src diff --git a/pkg/curl/README.md b/pkg/curl/README.md @@ -7,7 +7,6 @@ Generated with --disable-pop3 \ --disable-smb \ --with-ca-bundle=/etc/ssl/cert.pem \ - --without-ssl \ --with-bearssl \ 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 @@ -12,6 +12,7 @@ /* #undef CURL_DISABLE_FTP */ /* #undef CURL_DISABLE_GETOPTIONS */ /* #undef CURL_DISABLE_GOPHER */ +/* #undef CURL_DISABLE_HEADERS_API */ /* #undef CURL_DISABLE_HSTS */ /* #undef CURL_DISABLE_HTTP */ /* #undef CURL_DISABLE_HTTP_AUTH */ @@ -44,10 +45,10 @@ #define ENABLE_IPV6 1 #define GETHOSTNAME_TYPE_ARG2 size_t #define HAVE_ALARM 1 -#define HAVE_ALLOCA_H 1 #define HAVE_ARPA_INET_H 1 #define HAVE_ARPA_TFTP_H 1 #define HAVE_ASSERT_H 1 +#define HAVE_ATOMIC 1 #define HAVE_BASENAME 1 #define HAVE_BOOL_T 1 /* #undef HAVE_BORINGSSL */ @@ -64,6 +65,7 @@ #define HAVE_DLFCN_H 1 #define HAVE_ERRNO_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 @@ -108,18 +110,13 @@ #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 */ /* #undef HAVE_IOCTLSOCKET_FIONBIO */ -#define HAVE_IOCTL_FIONBIO 1 -#define HAVE_IOCTL_SIOCGIFADDR 1 /* #undef HAVE_IO_H */ /* #undef HAVE_LBER_H */ -/* #undef HAVE_LDAPSSL_H */ /* #undef HAVE_LDAP_H */ -/* #undef HAVE_LDAP_INIT_FD */ #define HAVE_LDAP_SSL 1 /* #undef HAVE_LDAP_SSL_H */ /* #undef HAVE_LDAP_URL_PARSE */ @@ -137,19 +134,17 @@ #define HAVE_LIBZ 1 /* #undef HAVE_LIBZSTD */ #define HAVE_LINUX_TCP_H 1 -#define HAVE_LL 1 #define HAVE_LOCALE_H 1 -#define HAVE_LOCALTIME_R 1 #define HAVE_LONGLONG 1 /* #undef HAVE_MACH_ABSOLUTE_TIME */ -#define HAVE_MALLOC_H 1 -/* #undef HAVE_MEMORY_H */ /* #undef HAVE_MEMRCHR */ #define HAVE_MSG_NOSIGNAL 1 +/* #undef HAVE_MSH3_H */ #define HAVE_NETDB_H 1 /* #undef HAVE_NETINET_IN6_H */ #define HAVE_NETINET_IN_H 1 #define HAVE_NETINET_TCP_H 1 +#define HAVE_NETINET_UDP_H 1 #define HAVE_NET_IF_H 1 /* #undef HAVE_NGHTTP2_NGHTTP2_H */ /* #undef HAVE_NGHTTP3_NGHTTP3_H */ @@ -163,12 +158,10 @@ /* #undef HAVE_OPENSSL_RSA_H */ /* #undef HAVE_OPENSSL_SRP */ /* #undef HAVE_OPENSSL_SSL_H */ -/* #undef HAVE_OPENSSL_VERSION */ /* #undef HAVE_OPENSSL_X509_H */ /* #undef HAVE_PEM_H */ #define HAVE_PIPE 1 /* #undef HAVE_PK11_CREATEMANAGEDGENERICOBJECT */ -#define HAVE_POLL 1 #define HAVE_POLL_FINE 1 #define HAVE_POLL_H 1 #define HAVE_POSIX_STRERROR_R 1 @@ -180,14 +173,14 @@ /* #undef HAVE_RAND_EGD */ #define HAVE_RECV 1 /* #undef HAVE_RSA_H */ +#define HAVE_SCHED_YIELD 1 #define HAVE_SELECT 1 #define HAVE_SEND 1 +#define HAVE_SENDMSG 1 #define HAVE_SETJMP_H 1 #define HAVE_SETLOCALE 1 /* #undef HAVE_SETMODE */ #define HAVE_SETRLIMIT 1 -#define HAVE_SETSOCKOPT 1 -/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */ #define HAVE_SIGACTION 1 #define HAVE_SIGINTERRUPT 1 #define HAVE_SIGNAL 1 @@ -197,9 +190,9 @@ #define HAVE_SOCKET 1 #define HAVE_SOCKETPAIR 1 /* #undef HAVE_SOCKET_H */ -/* #undef HAVE_SSLV2_CLIENT_METHOD */ /* #undef HAVE_SSL_GET_ECH_STATUS */ /* #undef HAVE_SSL_H */ +#define HAVE_STDATOMIC_H 1 #define HAVE_STDBOOL_H 1 #define HAVE_STDINT_H 1 #define HAVE_STDIO_H 1 @@ -211,10 +204,6 @@ /* #undef HAVE_STRICMP */ #define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1 -/* #undef HAVE_STRNCMPI */ -/* #undef HAVE_STRNICMP */ -#define HAVE_STROPTS_H 1 -#define HAVE_STRSTR 1 #define HAVE_STRTOK_R 1 #define HAVE_STRTOLL 1 #define HAVE_STRUCT_SOCKADDR_STORAGE 1 @@ -240,13 +229,11 @@ /* #undef HAVE_TERMIO_H */ /* #undef HAVE_TIME_T_UNSIGNED */ #define HAVE_UNISTD_H 1 -#define HAVE_USLEEP 1 #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_WINBER_H */ /* #undef HAVE_WINCRYPT_H */ /* #undef HAVE_WINDOWS_H */ /* #undef HAVE_WINLDAP_H */ @@ -256,7 +243,6 @@ /* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */ /* #undef HAVE_WOLFSSL_USEALPN */ #define HAVE_WRITABLE_ARGV 1 -#define HAVE_WRITEV 1 /* #undef HAVE_WS2TCPIP_H */ /* #undef HAVE_X509_H */ #define HAVE_ZLIB_H 1 @@ -264,8 +250,6 @@ /* #undef HAVE_ZSTD_H */ #define LT_OBJDIR ".libs/" /* #undef NEED_LBER_H */ -/* #undef NEED_MALLOC_H */ -/* #undef NEED_MEMORY_H */ /* #undef NEED_REENTRANT */ /* #undef NEED_THREAD_SAFE */ #define NTLM_WB_ENABLED 1 @@ -300,11 +284,9 @@ /* probe SIZEOF_LONG */ /* #undef SIZEOF_LONG_LONG */ #define SIZEOF_OFF_T 8 -#define SIZEOF_SHORT 2 /* probe SIZEOF_SIZE_T */ /* probe SIZEOF_TIME_T */ #define STDC_HEADERS 1 -#define STRERROR_R_TYPE_ARG3 size_t /* #undef USE_AMISSL */ /* #undef USE_ARES */ #define USE_BEARSSL 1 @@ -318,12 +300,13 @@ /* #undef USE_LIBSSH2 */ /* #undef USE_MANUAL */ /* #undef USE_MBEDTLS */ -/* #undef USE_MESALINK */ +/* #undef USE_MSH3 */ /* #undef USE_NGHTTP2 */ /* #undef USE_NGHTTP3 */ /* #undef USE_NGTCP2 */ /* #undef USE_NGTCP2_CRYPTO_GNUTLS */ /* #undef USE_NGTCP2_CRYPTO_OPENSSL */ +/* #undef USE_NGTCP2_CRYPTO_WOLFSSL */ /* #undef USE_NSS */ /* #undef USE_OPENLDAP */ /* #undef USE_OPENSSL */ diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua @@ -32,6 +32,7 @@ pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', { 'system.h', 'urlapi.h', 'options.h', + 'header.h', }) pkg.deps = { '$outdir/curl_config.h', @@ -51,21 +52,21 @@ lib('libcurl.a', [[ 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 formdata.c - ftp.c ftplistparser.c getenv.c getinfo.c gopher.c hash.c hmac.c - hostasyn.c hostcheck.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 non-ascii.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 timeval.c transfer.c url.c - urlapi.c version.c version_win32.c warnless.c wildcard.c - x509asn1.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 vauth/( cleartext.c cram.c digest.c digest_sspi.c gsasl.c krb5_gssapi.c krb5_sspi.c ntlm.c @@ -73,12 +74,12 @@ lib('libcurl.a', [[ spnego_sspi.c vauth.c ) vtls/( - bearssl.c gskit.c gtls.c keylog.c mbedtls.c - mbedtls_threadlock.c mesalink.c nss.c - openssl.c rustls.c schannel.c schannel_verify.c - sectransp.c vtls.c wolfssl.c + bearssl.c gskit.c gtls.c hostcheck.c keylog.c mbedtls.c + mbedtls_threadlock.c nss.c openssl.c rustls.c schannel.c + schannel_verify.c sectransp.c vtls.c wolfssl.c + x509asn1.c ) - vquic/(ngtcp2.c quiche.c vquic.c) + vquic/(msh3.c ngtcp2.c quiche.c vquic.c) vssh/(libssh.c libssh2.c wolfssh.c) ) $builddir/pkg/bearssl/libbearssl.a @@ -102,17 +103,16 @@ exe('curl', [[ tool_cb_see.c tool_cb_wrt.c tool_cfgable.c - tool_convert.c tool_dirhie.c tool_doswin.c tool_easysrc.c tool_filetime.c + tool_findfile.c tool_formparse.c tool_getparam.c tool_getpass.c tool_help.c tool_helpers.c - tool_homedir.c tool_libinfo.c tool_listhelp.c tool_main.c 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,4 +1,4 @@ -From ac068eb8361307fbdde0d61b9f6f3cdef70d73fe Mon Sep 17 00:00:00 2001 +From 04afba4813f504cafb717c48c50de4395fb3ea71 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 @@ -8,10 +8,10 @@ Subject: [PATCH] Reuse dynbuf symbols for curl tool 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/lib/dynbuf.h b/lib/dynbuf.h -index 39b859570..b9401d743 100644 +index c1e97235d..8b9158051 100644 --- a/lib/dynbuf.h +++ b/lib/dynbuf.h -@@ -22,22 +22,20 @@ +@@ -24,22 +24,20 @@ * ***************************************************************************/ @@ -46,5 +46,5 @@ index 39b859570..b9401d743 100644 struct dynbuf { char *bufr; /* point to a null-terminated allocated buffer */ -- -2.28.0 +2.35.1 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,4 +1,4 @@ -From 5d080c8db49bdb91a35ad4763fcc176088214b22 Mon Sep 17 00:00:00 2001 +From 643bad651c570c0e2b5889df4d0cb0803fa58b1e 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 @@ -11,10 +11,10 @@ than INT_MAX. 1 file changed, 3 deletions(-) diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c -index 9b772d064..591eb8715 100644 +index f14eb66a2..ffa7c1166 100644 --- a/lib/vtls/bearssl.c +++ b/lib/vtls/bearssl.c -@@ -124,9 +124,6 @@ static CURLcode load_cafile(struct cafile_source *source, +@@ -129,9 +129,6 @@ static CURLcode load_cafile(struct cafile_source *source, return CURLE_SSL_CACERT_BADFILE; } @@ -25,5 +25,5 @@ index 9b772d064..591eb8715 100644 ca.in_cert = FALSE; ca.anchors = NULL; -- -2.32.0 +2.35.1 diff --git a/pkg/curl/sha256 b/pkg/curl/sha256 @@ -1 +1 @@ -dab997c9b08cb4a636a03f2f7f985eaba33279c1c52692430018fae4a4878dc7 curl-7.80.0.tar.gz +78a06f918bd5fde3c4573ef4f9806f56372b32ec1829c9ec474799eeee641c27 curl-7.85.0.tar.gz diff --git a/pkg/curl/url b/pkg/curl/url @@ -1 +1 @@ -url = "https://curl.se/download/curl-7.80.0.tar.gz" +url = "https://curl.se/download/curl-7.85.0.tar.gz" diff --git a/pkg/curl/ver b/pkg/curl/ver @@ -1 +1 @@ -7.80.0 r0 +7.85.0 r0