logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: c2dd1cfdf79514454fe6ec99f4b8efd575eff044
parent 0d69afde2ad6ca4ba28af2f2920aabda174cf04a
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 21 Jul 2021 12:37:23 -0700

curl: Update to 7.78.0

Diffstat:

Mpkg/curl/.gitignore2+-
Mpkg/curl/curl_config.h16+---------------
Mpkg/curl/gen.lua1-
Dpkg/curl/patch/0002-bearssl-remove-incorrect-const-on-variable-that-is-m.patch27---------------------------
Mpkg/curl/sha2562+-
Mpkg/curl/url2+-
Mpkg/curl/ver2+-
7 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/pkg/curl/.gitignore b/pkg/curl/.gitignore @@ -1,2 +1,2 @@ -/curl-7.77.0.tar.gz +/curl-7.78.0.tar.gz /src diff --git a/pkg/curl/curl_config.h b/pkg/curl/curl_config.h @@ -22,6 +22,7 @@ /* #undef CURL_DISABLE_MIME */ /* #undef CURL_DISABLE_MQTT */ /* #undef CURL_DISABLE_NETRC */ +/* #undef CURL_DISABLE_NTLM */ /* #undef CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG */ /* #undef CURL_DISABLE_PARSEDATE */ #define CURL_DISABLE_POP3 1 @@ -42,8 +43,6 @@ /* #undef EGD_SOCKET */ #define ENABLE_IPV6 1 #define GETHOSTNAME_TYPE_ARG2 size_t -#define GETSERVBYPORT_R_ARGS 6 -#define GETSERVBYPORT_R_BUFSIZE 4096 #define HAVE_ALARM 1 #define HAVE_ALLOCA_H 1 #define HAVE_ARPA_INET_H 1 @@ -70,20 +69,13 @@ #define HAVE_FCNTL_O_NONBLOCK 1 #define HAVE_FNMATCH 1 #define HAVE_FREEADDRINFO 1 -#define HAVE_FREEIFADDRS 1 #define HAVE_FSETXATTR 1 #define HAVE_FSETXATTR_5 1 /* #undef HAVE_FSETXATTR_6 */ #define HAVE_FTRUNCATE 1 -#define HAVE_GAI_STRERROR 1 #define HAVE_GETADDRINFO 1 #define HAVE_GETADDRINFO_THREADSAFE 1 #define HAVE_GETEUID 1 -#define HAVE_GETHOSTBYADDR 1 -#define HAVE_GETHOSTBYADDR_R 1 -/* #undef HAVE_GETHOSTBYADDR_R_5 */ -/* #undef HAVE_GETHOSTBYADDR_R_7 */ -#define HAVE_GETHOSTBYADDR_R_8 1 #define HAVE_GETHOSTBYNAME 1 #define HAVE_GETHOSTBYNAME_R 1 /* #undef HAVE_GETHOSTBYNAME_R_3 */ @@ -97,7 +89,6 @@ #define HAVE_GETPWUID 1 #define HAVE_GETPWUID_R 1 #define HAVE_GETRLIMIT 1 -#define HAVE_GETSERVBYPORT_R 1 #define HAVE_GETSOCKNAME 1 #define HAVE_GETTIMEOFDAY 1 /* #undef HAVE_GLIBC_STRERROR_R */ @@ -114,9 +105,6 @@ /* #undef HAVE_IDN2_H */ #define HAVE_IFADDRS_H 1 #define HAVE_IF_NAMETOINDEX 1 -/* #undef HAVE_INET_NTOA_R */ -/* #undef HAVE_INET_NTOA_R_2 */ -/* #undef HAVE_INET_NTOA_R_3 */ #define HAVE_INET_NTOP 1 #define HAVE_INET_PTON 1 #define HAVE_INTTYPES_H 1 @@ -200,7 +188,6 @@ #define HAVE_SETRLIMIT 1 #define HAVE_SETSOCKOPT 1 /* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */ -/* #undef HAVE_SGTTY_H */ #define HAVE_SIGACTION 1 #define HAVE_SIGINTERRUPT 1 #define HAVE_SIGNAL 1 @@ -334,7 +321,6 @@ /* #undef USE_MANUAL */ /* #undef USE_MBEDTLS */ /* #undef USE_MESALINK */ -/* #undef USE_METALINK */ /* #undef USE_NGHTTP2 */ /* #undef USE_NGHTTP3 */ /* #undef USE_NGTCP2 */ diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua @@ -115,7 +115,6 @@ exe('curl', [[ tool_homedir.c tool_libinfo.c tool_main.c - tool_metalink.c tool_msgs.c tool_operate.c tool_operhlp.c diff --git a/pkg/curl/patch/0002-bearssl-remove-incorrect-const-on-variable-that-is-m.patch b/pkg/curl/patch/0002-bearssl-remove-incorrect-const-on-variable-that-is-m.patch @@ -1,27 +0,0 @@ -From 7ac85916d1597d5fb9db2d8bc59d8d14059f2c2e Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Tue, 25 May 2021 23:42:07 -0700 -Subject: [PATCH] bearssl: remove incorrect const on variable that is modified - -hostname may be set to NULL later on in this function if it is an -IP address. ---- - lib/vtls/bearssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c -index 7f729713d..40a5e7879 100644 ---- a/lib/vtls/bearssl.c -+++ b/lib/vtls/bearssl.c -@@ -300,7 +300,7 @@ static CURLcode bearssl_connect_step1(struct Curl_easy *data, - struct ssl_connect_data *connssl = &conn->ssl[sockindex]; - struct ssl_backend_data *backend = connssl->backend; - const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile); -- const char * const hostname = SSL_HOST_NAME(); -+ const char *hostname = SSL_HOST_NAME(); - const bool verifypeer = SSL_CONN_CONFIG(verifypeer); - const bool verifyhost = SSL_CONN_CONFIG(verifyhost); - CURLcode ret; --- -2.31.1 - diff --git a/pkg/curl/sha256 b/pkg/curl/sha256 @@ -1 +1 @@ -b0a3428acb60fa59044c4d0baae4e4fc09ae9af1d8a3aa84b2e3fbcd99841f77 curl-7.77.0.tar.gz +ed936c0b02c06d42cf84b39dd12bb14b62d77c7c4e875ade022280df5dcc81d7 curl-7.78.0.tar.gz diff --git a/pkg/curl/url b/pkg/curl/url @@ -1 +1 @@ -url = "https://curl.se/download/curl-7.77.0.tar.gz" +url = "https://curl.se/download/curl-7.78.0.tar.gz" diff --git a/pkg/curl/ver b/pkg/curl/ver @@ -1 +1 @@ -7.77.0 r0 +7.78.0 r0