* [ptxdist] [PATCH] libcurl: Version bump. 8.2.1 -> 8.3.0
@ 2023-09-15 17:59 Christian Melki
2023-09-24 5:44 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2023-09-15 17:59 UTC (permalink / raw)
To: ptxdist
Some work went in to more tweaks and making a smaller curl.
https://curl.se/changes.html#8_3_0
Plugs CVEs:
CVE-2023-38039 HTTP headers eat all memory
* crypto-auth is actually gone. But instead of adding per auth
capability right now, just keep the symbol and make it behave as it used to.
Sans basic-auth that is. That was always enabled.
* Move some options to better adapt to options filtering.
* Make bindlocal enabled, as it used to be.
* Make form-api dependant on mime, afaiu, this is how it works.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/libcurl.make | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/rules/libcurl.make b/rules/libcurl.make
index c19f828e5..ad615bd87 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
#
# Paths and names
#
-LIBCURL_VERSION := 8.2.1
-LIBCURL_MD5 := 556576a795bdd2c7d10de6886480065f
+LIBCURL_VERSION := 8.3.0
+LIBCURL_MD5 := 2fc6cf5cefa8b73e3826aa24befdccff
LIBCURL := curl-$(LIBCURL_VERSION)
LIBCURL_SUFFIX := tar.xz
LIBCURL_URL := https://curl.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
@@ -45,7 +45,6 @@ LIBCURL_CONF_OPT := \
--enable-rt \
--disable-ech \
--disable-code-coverage \
- --disable-headers-api \
$(GLOBAL_LARGE_FILE_OPTION) \
--$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http \
--$(call ptx/endis, PTXCONF_LIBCURL_FTP)-ftp \
@@ -73,7 +72,12 @@ LIBCURL_CONF_OPT := \
--enable-pthreads \
--$(call ptx/endis, PTXCONF_LIBCURL_VERBOSE)-verbose \
--disable-sspi \
- --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-crypto-auth \
+ --enable-basic-auth \
+ --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-bearer-auth \
+ --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-digest-auth \
+ --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-kerberos-auth \
+ --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-negotiate-auth \
+ --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-aws \
--$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-ntlm \
--disable-ntlm-wb \
--enable-tls-srp \
@@ -83,12 +87,15 @@ LIBCURL_CONF_OPT := \
--$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http-auth \
--disable-doh \
--$(call ptx/endis, PTXCONF_LIBCURL_MIME)-mime \
+ --enable-bindlocal \
+ --$(call ptx/endis, PTXCONF_LIBCURL_MIME)-form-api \
--enable-dateparse \
--enable-netrc \
--enable-progress-meter \
--disable-dnsshuffle \
--enable-get-easy-options \
--disable-alt-svc \
+ --disable-headers-api \
--enable-hsts \
--disable-websockets \
--without-schannel \
@@ -101,7 +108,6 @@ LIBCURL_CONF_OPT := \
--without-wolfssl \
--without-bearssl \
--without-rustls \
- --without-nss \
--without-hyper \
--with-zlib=$(SYSROOT) \
--without-brotli \
@@ -122,9 +128,9 @@ LIBCURL_CONF_OPT := \
--without-libidn2 \
--without-nghttp2 \
--without-ngtcp2 \
- --without-msh3 \
--without-nghttp3 \
--without-quiche \
+ --without-msh3 \
--without-zsh-functions-dir \
--without-fish-functions-dir
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] libcurl: Version bump. 8.2.1 -> 8.3.0
2023-09-15 17:59 [ptxdist] [PATCH] libcurl: Version bump. 8.2.1 -> 8.3.0 Christian Melki
@ 2023-09-24 5:44 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-09-24 5:44 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 8ecec82432c61630537aa95f57c413055c8f6fa8.
Michael
[sent from post-receive hook]
On Sun, 24 Sep 2023 07:44:34 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Some work went in to more tweaks and making a smaller curl.
> https://curl.se/changes.html#8_3_0
>
> Plugs CVEs:
> CVE-2023-38039 HTTP headers eat all memory
>
> * crypto-auth is actually gone. But instead of adding per auth
> capability right now, just keep the symbol and make it behave as it used to.
> Sans basic-auth that is. That was always enabled.
>
> * Move some options to better adapt to options filtering.
>
> * Make bindlocal enabled, as it used to be.
>
> * Make form-api dependant on mime, afaiu, this is how it works.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230915175919.2719326-1-christian.melki@t2data.com>
> [mol: update host-libcurl configure options]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-libcurl.make b/rules/host-libcurl.make
> index 509b6c015e46..686a3d4ab3dc 100644
> --- a/rules/host-libcurl.make
> +++ b/rules/host-libcurl.make
> @@ -57,7 +57,12 @@ HOST_LIBCURL_CONF_OPT := \
> --enable-pthreads \
> --disable-verbose \
> --disable-sspi \
> - --disable-crypto-auth \
> + --enable-basic-auth \
> + --disable-bearer-auth \
> + --disable-digest-auth \
> + --disable-kerberos-auth \
> + --disable-negotiate-auth \
> + --disable-aws \
> --disable-ntlm \
> --disable-ntlm-wb \
> --disable-tls-srp \
> @@ -67,23 +72,27 @@ HOST_LIBCURL_CONF_OPT := \
> --disable-http-auth \
> --disable-doh \
> --disable-mime \
> + --enable-bindlocal \
> + --disable-form-api \
> --enable-dateparse \
> --disable-netrc \
> --enable-progress-meter \
> --disable-dnsshuffle \
> --enable-get-easy-options \
> --disable-alt-svc \
> + --disable-headers-api \
> --enable-hsts \
> + --disable-websockets \
> --without-schannel \
> --without-secure-transport \
> --without-amissl \
> + --with-ssl \
> --with-openssl=$(PTXDIST_SYSROOT_HOST) \
> --without-gnutls \
> --without-mbedtls \
> --without-wolfssl \
> --without-bearssl \
> --without-rustls \
> - --without-nss \
> --without-hyper \
> --without-zlib \
> --without-brotli \
> @@ -104,6 +113,7 @@ HOST_LIBCURL_CONF_OPT := \
> --without-ngtcp2 \
> --without-nghttp3 \
> --without-quiche \
> + --without-msh3 \
> --without-zsh-functions-dir \
> --without-fish-functions-dir
>
> diff --git a/rules/libcurl.make b/rules/libcurl.make
> index c19f828e51e5..ad615bd87f1c 100644
> --- a/rules/libcurl.make
> +++ b/rules/libcurl.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
> #
> # Paths and names
> #
> -LIBCURL_VERSION := 8.2.1
> -LIBCURL_MD5 := 556576a795bdd2c7d10de6886480065f
> +LIBCURL_VERSION := 8.3.0
> +LIBCURL_MD5 := 2fc6cf5cefa8b73e3826aa24befdccff
> LIBCURL := curl-$(LIBCURL_VERSION)
> LIBCURL_SUFFIX := tar.xz
> LIBCURL_URL := https://curl.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
> @@ -45,7 +45,6 @@ LIBCURL_CONF_OPT := \
> --enable-rt \
> --disable-ech \
> --disable-code-coverage \
> - --disable-headers-api \
> $(GLOBAL_LARGE_FILE_OPTION) \
> --$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http \
> --$(call ptx/endis, PTXCONF_LIBCURL_FTP)-ftp \
> @@ -73,7 +72,12 @@ LIBCURL_CONF_OPT := \
> --enable-pthreads \
> --$(call ptx/endis, PTXCONF_LIBCURL_VERBOSE)-verbose \
> --disable-sspi \
> - --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-crypto-auth \
> + --enable-basic-auth \
> + --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-bearer-auth \
> + --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-digest-auth \
> + --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-kerberos-auth \
> + --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-negotiate-auth \
> + --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-aws \
> --$(call ptx/endis, PTXCONF_LIBCURL_CRYPTO_AUTH)-ntlm \
> --disable-ntlm-wb \
> --enable-tls-srp \
> @@ -83,12 +87,15 @@ LIBCURL_CONF_OPT := \
> --$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http-auth \
> --disable-doh \
> --$(call ptx/endis, PTXCONF_LIBCURL_MIME)-mime \
> + --enable-bindlocal \
> + --$(call ptx/endis, PTXCONF_LIBCURL_MIME)-form-api \
> --enable-dateparse \
> --enable-netrc \
> --enable-progress-meter \
> --disable-dnsshuffle \
> --enable-get-easy-options \
> --disable-alt-svc \
> + --disable-headers-api \
> --enable-hsts \
> --disable-websockets \
> --without-schannel \
> @@ -101,7 +108,6 @@ LIBCURL_CONF_OPT := \
> --without-wolfssl \
> --without-bearssl \
> --without-rustls \
> - --without-nss \
> --without-hyper \
> --with-zlib=$(SYSROOT) \
> --without-brotli \
> @@ -122,9 +128,9 @@ LIBCURL_CONF_OPT := \
> --without-libidn2 \
> --without-nghttp2 \
> --without-ngtcp2 \
> - --without-msh3 \
> --without-nghttp3 \
> --without-quiche \
> + --without-msh3 \
> --without-zsh-functions-dir \
> --without-fish-functions-dir
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-24 5:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-15 17:59 [ptxdist] [PATCH] libcurl: Version bump. 8.2.1 -> 8.3.0 Christian Melki
2023-09-24 5:44 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox