Thanks, applied as fbd2255619933e27bbbabb88f0429a6fc8ea5010. Michael
[sent from post-receive hook] On Fri, 21 Jan 2022 08:18:59 +0100, Christian Melki <[email protected]> wrote: > Fixes CVE-2021-22947, CVE-2021-22946, CVE-2021-22945 > > Change tarball compression to xz instead of bz2. > Remove enable-symbol-hiding. > Rename get-easy-option to get-easy-options. > Remove without-metalink, deprecated. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > [mol: update host-libcurl options] > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/host-libcurl.make b/rules/host-libcurl.make > index 1a2a1fcf567a..e08f720b713d 100644 > --- a/rules/host-libcurl.make > +++ b/rules/host-libcurl.make > @@ -21,55 +21,92 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBCURL) += host-libcurl > HOST_LIBCURL_CONF_TOOL := autoconf > HOST_LIBCURL_CONF_OPT := \ > $(HOST_AUTOCONF) \ > - --with-random=/dev/urandom \ > - --without-zlib \ > \ > + --enable-optimize \ > + --disable-warnings \ > + --disable-werror \ > + --disable-curldebug \ > + --enable-symbol-hiding \ > + --disable-ares \ > + --enable-rt \ > + --disable-ech \ > + --disable-code-coverage \ > + --enable-http \ > + --disable-ftp \ > + --disable-file \ > --disable-ldap \ > --disable-ldaps \ > --disable-rtsp \ > + --enable-proxy \ > --disable-dict \ > --disable-telnet \ > + --disable-tftp \ > --disable-pop3 \ > --disable-imap \ > --disable-smb \ > --disable-smtp \ > --disable-gopher \ > + --disable-mqtt \ > --disable-manual \ > - \ > + --enable-libcurl-option \ > + --disable-libgcc \ > + --enable-ipv6 \ > + --enable-openssl-auto-load-config \ > + --disable-versioned-symbols \ > + --disable-threaded-resolver \ > + --enable-pthreads \ > + --disable-verbose \ > --disable-sspi \ > + --disable-crypto-auth \ > + --disable-ntlm \ > --disable-ntlm-wb \ > - --disable-debug \ > - --disable-verbose \ > - \ > - --enable-thread \ > - --enable-nonblocking\ > - --enable-hidden-symbols \ > - --enable-proxy \ > - \ > - --without-krb4 \ > - --without-spnego \ > - --without-gssapi \ > - --without-winssl \ > - --without-darwinssl \ > + --disable-tls-srp \ > + --enable-unix-sockets \ > + --disable-cookies \ > + --enable-socketpair \ > + --disable-http-auth \ > + --disable-doh \ > + --disable-mime \ > + --enable-dateparse \ > + --disable-netrc \ > + --enable-progress-meter \ > + --disable-dnsshuffle \ > + --enable-get-easy-options \ > + --disable-alt-svc \ > + --enable-hsts \ > + --without-schannel \ > + --without-secure-transport \ > + --without-amissl \ > + --with-openssl=$(PTXDIST_SYSROOT_HOST) \ > --without-gnutls \ > + --without-mbedtls \ > + --without-wolfssl \ > + --without-mesalink \ > + --without-bearssl \ > + --without-rustls \ > --without-nss \ > - --without-winidn \ > - --without-libidn \ > - --without-axtls \ > - --without-polarssl \ > - --without-cyassl \ > + --without-hyper \ > + --without-zlib \ > + --without-brotli \ > + --without-zstd \ > + --without-gssapi \ > + --with-default-ssl-backend=openssl \ > + --with-random=/dev/urandom \ > + --without-ca-fallback \ > + --without-libpsl \ > + --without-libgsasl \ > + --without-libssh2 \ > + --without-libssh \ > + --without-wolfssh \ > --without-librtmp \ > - \ > - --disable-ares \ > - --enable-http \ > - --disable-nghttp2 \ > - --disable-cookies \ > - --disable-ftp \ > - --disable-tftp \ > - --disable-file \ > - --disable-crypto-auth \ > - --disable-libssh2 \ > - --with-ssl > + --without-winidn \ > + --without-libidn2 \ > + --without-nghttp2 \ > + --without-ngtcp2 \ > + --without-nghttp3 \ > + --without-quiche \ > + --without-zsh-functions-dir \ > + --without-fish-functions-dir > > $(STATEDIR)/host-libcurl.install: > @$(call targetinfo) > diff --git a/rules/libcurl.make b/rules/libcurl.make > index 2e68e51ea930..fcf042f9dec6 100644 > --- a/rules/libcurl.make > +++ b/rules/libcurl.make > @@ -15,10 +15,10 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl > # > # Paths and names > # > -LIBCURL_VERSION := 7.77.0 > -LIBCURL_MD5 := 045d28029679dabb6b20a814934671ad > +LIBCURL_VERSION := 7.80.0 > +LIBCURL_MD5 := cf9f8553762150ef0ebcd5ee412737f5 > LIBCURL := curl-$(LIBCURL_VERSION) > -LIBCURL_SUFFIX := tar.bz2 > +LIBCURL_SUFFIX := tar.xz > LIBCURL_URL := https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) > LIBCURL_SOURCE := $(SRCDIR)/$(LIBCURL).$(LIBCURL_SUFFIX) > LIBCURL_DIR := $(BUILDDIR)/$(LIBCURL) > @@ -40,7 +40,6 @@ LIBCURL_CONF_OPT := \ > --disable-werror \ > --disable-curldebug \ > --enable-symbol-hiding \ > - --enable-hidden-symbols \ > --$(call ptx/endis, PTXCONF_LIBCURL_C_ARES)-ares \ > --enable-rt \ > --disable-ech \ > @@ -73,6 +72,7 @@ LIBCURL_CONF_OPT := \ > --$(call ptx/endis, PTXCONF_LIBCURL_VERBOSE)-verbose \ > --disable-sspi \ > --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-crypto-auth \ > + --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-ntlm \ > --disable-ntlm-wb \ > --enable-tls-srp \ > --enable-unix-sockets \ > @@ -85,7 +85,7 @@ LIBCURL_CONF_OPT := \ > --enable-netrc \ > --enable-progress-meter \ > --disable-dnsshuffle \ > - --enable-get-easy-option \ > + --enable-get-easy-options \ > --disable-alt-svc \ > --enable-hsts \ > --without-schannel \ > @@ -99,6 +99,7 @@ LIBCURL_CONF_OPT := \ > --without-bearssl \ > --without-rustls \ > --without-nss \ > + --without-hyper \ > --with-zlib=$(SYSROOT) \ > --without-brotli \ > --without-zstd \ > @@ -110,7 +111,6 @@ LIBCURL_CONF_OPT := \ > --without-ca-fallback \ > --without-libpsl \ > --without-libgsasl \ > - --without-libmetalink \ > --$(call ptx/wwo, PTXCONF_LIBCURL_LIBSSH2)-libssh2 \ > --without-libssh \ > --without-wolfssh \ > @@ -121,7 +121,6 @@ LIBCURL_CONF_OPT := \ > --without-ngtcp2 \ > --without-nghttp3 \ > --without-quiche \ > - --without-hyper \ > --without-zsh-functions-dir \ > --without-fish-functions-dir > _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
