Date: Sunday, January 8, 2023 @ 20:59:12
Author: eworm
Revision: 466259
upgpkg: curl 7.87.0-3: apply upstream fix (FS#77042)
Added:
curl/trunk/0002-cfilters_Curl_conn_get_select_socks_use_the_first_non_connected_filter.patch
Modified:
curl/trunk/0001-typecheck_accept_expressions_for_option_info_parameters.patch
curl/trunk/PKGBUILD
-----------------------------------------------------------------------------------+
0001-typecheck_accept_expressions_for_option_info_parameters.patch
| 3
0002-cfilters_Curl_conn_get_select_socks_use_the_first_non_connected_filter.patch
| 34 ++++++++++
PKGBUILD
| 9 +-
3 files changed, 40 insertions(+), 6 deletions(-)
Modified: 0001-typecheck_accept_expressions_for_option_info_parameters.patch
===================================================================
--- 0001-typecheck_accept_expressions_for_option_info_parameters.patch
2023-01-08 20:44:17 UTC (rev 466258)
+++ 0001-typecheck_accept_expressions_for_option_info_parameters.patch
2023-01-08 20:59:12 UTC (rev 466259)
@@ -47,6 +47,3 @@
CURL_IGNORE_DEPRECATION( \
if(curlcheck_string_info(_curl_info)) \
if(!curlcheck_arr((arg), char *)) \
---
-cgit v1.2.3-53-g9071
-
Added:
0002-cfilters_Curl_conn_get_select_socks_use_the_first_non_connected_filter.patch
===================================================================
---
0002-cfilters_Curl_conn_get_select_socks_use_the_first_non_connected_filter.patch
(rev 0)
+++
0002-cfilters_Curl_conn_get_select_socks_use_the_first_non_connected_filter.patch
2023-01-08 20:59:12 UTC (rev 466259)
@@ -0,0 +1,34 @@
+From 728400f875e845f72ee5602edb905f6301ade3e7 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Mon, 26 Dec 2022 09:59:20 +0100
+Subject: cfilters:Curl_conn_get_select_socks: use the first non-connected
+ filter
+
+When there are filters addded for both socket and SSL, the code
+previously checked the SSL sockets during connect when it *should* first
+check the socket layer until that has connected.
+
+Fixes #10157
+Fixes #10146
+Closes #10160
+
+Reviewed-by: Stefan Eissing
+---
+ lib/cfilters.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/cfilters.c b/lib/cfilters.c
+index 8951533418..8b05fbc8f4 100644
+--- a/lib/cfilters.c
++++ b/lib/cfilters.c
+@@ -437,6 +437,10 @@ int Curl_conn_get_select_socks(struct Curl_easy *data,
int sockindex,
+ DEBUGASSERT(data);
+ DEBUGASSERT(data->conn);
+ cf = data->conn->cfilter[sockindex];
++
++ /* if the next one is not yet connected, that's the one we want */
++ while(cf && cf->next && !cf->next->connected)
++ cf = cf->next;
+ if(cf) {
+ return cf->cft->get_select_socks(cf, data, socks);
+ }
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-08 20:44:17 UTC (rev 466258)
+++ PKGBUILD 2023-01-08 20:59:12 UTC (rev 466259)
@@ -7,7 +7,7 @@
pkgbase=curl
pkgname=(curl libcurl-compat libcurl-gnutls)
pkgver=7.87.0
-pkgrel=2
+pkgrel=3
pkgdesc='An URL retrieval utility and library'
arch=('x86_64')
url='https://curl.haxx.se'
@@ -19,10 +19,12 @@
makedepends=('patchelf')
provides=('libcurl.so')
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc}
- '0001-typecheck_accept_expressions_for_option_info_parameters.patch')
+ '0001-typecheck_accept_expressions_for_option_info_parameters.patch'
+
'0002-cfilters_Curl_conn_get_select_socks_use_the_first_non_connected_filter.patch')
sha512sums=('939be5a7d82f7ed4e96173639aa50f5e6748b387d3f458f3845c584ad24d15d77b8cd64f4f2dc11bcc207b097d125d1dc713a9769964e3d4766182a217e9898d'
'SKIP'
-
'89bacef6d58f296c4a21e0bf669b94b8dd771aae7a3897b445b7d98a0cf006e6131ed9a26d8e10aef4605c5a9d63030332ca5e32e8bae35e8a1844f1ae2c47a1')
+
'813201a302cf7d70d30e12cf8461bbc5783913d865872dd08aa2f19a6de132d76cf1a698714eaf028ba8e065eef892197f814015bdc3cc06c1f351ca2220b328'
+
'98ee049419ec0c531170ca8e07b8a235bd1588f7210018a6b7bca38adf9c3babcbd540ab9ab463a15292dedeb5120aef22d252abac8cee4f539a55b46653d994')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
_configure_options=(
@@ -43,6 +45,7 @@
cd "${srcdir}/${pkgbase}-${pkgver}"
patch -Np1 <
../0001-typecheck_accept_expressions_for_option_info_parameters.patch
+ patch -Np1 <
../0002-cfilters_Curl_conn_get_select_socks_use_the_first_non_connected_filter.patch
}
build() {
