Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] curl: update to 7.84.0.
@ 2022-07-13 14:21 MouadCharradi
  2022-07-13 15:09 ` biopsin
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: MouadCharradi @ 2022-07-13 14:21 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
@ 2022-07-13 15:09 ` biopsin
  2022-07-14  9:57 ` mhmdanas
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: biopsin @ 2022-07-13 15:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New comment by biopsin on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1183346546

Comment:
duplicate #37823 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
  2022-07-13 15:09 ` biopsin
@ 2022-07-14  9:57 ` mhmdanas
  2022-07-14 11:39 ` JamiKettunen
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2022-07-14  9:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1184243756

Comment:
I haven't yet incorporated the patch in this PR into my PR, so I'll be closing my PR in favor of this one.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
  2022-07-13 15:09 ` biopsin
  2022-07-14  9:57 ` mhmdanas
@ 2022-07-14 11:39 ` JamiKettunen
  2022-07-14 11:48 ` mhmdanas
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: JamiKettunen @ 2022-07-14 11:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 664 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1184343244

Comment:
- Might as well also bring over the `--with-librtmp` fix [from the other upgrade PR](https://github.com/void-linux/void-packages/pull/37823/files#diff-21f6fba8aff08b5310a01f29fc9a03295cb7c5fa0ad5474cf7e1c38b482baac6R7) that's now closed, that is [the correct flag as per upstream configure.ac](https://github.com/curl/curl/blob/curl-7_84_0/configure.ac#L2215-L2218).
- Please also update `chroot-curl` so that `armv6l-musl`, `armv7l` and `aarch64*` pass CI.
- `i686` test failure should also perhaps be looked into.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (2 preceding siblings ...)
  2022-07-14 11:39 ` JamiKettunen
@ 2022-07-14 11:48 ` mhmdanas
  2022-07-14 11:49 ` mhmdanas
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2022-07-14 11:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 361 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1184351703

Comment:
> Please also update chroot-curl so that armv6l-musl, armv7l and aarch64* pass CI.

@JamiKettunen `srcpkgs/chroot-curl` is just a symlink to `srcpkgs/curl`, which means that it's actually already upgraded in this PR.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (3 preceding siblings ...)
  2022-07-14 11:48 ` mhmdanas
@ 2022-07-14 11:49 ` mhmdanas
  2022-07-14 11:58 ` JamiKettunen
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2022-07-14 11:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1184351703

Comment:
> Please also update chroot-curl so that armv6l-musl, armv7l and aarch64* pass CI.

@JamiKettunen `chroot-curl` is a subpackage of `curl`, which means that it's actually already upgraded in this PR.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (4 preceding siblings ...)
  2022-07-14 11:49 ` mhmdanas
@ 2022-07-14 11:58 ` JamiKettunen
  2022-07-14 12:02 ` JamiKettunen
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: JamiKettunen @ 2022-07-14 11:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1184343244

Comment:
- Might as well also bring over the `--with-librtmp` fix [from the other upgrade PR](https://github.com/void-linux/void-packages/pull/37823/files#diff-21f6fba8aff08b5310a01f29fc9a03295cb7c5fa0ad5474cf7e1c38b482baac6R7) that's now closed, that is [the correct flag as per upstream configure.ac](https://github.com/curl/curl/blob/curl-7_84_0/configure.ac#L2215-L2218).
- ~~Please also update `chroot-curl` so that `armv6l-musl`, `armv7l` and `aarch64*` pass CI.~~
- `i686` test failure should also perhaps be looked into.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (5 preceding siblings ...)
  2022-07-14 11:58 ` JamiKettunen
@ 2022-07-14 12:02 ` JamiKettunen
  2022-07-14 12:04 ` mhmdanas
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: JamiKettunen @ 2022-07-14 12:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1184363920

Comment:
> @JamiKettunen `chroot-curl` is a subpackage of `curl`, which means that it's actually already upgraded in this PR.

Ah, indeed. I've previously only seen `chroot-*` packages being separate packages with minimal build-time dependencies for bootstrap purposes; not sure what's up with the `libcurl-7.84.0_1 in transaction breaks installed pkg 'chroot-curl-7.83.1_1'` errors then, it looks like previous upgrades worked fine without any additional changes compared to this PR

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (6 preceding siblings ...)
  2022-07-14 12:02 ` JamiKettunen
@ 2022-07-14 12:04 ` mhmdanas
  2022-07-14 12:45 ` [PR PATCH] [Updated] " MouadCharradi
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2022-07-14 12:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1184365898

Comment:
Yeah, I noticed that in my previous PR, it's quite strange.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (7 preceding siblings ...)
  2022-07-14 12:04 ` mhmdanas
@ 2022-07-14 12:45 ` MouadCharradi
  2022-07-14 12:51 ` MouadCharradi
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: MouadCharradi @ 2022-07-14 12:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

There is an updated 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: 3712 bytes --]

