diff --git a/srcpkgs/curl/patches/fix-content-encoding.patch b/srcpkgs/curl/patches/fix-content-encoding.patch deleted file mode 100644 index f64546b6e08..00000000000 --- a/srcpkgs/curl/patches/fix-content-encoding.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/srcpkgs/curl/patches/fix-netrc.patch b/srcpkgs/curl/patches/fix-netrc.patch deleted file mode 100644 index 39ecce44dde..00000000000 --- a/srcpkgs/curl/patches/fix-netrc.patch +++ /dev/null @@ -1,214 +0,0 @@ -From d8010d956f09069d1d6b474abdee5864569e6920 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 7 Nov 2024 08:52:38 +0100 -Subject: [PATCH] duphandle: also init netrc - -The netrc init was only done in the Curl_open, meaning that a duplicated -handle would not get inited properly. - -Added test 2309 to verify. It does netrc auth with a duplicated handle. - -Regression from 3b43a05 - -Reported-by: tranzystorekk on github -Fixes #15496 -Closes #15... ---- - lib/easy.c | 1 + - tests/data/Makefile.am | 2 +- - tests/data/test2309 | 63 ++++++++++++++++++++++++++++++++++++ - tests/libtest/Makefile.inc | 5 ++- - tests/libtest/lib2309.c | 66 ++++++++++++++++++++++++++++++++++++++ - 5 files changed, 135 insertions(+), 2 deletions(-) - create mode 100644 tests/data/test2309 - create mode 100644 tests/libtest/lib2309.c - -diff --git a/lib/easy.c b/lib/easy.c -index d16fa8c07afec0..ac8fab34220d9b 100644 ---- a/lib/easy.c -+++ b/lib/easy.c -@@ -940,6 +940,7 @@ CURL *curl_easy_duphandle(CURL *d) - goto fail; - - Curl_dyn_init(&outcurl->state.headerb, CURL_MAX_HTTP_HEADER); -+ Curl_netrc_init(&outcurl->state.netrc); - - /* the connection pool is setup on demand */ - outcurl->state.lastconnect_id = -1; -diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index 02bf2ae25bfd49..ea5221c00fd419 100644 ---- a/tests/data/Makefile.am -+++ b/tests/data/Makefile.am -@@ -255,7 +255,7 @@ test2100 \ - test2200 test2201 test2202 test2203 test2204 test2205 \ - \ - test2300 test2301 test2302 test2303 test2304 test2305 test2306 test2307 \ --test2308 \ -+test2308 test2309 \ - \ - test2400 test2401 test2402 test2403 test2404 test2405 test2406 \ - \ -diff --git a/tests/data/test2309 b/tests/data/test2309 -new file mode 100644 -index 00000000000000..a7ab8ed83b4945 ---- /dev/null -+++ b/tests/data/test2309 -@@ -0,0 +1,63 @@ -+ -+ -+ -+netrc -+HTTP -+ -+ -+# -+# Server-side -+ -+ -+HTTP/1.1 200 OK -+Date: Tue, 09 Nov 2010 14:49:00 GMT -+Server: test-server/fake -+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT -+ETag: "21025-dc7-39462498" -+Accept-Ranges: bytes -+Content-Length: 6 -+Connection: close -+Content-Type: text/html -+Funny-head: yesyes -+ -+-foo- -+ -+ -+ -+# -+# Client-side -+ -+ -+http -+ -+ -+# Reproducing issue 15496 -+ -+HTTP with .netrc using duped easy handle -+ -+ -+lib%TESTNUMBER -+ -+ -+http://github.com %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ -+ -+ -+ -+machine github.com -+ -+login daniel -+password $y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1 -+ -+ -+ -+ -+ -+GET http://github.com/ HTTP/1.1 -+Host: github.com -+Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64% -+Accept: */* -+Proxy-Connection: Keep-Alive -+ -+ -+ -+ -diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc -index 339a00fc4ed41e..8f58fd64229d5c 100644 ---- a/tests/libtest/Makefile.inc -+++ b/tests/libtest/Makefile.inc -@@ -77,7 +77,7 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq \ - lib1945 lib1946 lib1947 lib1948 lib1955 lib1956 lib1957 lib1958 lib1959 \ - lib1960 lib1964 \ - lib1970 lib1971 lib1972 lib1973 lib1974 lib1975 \ -- lib2301 lib2302 lib2304 lib2305 lib2306 lib2308 \ -+ lib2301 lib2302 lib2304 lib2305 lib2306 lib2308 lib2309 \ - lib2402 lib2404 lib2405 \ - lib2502 \ - lib3010 lib3025 lib3026 lib3027 \ -@@ -683,6 +683,9 @@ lib2306_LDADD = $(TESTUTIL_LIBS) - lib2308_SOURCES = lib2308.c $(SUPPORTFILES) - lib2308_LDADD = $(TESTUTIL_LIBS) - -+lib2309_SOURCES = lib2309.c $(SUPPORTFILES) -+lib2309_LDADD = $(TESTUTIL_LIBS) -+ - lib2402_SOURCES = lib2402.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) - lib2402_LDADD = $(TESTUTIL_LIBS) - -diff --git a/tests/libtest/lib2309.c b/tests/libtest/lib2309.c -new file mode 100644 -index 00000000000000..009ff92817ab8c ---- /dev/null -+++ b/tests/libtest/lib2309.c -@@ -0,0 +1,66 @@ -+/*************************************************************************** -+ * _ _ ____ _ -+ * Project ___| | | | _ \| | -+ * / __| | | | |_) | | -+ * | (__| |_| | _ <| |___ -+ * \___|\___/|_| \_\_____| -+ * -+ * Copyright (C) Daniel Stenberg, , et al. -+ * -+ * This software is licensed as described in the file COPYING, which -+ * you should have received as part of this distribution. The terms -+ * are also available at https://curl.se/docs/copyright.html. -+ * -+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell -+ * copies of the Software, and permit persons to whom the Software is -+ * furnished to do so, under the terms of the COPYING file. -+ * -+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -+ * KIND, either express or implied. -+ * -+ * SPDX-License-Identifier: curl -+ * -+ ***************************************************************************/ -+ -+#include "test.h" -+#include "testtrace.h" -+ -+#include -+ -+static size_t cb_curl(char *buffer, size_t size, size_t nmemb, void *userp) -+{ -+ (void)buffer; -+ (void)size; -+ (void)nmemb; -+ (void)userp; -+ return CURL_WRITEFUNC_ERROR; -+} -+ -+CURLcode test(char *URL) -+{ -+ CURL *curl; -+ CURL *curldupe; -+ CURLcode res = CURLE_OK; -+ -+ global_init(CURL_GLOBAL_ALL); -+ curl = curl_easy_init(); -+ if(curl) { -+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cb_curl); -+ curl_easy_setopt(curl, CURLOPT_URL, URL); -+ curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); -+ curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg3); -+ curl_easy_setopt(curl, CURLOPT_NETRC, (long)CURL_NETRC_REQUIRED); -+ curl_easy_setopt(curl, CURLOPT_NETRC_FILE, libtest_arg2); -+ -+ curldupe = curl_easy_duphandle(curl); -+ if(curldupe) { -+ res = curl_easy_perform(curldupe); -+ printf("Returned %d, should be %d.\n", res, CURLE_WRITE_ERROR); -+ fflush(stdout); -+ curl_easy_cleanup(curldupe); -+ } -+ curl_easy_cleanup(curl); -+ } -+ curl_global_cleanup(); -+ return CURLE_OK; -+} diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 30a17c5eb99..a8c1be5f4be 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,7 +1,7 @@ # Template file for 'curl' pkgname=curl -version=8.11.0 -revision=3 +version=8.11.1 +revision=1 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 --with-random=/dev/urandom @@ -30,7 +30,7 @@ license="MIT" homepage="https://curl.se" changelog="https://curl.se/changes.html" distfiles="https://curl.se/download/curl-${version}.tar.gz" -checksum=264537d90e58d2b09dddc50944baf3c38e7089151c8986715e2aaeaaf2b8118f +checksum=a889ac9dbba3644271bd9d1302b5c22a088893719b72be3487bc3d401e5c4e80 build_options="gnutls gssapi idn ldap psl rtmp ssh ssl zstd" build_options_default="idn psl ssh ssl zstd" vopt_conflict ssl gnutls