commit: 5be7466e207848808c26951cb2939328188862c4
parent 8faead3f090c83a7ee92918509f2bd5bac2ef675
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 28 Apr 2020 23:58:54 -0700
curl: Update to 7.70.0
Diffstat:
6 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/pkg/curl/.gitignore b/pkg/curl/.gitignore
@@ -1,2 +1,2 @@
-/curl-7.69.1.tar.gz
+/curl-7.70.0.tar.gz
/src
diff --git a/pkg/curl/curl_config.h b/pkg/curl/curl_config.h
@@ -30,6 +30,7 @@
/* #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 */
@@ -97,9 +98,6 @@
#define HAVE_GETTIMEOFDAY 1
/* #undef HAVE_GLIBC_STRERROR_R */
#define HAVE_GMTIME_R 1
-/* #undef HAVE_GNUTLS_ALPN_SET_PROTOCOLS */
-/* #undef HAVE_GNUTLS_CERTIFICATE_SET_X509_KEY_FILE2 */
-/* #undef HAVE_GNUTLS_OCSP_REQ_INIT */
/* #undef HAVE_GNUTLS_SRP */
/* #undef HAVE_GSSAPI */
/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
@@ -164,6 +162,7 @@
/* #undef HAVE_NGTCP2_NGTCP2_CRYPTO_H */
/* #undef HAVE_NGTCP2_NGTCP2_H */
/* #undef HAVE_OLD_GSSMIT */
+/* #undef HAVE_OPENSSL3 */
/* #undef HAVE_OPENSSL_CRYPTO_H */
/* #undef HAVE_OPENSSL_ERR_H */
/* #undef HAVE_OPENSSL_PEM_H */
@@ -332,6 +331,7 @@
/* #undef USE_NGHTTP2 */
/* #undef USE_NGHTTP3 */
/* #undef USE_NGTCP2 */
+/* #undef USE_NGTCP2_CRYPTO_GNUTLS */
/* #undef USE_NGTCP2_CRYPTO_OPENSSL */
/* #undef USE_NSS */
/* #undef USE_OPENLDAP */
diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua
@@ -43,39 +43,37 @@ pkg.deps = {
-- src/lib/Makefile.inc:/^CSOURCES
lib('libcurl.a', [[
lib/(
- file.c timeval.c base64.c hostip.c progress.c formdata.c
- cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c
- ldap.c version.c getenv.c escape.c mprintf.c telnet.c netrc.c
- getinfo.c transfer.c strcase.c easy.c security.c curl_fnmatch.c
- fileinfo.c ftplistparser.c wildcard.c krb5.c memdebug.c http_chunks.c
- strtok.c connect.c llist.c hash.c multi.c content_encoding.c share.c
- http_digest.c md4.c md5.c http_negotiate.c inet_pton.c strtoofft.c
- strerror.c amigaos.c hostasyn.c hostip4.c hostip6.c hostsyn.c
- inet_ntop.c parsedate.c select.c tftp.c splay.c strdup.c socks.c
- curl_addrinfo.c socks_gssapi.c socks_sspi.c
- curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c
- pingpong.c rtsp.c curl_threads.c warnless.c hmac.c curl_rtmp.c
- openldap.c curl_gethostname.c gopher.c idn_win32.c
- http_proxy.c non-ascii.c asyn-ares.c asyn-thread.c curl_gssapi.c
- http_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_sasl.c rand.c
- curl_multibyte.c hostcheck.c conncache.c dotdot.c
- x509asn1.c http2.c smb.c curl_endian.c curl_des.c system_win32.c
- mime.c sha256.c setopt.c curl_path.c curl_ctype.c curl_range.c psl.c
- doh.c urlapi.c curl_get_line.c altsvc.c socketpair.c rename.c
+ altsvc.c amigaos.c asyn-ares.c asyn-thread.c base64.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 curl_path.c curl_range.c curl_rtmp.c
+ curl_sasl.c curl_sspi.c curl_threads.c dict.c dotdot.c easy.c escape.c
+ file.c fileinfo.c formdata.c ftp.c url.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 http.c http2.c http_chunks.c http_digest.c http_negotiate.c
+ 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
+ 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
vauth/(
- vauth.c cleartext.c cram.c
- digest.c digest_sspi.c krb5_gssapi.c
- krb5_sspi.c ntlm.c ntlm_sspi.c oauth2.c
- spnego_gssapi.c spnego_sspi.c
+ cleartext.c cram.c digest.c
+ digest_sspi.c krb5_gssapi.c krb5_sspi.c ntlm.c
+ ntlm_sspi.c oauth2.c spnego_gssapi.c spnego_sspi.c
+ vauth.c
)
vtls/(
- openssl.c gtls.c vtls.c nss.c
- mbedtls_threadlock.c wolfssl.c schannel.c
- schannel_verify.c sectransp.c gskit.c mbedtls.c
- mesalink.c bearssl.c
+ bearssl.c gskit.c gtls.c mbedtls.c
+ mbedtls_threadlock.c mesalink.c nss.c openssl.c
+ schannel.c schannel_verify.c sectransp.c vtls.c
+ wolfssl.c
)
vquic/(ngtcp2.c quiche.c)
- vssh/(libssh2.c libssh.c)
+ vssh/(libssh.c libssh2.c wolfssh.c)
)
$builddir/pkg/bearssl/libbearssl.a
$builddir/pkg/zlib/libz.a
@@ -126,6 +124,7 @@ exe('curl', [[
tool_util.c
tool_vms.c
tool_writeout.c
+ tool_writeout_json.c
tool_xattr.c
)
tool_hugehelp.c.o
diff --git a/pkg/curl/sha256 b/pkg/curl/sha256
@@ -1 +1 @@
-01ae0c123dee45b01bbaef94c0bc00ed2aec89cb2ee0fd598e0d302a6b5e0a98 curl-7.69.1.tar.gz
+ca2feeb8ef13368ce5d5e5849a5fd5e2dd4755fecf7d8f0cc94000a4206fb8e7 curl-7.70.0.tar.gz
diff --git a/pkg/curl/url b/pkg/curl/url
@@ -1 +1 @@
-url = "https://curl.haxx.se/download/curl-7.69.1.tar.gz"
+url = "https://curl.haxx.se/download/curl-7.70.0.tar.gz"
diff --git a/pkg/curl/ver b/pkg/curl/ver
@@ -1 +1 @@
-7.69.1 r0
+7.70.0 r0