From f30cd3b41c0b87ba8edf4138632db158576940b3 Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Thu, 14 Jul 2022 13:44:05 +0100
Subject: [PATCH] curl: update to 7.84.0.

---
 ...eturn-fatal-error-on-EINTR-from-poll.patch | 40 +++++++++++++++++++
 srcpkgs/curl/template                         | 10 ++---
 2 files changed, 45 insertions(+), 5 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..8f76ef3d781c 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,10 +1,10 @@
 # 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
- $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
+ $(vopt_with rtmp librtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
  $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) $(vopt_with zstd)
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2
  ac_cv_path_NROFF=/usr/bin/mandoc"
@@ -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

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (8 preceding siblings ...)
  2022-07-14 12:45 ` [PR PATCH] [Updated] " MouadCharradi
@ 2022-07-14 12:51 ` MouadCharradi
  2022-07-14 13:09 ` [PR PATCH] [Updated] " MouadCharradi
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: MouadCharradi @ 2022-07-14 12:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

New comment by MouadCharradi on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1184410852

Comment:
Regarding the i686 error, I feel like it could be related to [this](https://github.com/curl/curl/issues/9141) problem. A fix has already been submitted, [this patch](https://github.com/curl/curl/pull/9142/commits/8629d5eb19f033be579cb6411461b92896afda86). I'll try it and see if it works, while we find another solution for the arm architectures.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (9 preceding siblings ...)
  2022-07-14 12:51 ` MouadCharradi
@ 2022-07-14 13:09 ` MouadCharradi
  2022-07-14 14:57 ` JamiKettunen
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: MouadCharradi @ 2022-07-14 13:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

There is an updated 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: 4794 bytes --]

From 4af88a58c32a6b6e6eb76c53470c8f4ec88f36ed Mon Sep 17 00:00:00 2001
From: Mouad Charradi <charradimouad58@gmail.com>
Date: Thu, 14 Jul 2022 14:08:40 +0100
Subject: [PATCH] curl: update to 7.84.0.

---
 ...eturn-fatal-error-on-EINTR-from-poll.patch | 40 +++++++++++++++++++
 .../0002-test3026-require-threadsafe.patch    | 23 +++++++++++
 srcpkgs/curl/template                         | 10 ++---
 3 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/curl/patches/0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
 create mode 100644 srcpkgs/curl/patches/0002-test3026-require-threadsafe.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/patches/0002-test3026-require-threadsafe.patch b/srcpkgs/curl/patches/0002-test3026-require-threadsafe.patch
