Date: Friday, July 8, 2022 @ 07:07:52
Author: eworm
Revision: 450524
upgpkg: curl 7.84.0-2: fix fatal error with select (FS#75201)
apply:
52e822173aa3cd4f610531d32fbf943f026cdca6
select: do not return fatal error on EINTR from poll()
Added:
curl/trunk/0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
Modified:
curl/trunk/PKGBUILD
----------------------------------------------------------------+
0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch | 40
++++++++++
PKGBUILD | 14 ++-
2 files changed, 51 insertions(+), 3 deletions(-)
Added: 0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
===================================================================
--- 0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
(rev 0)
+++ 0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
2022-07-08 07:07:52 UTC (rev 450524)
@@ -0,0 +1,40 @@
+From 52e822173aa3cd4f610531d32fbf943f026cdca6 Mon Sep 17 00:00:00 2001
+From: Thomas Weißschuh <tho...@t-8ch.de>
+Date: Sun, 3 Jul 2022 18:20:44 +0200
+Subject: select: do not return fatal error on EINTR from poll()
+
+The same was done for select() in 5912da25 but poll() was missed.
+
+Bug: https://bugs.archlinux.org/task/75201
+Reported-by: Alexandre Bury (gyscos at archlinux)
+
+Ref: https://github.com/curl/curl/issues/8921
+Ref: https://github.com/curl/curl/pull/8961
+Ref: https://github.com/curl/curl/commit/5912da25#r77584294
+
+Closes https://github.com/curl/curl/pull/9091
+---
+ lib/select.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/select.c b/lib/select.c
+index c16358d56..2ac074677 100644
+--- a/lib/select.c
++++ b/lib/select.c
+@@ -310,8 +310,12 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds,
timediff_t timeout_ms)
+ else
+ pending_ms = 0;
+ r = poll(ufds, nfds, pending_ms);
+- if(r <= 0)
++ if(r <= 0) {
++ if((r == -1) && (SOCKERRNO == EINTR))
++ /* make EINTR from select or poll not a "lethal" error */
++ r = 0;
+ return r;
++ }
+
+ for(i = 0; i < nfds; i++) {
+ if(ufds[i].fd == CURL_SOCKET_BAD)
+--
+cgit v1.2.3-18-g5258
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-08 01:50:34 UTC (rev 450523)
+++ PKGBUILD 2022-07-08 07:07:52 UTC (rev 450524)
@@ -7,7 +7,7 @@
pkgbase=curl
pkgname=(curl libcurl-compat libcurl-gnutls)
pkgver=7.84.0
-pkgrel=1
+pkgrel=2
pkgdesc='An URL retrieval utility and library'
arch=('x86_64')
url='https://curl.haxx.se'
@@ -17,9 +17,11 @@
'libidn2' 'libidn2.so' 'libnghttp2' 'libpsl' 'libpsl.so' 'libssh2'
'libssh2.so'
'openssl' 'zlib' 'zstd' 'libzstd.so')
provides=('libcurl.so')
-source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc})
+source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc}
+ '0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch')
sha512sums=('8133baf48dfd93531ce0a226b54cb153fd58bb0c1ffe8159cee0c0aa23ce210192c572e8ee01f3d75a87b609a580e76929df1e66635be59c177b0cb8076043b2'
- 'SKIP')
+ 'SKIP'
+
'3d771caae23f4b602e57788c61d3f4eaccbd3a73e7256ef7dc2699e574554246280afde1f9eac10c54a498aa0d25de6e696ea36f65389e45ec8ec9abcb3bfb88')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
_configure_options=(
@@ -37,6 +39,12 @@
--with-ca-bundle='/etc/ssl/certs/ca-certificates.crt'
)
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ patch -Np1 <
../0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
+}
+
build() {
mkdir build-curl{,-compat,-gnutls}
