* Re: [ptxdist] [APPLIED] libcurl: Version bump. 7.82.0 -> 7.83.0
2022-04-27 11:08 [ptxdist] [PATCH v2] libcurl: Version bump. 7.82.0 -> 7.83.0 Christian Melki
@ 2022-05-09 6:28 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-05-09 6:28 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as b6681a786f773132719369d38859350597f1e139.
Michael
[sent from post-receive hook]
On Mon, 09 May 2022 08:28:59 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> The usual bunch of bugfixes. Curl is very active, as always.
> https://curl.se/changes.html#7_83_0
> Plugs vulnerabilities: CVE-2022-27776, CVE-2022-27775, CVE-2022-27774 and CVE-2022-22576.
> All still in preliminary state @mitre as of writing.
> For details about curl security, visit the security page:
> https://curl.se/docs/security.html
>
> * Builds without nss per default.
> * Explicitly disable headers-api.
> * Explicitly disable msh3.
> * lber is disabled by not selecting ldap (no change from previous).
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220427110807.31395-1-christian.melki@t2data.com>
> [mol: add upstream fix to build host-libcurl]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/curl-7.83.0/0001-http-move-Curl_allow_auth_to_host.patch b/patches/curl-7.83.0/0001-http-move-Curl_allow_auth_to_host.patch
> new file mode 100644
> index 000000000000..e94cc87a54d4
> --- /dev/null
> +++ b/patches/curl-7.83.0/0001-http-move-Curl_allow_auth_to_host.patch
> @@ -0,0 +1,61 @@
> +From: Daniel Stenberg <daniel@haxx.se>
> +Date: Fri, 29 Apr 2022 22:56:47 +0200
> +Subject: [PATCH] http: move Curl_allow_auth_to_host()
> +
> +It was mistakenly put within the CURL_DISABLE_HTTP_AUTH #ifdef
> +
> +Reported-by: Michael Olbrich
> +Fixes #8772
> +Closes #8775
> +---
> + lib/http.c | 30 +++++++++++++++---------------
> + 1 file changed, 15 insertions(+), 15 deletions(-)
> +
> +diff --git a/lib/http.c b/lib/http.c
> +index 0d5c449bc72a..b215307dcaaa 100644
> +--- a/lib/http.c
> ++++ b/lib/http.c
> +@@ -651,6 +651,21 @@ CURLcode Curl_http_auth_act(struct Curl_easy *data)
> + return result;
> + }
> +
> ++/*
> ++ * Curl_allow_auth_to_host() tells if authentication, cookies or other
> ++ * "sensitive data" can (still) be sent to this host.
> ++ */
> ++bool Curl_allow_auth_to_host(struct Curl_easy *data)
> ++{
> ++ struct connectdata *conn = data->conn;
> ++ return (!data->state.this_is_a_follow ||
> ++ data->set.allow_auth_to_other_hosts ||
> ++ (data->state.first_host &&
> ++ strcasecompare(data->state.first_host, conn->host.name) &&
> ++ (data->state.first_remote_port == conn->remote_port) &&
> ++ (data->state.first_remote_protocol == conn->handler->protocol)));
> ++}
> ++
> + #ifndef CURL_DISABLE_HTTP_AUTH
> + /*
> + * Output the correct authentication header depending on the auth type
> +@@ -775,21 +790,6 @@ output_auth_headers(struct Curl_easy *data,
> + return CURLE_OK;
> + }
> +
> +-/*
> +- * Curl_allow_auth_to_host() tells if authentication, cookies or other
> +- * "sensitive data" can (still) be sent to this host.
> +- */
> +-bool Curl_allow_auth_to_host(struct Curl_easy *data)
> +-{
> +- struct connectdata *conn = data->conn;
> +- return (!data->state.this_is_a_follow ||
> +- data->set.allow_auth_to_other_hosts ||
> +- (data->state.first_host &&
> +- strcasecompare(data->state.first_host, conn->host.name) &&
> +- (data->state.first_remote_port == conn->remote_port) &&
> +- (data->state.first_remote_protocol == conn->handler->protocol)));
> +-}
> +-
> + /**
> + * Curl_http_output_auth() setups the authentication headers for the
> + * host/proxy and the correct authentication
> diff --git a/patches/curl-7.83.0/series b/patches/curl-7.83.0/series
> new file mode 100644
> index 000000000000..9ccc49f9cceb
> --- /dev/null
> +++ b/patches/curl-7.83.0/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-http-move-Curl_allow_auth_to_host.patch
> +# c4e69d4d6fe80949a188daf1e2e80518 - git-ptx-patches magic
> diff --git a/rules/libcurl.make b/rules/libcurl.make
> index 3c99caa47e3e..3840b2abd2db 100644
> --- a/rules/libcurl.make
> +++ b/rules/libcurl.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
> #
> # Paths and names
> #
> -LIBCURL_VERSION := 7.82.0
> -LIBCURL_MD5 := ce05eb61ef7c398feb7dbe23122d0bd9
> +LIBCURL_VERSION := 7.83.0
> +LIBCURL_MD5 := b7924acdea33dedc3150a044789ed0bb
> LIBCURL := curl-$(LIBCURL_VERSION)
> LIBCURL_SUFFIX := tar.xz
> LIBCURL_URL := https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
> @@ -45,6 +45,7 @@ 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 \
> @@ -119,6 +120,7 @@ LIBCURL_CONF_OPT := \
> --without-libidn2 \
> --without-nghttp2 \
> --without-ngtcp2 \
> + --without-msh3 \
> --without-nghttp3 \
> --without-quiche \
> --without-zsh-functions-dir \
^ permalink raw reply [flat|nested] 2+ messages in thread