logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 6b4d47a7ab5248d634d177c78443dbbc10f633cd
parent f910bf367cb5c1244b8339c34f05c06526310a9a
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 26 May 2021 01:13:03 -0700

curl: Update to 7.77.0

Diffstat:

Mpkg/curl/.gitignore2+-
Mpkg/curl/curl_config.h3+--
Mpkg/curl/gen.lua4++--
Apkg/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, 34 insertions(+), 8 deletions(-)

diff --git a/pkg/curl/.gitignore b/pkg/curl/.gitignore @@ -1,2 +1,2 @@ -/curl-7.76.1.tar.gz +/curl-7.77.0.tar.gz /src 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_HSTS */ /* #undef CURL_DISABLE_HTTP */ /* #undef CURL_DISABLE_HTTP_AUTH */ /* #undef CURL_DISABLE_IMAP */ @@ -266,7 +267,6 @@ /* #undef HAVE_WINSOCK2_H */ /* #undef HAVE_WINSOCK_H */ /* #undef HAVE_WOLFSSH_SSH_H */ -/* #undef HAVE_WOLFSSLV3_CLIENT_METHOD */ /* #undef HAVE_WOLFSSL_DES_ECB_ENCRYPT */ /* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */ /* #undef HAVE_WOLFSSL_USEALPN */ @@ -326,7 +326,6 @@ /* #undef USE_ECH */ /* #undef USE_GNUTLS */ /* #undef USE_GSASL */ -/* #undef USE_HSTS */ /* #undef USE_HYPER */ /* #undef USE_LIBPSL */ /* #undef USE_LIBRTMP */ diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua @@ -44,8 +44,8 @@ pkg.deps = { -- src/lib/Makefile.inc:/^CSOURCES lib('libcurl.a', [[ lib/( - altsvc.c amigaos.c asyn-ares.c asyn-thread.c base64.c c-hyper.c - conncache.c connect.c content_encoding.c cookie.c + altsvc.c amigaos.c asyn-ares.c asyn-thread.c base64.c bufref.c + c-hyper.c conncache.c connect.c content_encoding.c cookie.c curl_addrinfo.c curl_ctype.c curl_des.c curl_endian.c curl_fnmatch.c curl_get_line.c curl_gethostname.c curl_gssapi.c curl_memrchr.c curl_multibyte.c curl_ntlm_core.c curl_ntlm_wb.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 @@ -0,0 +1,27 @@ +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 @@ -5f85c4d891ccb14d6c3c701da3010c91c6570c3419391d485d95235253d837d7 curl-7.76.1.tar.gz +b0a3428acb60fa59044c4d0baae4e4fc09ae9af1d8a3aa84b2e3fbcd99841f77 curl-7.77.0.tar.gz diff --git a/pkg/curl/url b/pkg/curl/url @@ -1 +1 @@ -url = "https://curl.se/download/curl-7.76.1.tar.gz" +url = "https://curl.se/download/curl-7.77.0.tar.gz" diff --git a/pkg/curl/ver b/pkg/curl/ver @@ -1 +1 @@ -7.76.1 r0 +7.77.0 r0