From 288eca355bdbcbf292b1bcc5a75a5cf062035edb Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 10 Nov 2024 22:24:11 +0100 Subject: [PATCH] curl-32: 8.10.1 -> 8.11.0 --- curl-32/.signature | 7 ++--- ...c429f26c27294787dc59d7b53345d9edc5aa.patch | 26 +++++++++++++++++++ curl-32/Pkgfile | 7 +++-- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 curl-32/878bc429f26c27294787dc59d7b53345d9edc5aa.patch diff --git a/curl-32/.signature b/curl-32/.signature index d5e74aa6..87f5ff07 100644 --- a/curl-32/.signature +++ b/curl-32/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXT77+RJB8lnzNCOP30cTvsaN2FFMhQBF1yOmAzWR/bUCcEMbkCgHxzK1VzK8iYIhAIxXiK7+YyL0iA/LIbMTdgg= -SHA256 (Pkgfile) = 95ced179564ce4ea782240a25d0e7b653f80d01e6cab4216d0fe1b1e647d6018 +RWSwxGo/zH7eXbkKhFoHwLs8SwIkt2YFvTdE1unPSc/XPTbGH4VXbaBdklQMqzCGifnAitFIO+/n/FWPzmvZsHYWrnrQO0RkkgQ= +SHA256 (Pkgfile) = 360e4e44106f57e7169cfbcadae7ec8e5470d0d6ac271008cf7d99ae8bf57afc SHA256 (.footprint) = 1f49d30883c63da2e3d72a616a65fa40806923dd3c80aa299aebe1ceb544379b -SHA256 (curl-8.10.1.tar.xz) = 73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee +SHA256 (curl-8.11.0.tar.xz) = db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb +SHA256 (878bc429f26c27294787dc59d7b53345d9edc5aa.patch) = 2b1f6b09167a3b90c3e13d692a880dd83c20dbf02e5f6036176f8024d2d3cfcc diff --git a/curl-32/878bc429f26c27294787dc59d7b53345d9edc5aa.patch b/curl-32/878bc429f26c27294787dc59d7b53345d9edc5aa.patch new file mode 100644 index 00000000..f64546b6 --- /dev/null +++ b/curl-32/878bc429f26c27294787dc59d7b53345d9edc5aa.patch @@ -0,0 +1,26 @@ +From 878bc429f26c27294787dc59d7b53345d9edc5aa Mon Sep 17 00:00:00 2001 +From: Jesus Malo Poyatos +Date: Thu, 7 Nov 2024 14:00:53 +0100 +Subject: [PATCH] setopt: fix CURLOPT_HTTP_CONTENT_DECODING + +Regression from 30da1f5974d34841b30c4f (shipped in 8.11.0) + +Fixes #15511 +Closes #15510 +--- + lib/setopt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/setopt.c b/lib/setopt.c +index 4f0697212739ef..ba80644bc73279 100644 +--- a/lib/setopt.c ++++ b/lib/setopt.c +@@ -1146,7 +1146,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option, + /* + * raw data passed to the application when content encoding is used + */ +- data->set.http_ce_skip = enabled; ++ data->set.http_ce_skip = !enabled; /* reversed */ + break; + + #if !defined(CURL_DISABLE_FTP) || defined(USE_SSH) diff --git a/curl-32/Pkgfile b/curl-32/Pkgfile index 3cf81666..261e1b1f 100644 --- a/curl-32/Pkgfile +++ b/curl-32/Pkgfile @@ -5,9 +5,10 @@ # Optional: brotli-32 name=curl-32 -version=8.10.1 +version=8.11.0 release=1 -source=(https://curl.se/download/${name%-*}-$version.tar.xz) +source=(https://curl.se/download/${name%-*}-$version.tar.xz + 878bc429f26c27294787dc59d7b53345d9edc5aa.patch) build() { cd ${name%-*}-$version @@ -17,6 +18,8 @@ build() { before continuing with curl-32.\033[0m\n" && exit 1 + patch -Np1 -i $SRC/878bc429f26c27294787dc59d7b53345d9edc5aa.patch + ./configure --prefix=/usr \ --libdir=/usr/lib32 \ --enable-ipv6 \