From patchwork Sun May 26 16:26:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Joslyn X-Patchwork-Id: 44189 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7818C25B75 for ; Sun, 26 May 2024 16:27:17 +0000 (UTC) Received: from wilbur.contactoffice.com (wilbur.contactoffice.com [212.3.242.68]) by mx.groups.io with SMTP id smtpd.web11.9832.1716740833985904903 for ; Sun, 26 May 2024 09:27:14 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=robert.joslyn@redrectangle.org header.s=20230812-3u04 header.b=n1p7O/eO; spf=pass (domain: redrectangle.org, ip: 212.3.242.68, mailfrom: robert.joslyn@redrectangle.org) Received: from smtpauth1.co-bxl (smtpauth1.co-bxl [10.2.0.15]) by wilbur.contactoffice.com (Postfix) with ESMTP id 4F5CB378E; Sun, 26 May 2024 18:27:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1716740832; s=20230812-3u04; d=redrectangle.org; i=robert.joslyn@redrectangle.org; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Transfer-Encoding; l=5138; bh=i+Pv+MSL9ENbpcBWAaVD47duIxo96Fo+8XhlzKJy5l4=; b=n1p7O/eOjKZPlDiJSHTg82MAH9v10eRuwas/CMEF8SWUZm7lKwBDmlm1zW64fvFc 9beoRUNnNNIDvbFtWHw76VNwvM2Qk0WgGrvyFRm4bFq0tudV7ACZ9kBadBfFPqbKV3k xJvyRMCe6AYA9fOQ/4xdyumozdHQDcnHAfwaT8WPgRaohrdXaeJvXxea+6ROrXmEwYp 43OXvgTAsXwU3mbLii5W/RJwH5+sMdO3BruKgwsKKg8k/7AxK5/OHqfMwp5rKQt91cQ 72p0sobLlKtFYLxc9vh4u8JIgy4LHBpjy6DizPVtAI3u7nOIbmSvRxQ5ajM1R6c7cQH eqbdBjXIlQ== Received: by smtp.mailfence.com with ESMTPSA ; Sun, 26 May 2024 18:27:08 +0200 (CEST) From: robert.joslyn@redrectangle.org To: openembedded-core@lists.openembedded.org Cc: Robert Joslyn Subject: [PATCH v2] curl: Update to 8.8.0 Date: Sun, 26 May 2024 09:26:26 -0700 Message-ID: <20240526162626.2440170-1-robert.joslyn@redrectangle.org> X-Mailer: git-send-email 2.44.1 MIME-Version: 1.0 X-ContactOffice-Account: com:454140407 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 26 May 2024 16:27:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199884 From: Robert Joslyn Remove backported patch that is upsteam in this version. Disable test 1481 since it requires --libcurl option that is disabled by default. Remove --disable-ntlm-wb option since support for ntlm_wb was removed in this version Signed-off-by: Robert Joslyn --- ...41aadf4adf4f6aeb3f4c0ab489bb89610c36.patch | 64 ------------------- meta/recipes-support/curl/curl/disable-tests | 1 + .../curl/{curl_8.7.1.bb => curl_8.8.0.bb} | 4 +- 3 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch rename meta/recipes-support/curl/{curl_8.7.1.bb => curl_8.8.0.bb} (97%) diff --git a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch deleted file mode 100644 index 98f7db93e8..0000000000 --- a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 721941aadf4adf4f6aeb3f4c0ab489bb89610c36 Mon Sep 17 00:00:00 2001 -From: Stefan Eissing -Date: Mon, 1 Apr 2024 15:41:18 +0200 -Subject: [PATCH] http: with chunked POST forced, disable length check on read - callback - -- when an application forces HTTP/1.1 chunked transfer encoding - by setting the corresponding header and instructs curl to use - the CURLOPT_READFUNCTION, disregard any POST length information. -- this establishes backward compatibility with previous curl versions - -Applications are encouraged to not force "chunked", but rather -set length information for a POST. By setting -1, curl will -auto-select chunked on HTTP/1.1 and work properly on other HTTP -versions. - -Reported-by: Jeff King -Fixes #13229 -Closes #13257 -Upstream-Status: Backport ---- - lib/http.c | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -diff --git a/lib/http.c b/lib/http.c -index 92c04e69cd8373..a764d3c4403c39 100644 ---- a/lib/http.c -+++ b/lib/http.c -@@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy *data, Curl_HttpReq httpreq) - else - result = Curl_creader_set_null(data); - } -- else { /* we read the bytes from the callback */ -- result = Curl_creader_set_fread(data, postsize); -+ else { -+ /* we read the bytes from the callback. In case "chunked" encoding -+ * is forced by the application, we disregard `postsize`. This is -+ * a backward compatibility decision to earlier versions where -+ * chunking disregarded this. See issue #13229. */ -+ bool chunked = FALSE; -+ char *ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding")); -+ if(ptr) { -+ /* Some kind of TE is requested, check if 'chunked' is chosen */ -+ chunked = Curl_compareheader(ptr, STRCONST("Transfer-Encoding:"), -+ STRCONST("chunked")); -+ } -+ result = Curl_creader_set_fread(data, chunked? -1 : postsize); - } - return result; - -@@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, - data->req.upload_chunky = - Curl_compareheader(ptr, - STRCONST("Transfer-Encoding:"), STRCONST("chunked")); -+ if(data->req.upload_chunky && -+ Curl_use_http_1_1plus(data, data->conn) && -+ (data->conn->httpversion >= 20)) { -+ infof(data, "suppressing chunked transfer encoding on connection " -+ "using HTTP version 2 or higher"); -+ data->req.upload_chunky = FALSE; -+ } - } - else { - curl_off_t req_clen = Curl_creader_total_length(data); diff --git a/meta/recipes-support/curl/curl/disable-tests b/meta/recipes-support/curl/curl/disable-tests index 259576fd01..c4aa7783a1 100644 --- a/meta/recipes-support/curl/curl/disable-tests +++ b/meta/recipes-support/curl/curl/disable-tests @@ -39,3 +39,4 @@ 1404 1405 1465 +1481 diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.8.0.bb similarity index 97% rename from meta/recipes-support/curl/curl_8.7.1.bb rename to meta/recipes-support/curl/curl_8.8.0.bb index 23b7c50a86..b932594159 100644 --- a/meta/recipes-support/curl/curl_8.7.1.bb +++ b/meta/recipes-support/curl/curl_8.8.0.bb @@ -11,12 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eed2e5088e1ac619c9a1c747da291d75" SRC_URI = " \ https://curl.se/download/${BP}.tar.xz \ - file://721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch \ file://run-ptest \ file://disable-tests \ file://no-test-timeout.patch \ " -SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" +SRC_URI[sha256sum] = "0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" @@ -73,7 +72,6 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" EXTRA_OECONF = " \ --disable-libcurl-option \ - --disable-ntlm-wb \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ --without-libpsl \ --enable-optimize \