summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Hieber <rhi@pengutronix.de>2019-09-11 17:22:48 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-09-19 18:46:04 +0200
commit0d75d1ce80e3e8f5fe66934c0b945e4aad53c45b (patch)
tree52da1cc5918c6ad5f69cdae698226905734c747e
parentb9144cb4973f1129c791afd037d622ffc7fed561 (diff)
downloadptxdist-0d75d1ce80e3e8f5fe66934c0b945e4aad53c45b.tar.gz
ptxdist-0d75d1ce80e3e8f5fe66934c0b945e4aad53c45b.tar.xz
libcurl: version bump 7.64.0 -> 7.66.0
Pin down all loose configure options, except for those --with-* options that don't understand a --without-*. Note that --disable-dateparse is currently broken [1], so keep it enabled. [2]: https://github.com/curl/curl/issues/4325 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/libcurl.make30
1 files changed, 26 insertions, 4 deletions
diff --git a/rules/libcurl.make b/rules/libcurl.make
index cb8479462..0e0feacd3 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
#
# Paths and names
#
-LIBCURL_VERSION := 7.64.0
-LIBCURL_MD5 := d0bcc586873cfef08b4b9594e5395a33
+LIBCURL_VERSION := 7.66.0
+LIBCURL_MD5 := c238aa394e3aa47ca4fcb0491774149f
LIBCURL := curl-$(LIBCURL_VERSION)
LIBCURL_SUFFIX := tar.bz2
LIBCURL_URL := https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
@@ -40,8 +40,10 @@ LIBCURL_CONF_OPT := \
--disable-werror \
--disable-curldebug \
--enable-symbol-hiding \
+ --enable-hidden-symbols \
--$(call ptx/endis, PTXCONF_LIBCURL_C_ARES)-ares \
--enable-rt \
+ --disable-code-coverage \
$(GLOBAL_LARGE_FILE_OPTION) \
--$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http \
--$(call ptx/endis, PTXCONF_LIBCURL_FTP)-ftp \
@@ -73,14 +75,30 @@ LIBCURL_CONF_OPT := \
--enable-tls-srp \
--enable-unix-sockets \
--$(call ptx/endis, PTXCONF_LIBCURL_COOKIES)-cookies \
+ --$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http-auth \
+ --disable-doh \
+ --disable-mime \
+ --enable-dateparse \
+ --enable-netrc \
+ --enable-progress-meter \
+ --disable-dnsshuffle \
+ --disable-alt-svc \
--with-zlib=$(SYSROOT) \
+ --without-brotli \
--without-gssapi \
+ --with-default-ssl-backend=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL,openssl,no) \
+ --without-winssl \
+ --without-schannel \
+ --without-darwinssl \
+ --without-secure-transport \
+ --without-amissl \
--with-ssl=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL,$(SYSROOT)/usr,no) \
--with-random=/dev/urandom \
--without-gnutls \
- --without-polarssl \
--without-mbedtls \
--without-cyassl \
+ --without-wolfssl \
+ --without-mesalink \
--without-nss \
--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
@@ -88,9 +106,13 @@ LIBCURL_CONF_OPT := \
--without-libpsl \
--without-libmetalink \
--$(call ptx/wwo, PTXCONF_LIBCURL_LIBSSH2)-libssh2 \
+ --without-libssh \
--without-librtmp \
+ --without-winidn \
--without-libidn2 \
- --without-nghttp2
+ --without-nghttp2 \
+ --without-zsh-functions-dir \
+ --without-fish-functions-dir
# ----------------------------------------------------------------------------
# Target-Install