upg curl man-db
This commit is contained in:
parent
38d4f1144b
commit
26fb78f22d
6 changed files with 56 additions and 14 deletions
|
|
@ -0,0 +1,34 @@
|
|||
From 728400f875e845f72ee5602edb905f6301ade3e7 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Stenberg <daniel@haxx.se>
|
||||
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);
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
pkgbase=curl
|
||||
pkgname=(curl libcurl-compat libcurl-gnutls)
|
||||
pkgver=7.87.0
|
||||
pkgrel=02
|
||||
pkgrel=03
|
||||
pkgdesc='An URL retrieval utility and library - w/o ipv6 & zstd'
|
||||
arch=('x86_64')
|
||||
url='https://curl.haxx.se'
|
||||
|
|
@ -19,7 +19,8 @@ depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so'
|
|||
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')
|
||||
|
||||
_configure_options=(
|
||||
--prefix='/usr'
|
||||
|
|
@ -41,6 +42,8 @@ prepare() {
|
|||
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() {
|
||||
|
|
@ -136,9 +139,10 @@ validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
|
|||
|
||||
sha256sums=(8a063d664d1c23d35526b87a2bf15514962ffdd8ef7fd40519191b3c23e39548 # curl-7.87.0.tar.gz
|
||||
0b2d605653367adeaee6f33d190c0791b6809afd6b6469468bd2c1d532409ab8 # curl-7.87.0.tar.gz.asc
|
||||
15b85263f8b8a7acbfa0861d71ce994cbe26c1a67e7de6749cb11831e34a481f) # 0001-typecheck_accept_expressions_for_option_info_parameters.patch
|
||||
15b85263f8b8a7acbfa0861d71ce994cbe26c1a67e7de6749cb11831e34a481f # 0001-typecheck_accept_expressions_for_option_info_parameters.patch
|
||||
5e55bdecb85a2bd0f254a7c875e9d3df353c555d229fb661cf247e31ffb15ae1) # 0002-cfilters_Curl_conn_get_select_socks_use_the_first_non_connected_filter.patch
|
||||
|
||||
sha512sums=(939be5a7d82f7ed4e96173639aa50f5e6748b387d3f458f3845c584ad24d15d77b8cd64f4f2dc11bcc207b097d125d1dc713a9769964e3d4766182a217e9898d
|
||||
SKIP
|
||||
89bacef6d58f296c4a21e0bf669b94b8dd771aae7a3897b445b7d98a0cf006e6131ed9a26d8e10aef4605c5a9d63030332ca5e32e8bae35e8a1844f1ae2c47a1)
|
||||
# 794c4697b48440210f3a8830caea092612674369eeff004fe35c3fdc42d5f8b3 curl-7.87.0-03-x86_64.pkg.tar.xz
|
||||
# c23ec1e5be61bc14e605796f29acfe7c903bb50fe44309efd071eb62c4869e66 libcurl-compat-7.87.0-03-x86_64.pkg.tar.xz
|
||||
# 805a08cde81c7068ae551320b145fc843085dec05a2447b1f52a6f4c77e0701d libcurl-gnutls-7.87.0-03-x86_64.pkg.tar.xz
|
||||
|
||||
|
|
|
|||
|
|
@ -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 @@ depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so'
|
|||
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 @@ prepare() {
|
|||
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() {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=man-db
|
||||
pkgver=2.11.1
|
||||
pkgver=2.11.2
|
||||
pkgrel=01
|
||||
pkgdesc="A utility for reading man pages w/o systemd"
|
||||
arch=('x86_64')
|
||||
|
|
@ -76,8 +76,8 @@ license=('GPL' 'LGPL')
|
|||
|
||||
validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson <cjwatson@debian.org>
|
||||
|
||||
sha256sums=(2eabaa5251349847de9c9e43c634d986cbcc6f87642d1d9cb8608ec18487b6cc # man-db-2.11.1.tar.xz
|
||||
52d06ba9bdaca2962750564316c487f1add8356e7028e088a28e645bf9efa9ef # man-db-2.11.1.tar.xz.asc
|
||||
sha256sums=(cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d # man-db-2.11.2.tar.xz
|
||||
9ae5e922206cd905c64347437385026e70d0955d35222cde4c66f178790b2c3d # man-db-2.11.2.tar.xz.asc
|
||||
affab3adc4b83d011ed83060d8ac579211c932e6c0900b92e12779c092ad5df3) # convert-mans
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
|
||||
|
||||
pkgname=man-db
|
||||
pkgver=2.11.1
|
||||
pkgver=2.11.2
|
||||
pkgrel=1
|
||||
pkgdesc="A utility for reading man pages"
|
||||
arch=('x86_64')
|
||||
|
|
@ -23,7 +23,7 @@ source=(https://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.as
|
|||
convert-mans
|
||||
)
|
||||
validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson <cjwatson@debian.org>
|
||||
sha512sums=('249d65d01d83feac2503bfc1fba6d018ea0f7485c1112f1bfb4849ef7fbc3c1a50b97ab0844a7792d83bb1084a89abb4fa309ce1bc2bdf1183fe35b9e4f06263'
|
||||
sha512sums=('edb71cce7249c7b7f2f524e92f682047a77ed9ae8856763dfc8e18e239444651ff4c505e697f5a8b1be3b85678e714fbb1a520defe72a4eb685bc2cecc0e4391'
|
||||
'SKIP'
|
||||
'0b159285da20008f0fc0afb21f1eaebd39e8df5b0594880aa0e8a913b656608b8d16bb8d279d9e62d7aae52f62cb9b2fc49e237c6711f4a5170972b38d345535')
|
||||
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@ po4a
|
|||
libpipeline
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue