From: MouadCharradi <MouadCharradi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] curl: update to 7.84.0.
Date: Wed, 13 Jul 2022 16:21:10 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38039@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
There is a new pull request by MouadCharradi against master on the void-packages repository
https://github.com/MouadCharradi/void-packages curl
https://github.com/void-linux/void-packages/pull/38039
curl: update to 7.84.0.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86-64, glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/38039.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-curl-38039.patch --]
[-- Type: text/x-diff, Size: 3345 bytes --]
From c017c3cda203d29a2ef682d1502eff921d688b7d Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Wed, 13 Jul 2022 15:16:31 +0100
Subject: [PATCH] curl: update to 7.84.0.
---
...eturn-fatal-error-on-EINTR-from-poll.patch | 40 +++++++++++++++++++
srcpkgs/curl/template | 8 ++--
2 files changed, 44 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/curl/patches/0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
diff --git a/srcpkgs/curl/patches/0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch b/srcpkgs/curl/patches/0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
new file mode 100644
index 000000000000..c2456da0e1d7
--- /dev/null
+++ b/srcpkgs/curl/patches/0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
@@ -0,0 +1,40 @@
+From 52e822173aa3cd4f610531d32fbf943f026cdca6 Mon Sep 17 00:00:00 2001
+From: Thomas Weißschuh <thomas@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
+
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 00cbfd709875..7f8d4053b71d 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,6 +1,6 @@
# Template file for 'curl'
pkgname=curl
-version=7.83.1
+version=7.84.0
revision=1
build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
@@ -24,7 +24,7 @@ license="MIT"
homepage="https://curl.haxx.se"
changelog="https://curl.haxx.se/changes.html#${version//./_}"
distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=f539a36fb44a8260ec5d977e4e0dbdd2eee29ed90fcedaa9bc3c9f78a113bff0
+checksum=702fb26e73190a3bd77071aa146f507b9817cc4dfce218d2ab87f00cd3bc059d
build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
build_options_default="ssh ssl zstd"
vopt_conflict ssl gnutls
@@ -55,10 +55,10 @@ post_install() {
fi
# Fix linker search paths when necessary
- if [ -n "$XBPS_CROSS_BASE" ]; then
+ if [ -n "${XBPS_CROSS_BASE}" ]; then
# Leave $XBPS_CROSS_BASE in --configure to reflect how it was built
vsed -i $DESTDIR/usr/bin/curl-config \
- -e "/[ ]*--static-libs)/,/[ ]*;;/ s,-L$XBPS_CROSS_BASE,-L,"
+ -e "/[ ]*--static-libs)/,/[ ]*;;/ s,-L${XBPS_CROSS_BASE},-L,"
fi
vlicense COPYING
next reply other threads:[~2022-07-13 14:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-13 14:21 MouadCharradi [this message]
2022-07-13 15:09 ` biopsin
2022-07-14 9:57 ` mhmdanas
2022-07-14 11:39 ` JamiKettunen
2022-07-14 11:48 ` mhmdanas
2022-07-14 11:49 ` mhmdanas
2022-07-14 11:58 ` JamiKettunen
2022-07-14 12:02 ` JamiKettunen
2022-07-14 12:04 ` mhmdanas
2022-07-14 12:45 ` [PR PATCH] [Updated] " MouadCharradi
2022-07-14 12:51 ` MouadCharradi
2022-07-14 13:09 ` [PR PATCH] [Updated] " MouadCharradi
2022-07-14 14:57 ` JamiKettunen
2022-07-17 19:05 ` ericonr
2022-07-17 19:24 ` ericonr
2022-07-17 19:25 ` ericonr
2022-07-17 19:43 ` ericonr
2022-07-17 19:43 ` [PR PATCH] [Closed]: " ericonr
-- strict thread matches above, loose matches on Subject: below --
2022-07-06 10:35 [PR PATCH] " ishaanbhimwal
2022-07-03 23:58 mhmdanas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38039@inbox.vuxu.org \
--to=mouadcharradi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).