commit: cad0f69957933a49714e304598d7b76d757f5e66
parent 583a09f098c0613c32069a2f08121e98b4f45455
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 23 Aug 2018 14:47:20 -0700
curl: Update to 7.61.0
Diffstat:
7 files changed, 14 insertions(+), 110 deletions(-)
diff --git a/pkg/curl/.gitignore b/pkg/curl/.gitignore
@@ -1,2 +1,2 @@
-/curl-7.59.0.tar.gz
+/curl-7.61.0.tar.gz
/src
diff --git a/pkg/curl/curl_config.h b/pkg/curl/curl_config.h
@@ -1,3 +1,4 @@
+/* #undef CURLDEBUG */
/* #undef CURL_CA_BUNDLE */
#define CURL_CA_FALLBACK 1
/* #undef CURL_CA_PATH */
@@ -23,15 +24,12 @@
/* #undef CURL_DISABLE_TLS_SRP */
/* #undef CURL_DISABLE_VERBOSE_STRINGS */
#define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default")))
+#define CURL_SA_FAMILY_T sa_family_t
/* #undef CURL_WITH_MULTI_SSL */
+/* #undef DEBUGBUILD */
/* #undef EGD_SOCKET */
#define ENABLE_IPV6 1
#define GETHOSTNAME_TYPE_ARG2 size_t
-#define GETNAMEINFO_QUAL_ARG1 const
-#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
-#define GETNAMEINFO_TYPE_ARG2 socklen_t
-#define GETNAMEINFO_TYPE_ARG46 socklen_t
-#define GETNAMEINFO_TYPE_ARG7 int
#define GETSERVBYPORT_R_ARGS 6
#define GETSERVBYPORT_R_BUFSIZE 4096
#define HAVE_ALARM 1
@@ -54,15 +52,17 @@
/* #undef HAVE_CYASSL_ERROR_SSL_H */
/* #undef HAVE_CYASSL_GET_PEER_CERTIFICATE */
/* #undef HAVE_CYASSL_OPTIONS_H */
+#define HAVE_DECL_GETPWUID_R 1
+/* #undef HAVE_DECL_GETPWUID_R_MISSING */
#define HAVE_DLFCN_H 1
#define HAVE_ENGINE_CLEANUP 1
-#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1
#define HAVE_ERRNO_H 1
/* #undef HAVE_ERR_H */
#define HAVE_FCNTL 1
#define HAVE_FCNTL_H 1
#define HAVE_FCNTL_O_NONBLOCK 1
#define HAVE_FDOPEN 1
+#define HAVE_FNMATCH 1
#define HAVE_FREEADDRINFO 1
#define HAVE_FREEIFADDRS 1
#define HAVE_FSETXATTR 1
@@ -85,7 +85,6 @@
#define HAVE_GETHOSTBYNAME_R_6 1
#define HAVE_GETHOSTNAME 1
#define HAVE_GETIFADDRS 1
-#define HAVE_GETNAMEINFO 1
/* #undef HAVE_GETPASS_R */
#define HAVE_GETPPID 1
#define HAVE_GETPWUID 1
@@ -157,10 +156,8 @@
#define HAVE_NETINET_TCP_H 1
#define HAVE_NET_IF_H 1
/* #undef HAVE_NGHTTP2_NGHTTP2_H */
-/* #undef HAVE_NI_WITHSCOPEID */
/* #undef HAVE_OLD_GSSMIT */
#define HAVE_OPENSSL_CRYPTO_H 1
-#define HAVE_OPENSSL_ENGINE_H 1
#define HAVE_OPENSSL_ERR_H 1
#define HAVE_OPENSSL_PEM_H 1
#define HAVE_OPENSSL_RSA_H 1
@@ -257,7 +254,7 @@
/* #undef HAVE_WOLFSSL_CTX_USESUPPORTEDCURVE */
/* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */
/* #undef HAVE_WOLFSSL_USEALPN */
-#define HAVE_WRITABLE_ARGV 1
+/* #undef HAVE_WRITABLE_ARGV */
#define HAVE_WRITEV 1
/* #undef HAVE_WS2TCPIP_H */
/* #undef HAVE_X509_H */
diff --git a/pkg/curl/gen.lua b/pkg/curl/gen.lua
@@ -47,7 +47,7 @@ lib('libcurl.a', [[
http_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_sasl.c rand.c
curl_multibyte.c hostcheck.c conncache.c pipeline.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
+ mime.c sha256.c setopt.c curl_path.c curl_ctype.c curl_range.c psl.c
vauth/(
vauth.c cleartext.c cram.c
digest.c digest_sspi.c krb5_gssapi.c
@@ -57,8 +57,8 @@ lib('libcurl.a', [[
vtls/(
openssl.c gtls.c vtls.c nss.c
polarssl.c polarssl_threadlock.c axtls.c
- cyassl.c schannel.c darwinssl.c gskit.c
- mbedtls.c
+ cyassl.c schannel.c schannel_verify.c
+ darwinssl.c gskit.c mbedtls.c
)
)
$builddir/pkg/(
diff --git a/pkg/curl/patch/0001-curl-Fix-build-with-libressl-2.7.0.patch b/pkg/curl/patch/0001-curl-Fix-build-with-libressl-2.7.0.patch
@@ -1,93 +0,0 @@
-From 911e4722ca97605c9449ef07c274a0d7054fc238 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 23 Mar 2018 00:03:37 -0700
-Subject: [PATCH] curl: Fix build with libressl-2.7.0
-
----
- lib/vtls/openssl.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
-index 2a6b3cfac..285308914 100644
---- a/lib/vtls/openssl.c
-+++ b/lib/vtls/openssl.c
-@@ -104,7 +104,8 @@
- #endif
-
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+ (!defined(LIBRESSL_VERSION_NUMBER) || \
-+ LIBRESSL_VERSION_NUMBER >= 0x2070000fL) /* LibreSSL 2.7.0+ */
- #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
- #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */
- #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
-@@ -127,8 +128,9 @@ static unsigned long OpenSSL_version_num(void)
- #endif
- #endif
-
--#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* OpenSSL 1.0.2 or later */ \
-+ (!defined(LIBRESSL_VERSION_NUMBER) || \
-+ LIBRESSL_VERSION_NUMBER >= 0x2070000fL) /* LibreSSL 2.7.0 or later */
- #define HAVE_X509_GET0_SIGNATURE 1
- #endif
-
-@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num(void)
- * Whether SSL_CTX_set_keylog_callback is available.
- * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287
- * BoringSSL: supported since d28f59c27bac (committed 2015-11-19)
-- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it
-+ * LibreSSL: unsupported in at least 2.7.0 (explicitly check for it since it
- * lies and pretends to be OpenSSL 2.0.0).
- */
- #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \
-@@ -259,7 +261,8 @@ static void tap_ssl_key(const SSL *ssl, ssl_tap_state_t *state)
- if(!session || !keylog_file_fp)
- return;
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
-+ (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that
- * we have a valid SSL context if we have a non-NULL session. */
- SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE);
-@@ -930,7 +933,7 @@ static int Curl_ossl_init(void)
- CONF_MFLAGS_IGNORE_MISSING_FILE);
-
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+ (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- /* OpenSSL 1.1.0+ takes care of initialization itself */
- #else
- /* Lets get nice error messages */
-@@ -971,7 +974,7 @@ static int Curl_ossl_init(void)
- static void Curl_ossl_cleanup(void)
- {
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+ (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- /* OpenSSL 1.1 deprecates all these cleanup functions and
- turns them into no-ops in OpenSSL 1.0 compatibility mode */
- #else
-@@ -2083,7 +2086,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
- case CURL_SSLVERSION_TLSv1_3:
- /* it will be handled later with the context options */
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
-- !defined(LIBRESSL_VERSION_NUMBER)
-+ (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
- req_method = TLS_client_method();
- #else
- req_method = SSLv23_client_method();
-@@ -2799,7 +2802,7 @@ static CURLcode get_cert_chain(struct connectdata *conn,
- ASN1_STRING *a = ASN1_STRING_new();
- if(a) {
- X509_get0_signature(&psig, &palg, x);
-- X509_signature_print(mem, palg, a);
-+ X509_signature_print(mem, (X509_ALGOR *)palg, a);
- ASN1_STRING_free(a);
-
- if(palg) {
---
-2.16.3
-
diff --git a/pkg/curl/rev b/pkg/curl/rev
@@ -1 +1 @@
-16
+17
diff --git a/pkg/curl/sha256 b/pkg/curl/sha256
@@ -1 +1 @@
-099d9c32dc7b8958ca592597c9fabccdf4c08cfb7c114ff1afbbc4c6f13c9e9e curl-7.59.0.tar.gz
+64141f0db4945268a21b490d58806b97c615d3d0c75bf8c335bbe0efd13b45b5 curl-7.61.0.tar.gz
diff --git a/pkg/curl/url b/pkg/curl/url
@@ -1 +1 @@
-url = "https://curl.haxx.se/download/curl-7.59.0.tar.gz"
+url = "https://curl.haxx.se/download/curl-7.61.0.tar.gz"