new file mode 100644
index 000000000000..4994f27d94d0
--- /dev/null
+++ b/srcpkgs/curl/patches/0002-test3026-require-threadsafe.patch
@@ -0,0 +1,23 @@
+From 8629d5eb19f033be579cb6411461b92896afda86 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Tue, 12 Jul 2022 15:37:21 +0200
+Subject: [PATCH] test3026: require 'threadsafe'
+
+Reported-by: Sukanya Hanumanthu
+Fixes #9141
+---
+ tests/data/test3026 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/data/test3026 b/tests/data/test3026
+index fb80cc83f6887..9654c07bfeb63 100644
+--- a/tests/data/test3026
++++ b/tests/data/test3026
+@@ -18,6 +18,7 @@ slow
+ # require the threaded resolver only because it means pthreads might
+ # be used for it
+ <features>
++threadsafe
+ threaded-resolver
+ !win32
+ </features>
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 00cbfd709875..8f76ef3d781c 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,10 +1,10 @@
 # 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
- $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
+ $(vopt_with rtmp librtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
  $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) $(vopt_with zstd)
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2
  ac_cv_path_NROFF=/usr/bin/mandoc"
@@ -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

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (10 preceding siblings ...)
  2022-07-14 13:09 ` [PR PATCH] [Updated] " MouadCharradi
@ 2022-07-14 14:57 ` JamiKettunen
  2022-07-17 19:05 ` ericonr
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: JamiKettunen @ 2022-07-14 14:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 672 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1184343244

Comment:
- ~~Might as well also bring over the `--with-librtmp` fix [from the other upgrade PR](https://github.com/void-linux/void-packages/pull/37823/files#diff-21f6fba8aff08b5310a01f29fc9a03295cb7c5fa0ad5474cf7e1c38b482baac6R7) that's now closed, that is [the correct flag as per upstream configure.ac](https://github.com/curl/curl/blob/curl-7_84_0/configure.ac#L2215-L2218).~~
- ~~Please also update `chroot-curl` so that `armv6l-musl`, `armv7l` and `aarch64*` pass CI.~~
- `i686` test failure should also perhaps be looked into.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (11 preceding siblings ...)
  2022-07-14 14:57 ` JamiKettunen
@ 2022-07-17 19:05 ` ericonr
  2022-07-17 19:24 ` ericonr
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2022-07-17 19:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 544 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1186590517

Comment:
Apologies, I missed this PR and the surrounding discussion. Will import patches all in one go.

>  libcurl-7.84.0_1 in transaction breaks installed pkg 'chroot-curl-7.83.1_1' errors then, it looks like previous upgrades worked fine without any additional changes compared to this PR

This is caused by a funky behavior in how we define shlib dependencies for subpackages, I need to PR a fix for it.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (12 preceding siblings ...)
  2022-07-17 19:05 ` ericonr
@ 2022-07-17 19:24 ` ericonr
  2022-07-17 19:25 ` ericonr
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2022-07-17 19:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1186593379

Comment:
The issue with the i686 build isn't that patch you linked; we should be building a threadsafe version of the library and it shouldn't need that flag either.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (13 preceding siblings ...)
  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
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2022-07-17 19:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1186593436

Comment:
There was an issue for arm builds as well, though that's been fixed in my original update commit.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (14 preceding siblings ...)
  2022-07-17 19:25 ` ericonr
@ 2022-07-17 19:43 ` ericonr
  2022-07-17 19:43 ` [PR PATCH] [Closed]: " ericonr
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2022-07-17 19:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/38039#issuecomment-1186595875

Comment:
The test is broken on i686 because they are trying to create too many threads. I figured that might be it, but testing locally confirmed it. I'm reporting this bug upstream and merging as is.

https://github.com/void-linux/void-packages/commit/af67bfc9d1db123f1d9c0dc8ff78f84b209c2be1

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Closed]: curl: update to 7.84.0.
  2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
                   ` (15 preceding siblings ...)
  2022-07-17 19:43 ` ericonr
@ 2022-07-17 19:43 ` ericonr
  16 siblings, 0 replies; 18+ messages in thread
From: ericonr @ 2022-07-17 19:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

There's a closed pull request on the void-packages repository

curl: update to 7.84.0.
https://github.com/void-linux/void-packages/pull/38039

Description:
#### 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

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2022-07-17 19:43 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-13 14:21 [PR PATCH] curl: update to 7.84.0 MouadCharradi
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

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).