logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 0a79f27c2cd0964b542b0b410a14ac4a7bf16c28
parent d6c984d896bdabccb020a0fe082c1b64f273a311
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 19 Oct 2020 15:03:01 -0700

curl: Update to 7.73.0

Diffstat:

Mpkg/curl/.gitignore2+-
Mpkg/curl/curl_config.h8+++++---
Mpkg/curl/gen.lua5+++--
Apkg/curl/patch/0001-Reuse-dynbuf-symbols-for-curl-tool.patch50++++++++++++++++++++++++++++++++++++++++++++++++++
Mpkg/curl/sha2562+-
Mpkg/curl/url2+-
Mpkg/curl/ver2+-
7 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/pkg/curl/.gitignore b/pkg/curl/.gitignore @@ -1,2 +1,2 @@ -/curl-7.72.0.tar.gz +/curl-7.73.0.tar.gz /src diff --git a/pkg/curl/curl_config.h b/pkg/curl/curl_config.h @@ -9,6 +9,7 @@ /* #undef CURL_DISABLE_DOH */ /* #undef CURL_DISABLE_FILE */ /* #undef CURL_DISABLE_FTP */ +/* #undef CURL_DISABLE_GETOPTIONS */ /* #undef CURL_DISABLE_GOPHER */ /* #undef CURL_DISABLE_HTTP */ /* #undef CURL_DISABLE_HTTP_AUTH */ @@ -17,6 +18,7 @@ #define CURL_DISABLE_LDAPS 1 /* #undef CURL_DISABLE_LIBCURL_OPTION */ /* #undef CURL_DISABLE_MIME */ +/* #undef CURL_DISABLE_MQTT */ /* #undef CURL_DISABLE_NETRC */ /* #undef CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG */ /* #undef CURL_DISABLE_PARSEDATE */ @@ -27,10 +29,10 @@ /* #undef CURL_DISABLE_SHUFFLE_DNS */ #define CURL_DISABLE_SMB 1 /* #undef CURL_DISABLE_SMTP */ +/* #undef CURL_DISABLE_SOCKETPAIR */ /* #undef CURL_DISABLE_TELNET */ /* #undef CURL_DISABLE_TFTP */ /* #undef CURL_DISABLE_VERBOSE_STRINGS */ -/* #undef CURL_ENABLE_MQTT */ #define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default"))) #define CURL_SA_FAMILY_T sa_family_t /* #undef CURL_WITH_MULTI_SSL */ @@ -208,7 +210,7 @@ #define HAVE_SOCKETPAIR 1 /* #undef HAVE_SOCKET_H */ /* #undef HAVE_SSLV2_CLIENT_METHOD */ -/* #undef HAVE_SSL_GET_ESNI_STATUS */ +/* #undef HAVE_SSL_GET_ECH_STATUS */ /* #undef HAVE_SSL_H */ #define HAVE_STDBOOL_H 1 #define HAVE_STDINT_H 1 @@ -323,7 +325,7 @@ /* #undef USE_AMISSL */ /* #undef USE_ARES */ #define USE_BEARSSL 1 -/* #undef USE_ESNI */ +/* #undef USE_ECH */ /* #undef USE_GNUTLS */ /* #undef USE_GNUTLS_NETTLE */ /* #undef USE_LIBPSL */ diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua @@ -31,6 +31,7 @@ pkg.hdrs = copy('$outdir/include/curl', '$srcdir/include/curl', { 'typecheck-gcc.h', 'system.h', 'urlapi.h', + 'options.h', }) pkg.deps = { '$outdir/curl_config.h', @@ -55,12 +56,12 @@ lib('libcurl.a', [[ http_ntlm.c http_proxy.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 doh.c rand.c rename.c rtsp.c security.c select.c + pop3.c progress.c psl.c doh.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 urlapi.c version.c warnless.c wildcard.c x509asn1.c dynbuf.c - version_win32.c + version_win32.c easyoptions.c easygetopt.c vauth/( cleartext.c cram.c digest.c digest_sspi.c krb5_gssapi.c krb5_sspi.c ntlm.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 @@ -0,0 +1,50 @@ +From ac068eb8361307fbdde0d61b9f6f3cdef70d73fe 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 | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) + +diff --git a/lib/dynbuf.h b/lib/dynbuf.h +index 39b859570..b9401d743 100644 +--- a/lib/dynbuf.h ++++ b/lib/dynbuf.h +@@ -22,22 +22,20 @@ + * + ***************************************************************************/ + +-#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 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_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_dynbuf dynbuf /* for the struct name */ +-#endif + + struct dynbuf { + char *bufr; /* point to a null-terminated allocated buffer */ +-- +2.28.0 + diff --git a/pkg/curl/sha256 b/pkg/curl/sha256 @@ -1 +1 @@ -d4d5899a3868fbb6ae1856c3e55a32ce35913de3956d1973caccd37bd0174fa2 curl-7.72.0.tar.gz +ba98332752257b47b9dea6d8c0ad25ec1745c20424f1dd3ff2c99ab59e97cf91 curl-7.73.0.tar.gz diff --git a/pkg/curl/url b/pkg/curl/url @@ -1 +1 @@ -url = "https://curl.haxx.se/download/curl-7.72.0.tar.gz" +url = "https://curl.haxx.se/download/curl-7.73.0.tar.gz" diff --git a/pkg/curl/ver b/pkg/curl/ver @@ -1 +1 @@ -7.72.0 r0 +7.73.0 r0