[PR PATCH] curl: update to 7.85.0.

[PR PATCH] curl: update to 7.85.0.

[tjkirch]

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

There is a new pull request by tjkirch against master on the void-packages repository

https://github.com/tjkirch/void-packages curl-7.85
https://github.com/void-linux/void-packages/pull/39823

curl: update to 7.85.0.
#### Testing the changes
- I tested the changes in this PR: **YES** - I curled http, https, and gopher sites, then used two programs that link to libcurl - rustup and fwupd.  All unit tests passed on x86-64 glibc except for test 3001, which failed because its port was already in use; this test has been reported flaky elsewhere.

#### 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-glibc
  - armv7l-glibc
  - armv6l-glibc
  - armv6l-musl

I confirmed that the two patches we had are upstream in this release.

A patch file from https://github.com/void-linux/void-packages/pull/39823.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-curl-7.85-39823.patch --]
[-- Type: text/x-diff, Size: 4019 bytes --]

From a88a0c3fec34311cd68340a15cc0ea93deecd81e Mon Sep 17 00:00:00 2001
From: Tom Kirchner <git@halffull.org>
Date: Sat, 8 Oct 2022 15:36:20 -0700
Subject: [PATCH] curl: update to 7.85.0.

---
 ...eturn-fatal-error-on-EINTR-from-poll.patch | 40 -------------------
 srcpkgs/curl/patches/easy_lock.patch          | 24 -----------
 srcpkgs/curl/template                         |  6 +--
 3 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 srcpkgs/curl/patches/0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
 delete mode 100644 srcpkgs/curl/patches/easy_lock.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
deleted file mode 100644
index c2456da0e1d7..000000000000
--- a/srcpkgs/curl/patches/0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/easy_lock.patch b/srcpkgs/curl/patches/easy_lock.patch
deleted file mode 100644
index 73a4b9d2f2b5..000000000000
--- a/srcpkgs/curl/patches/easy_lock.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3f6beb669e4edc170e167aa6cca3b4a6ec4501e9 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 27 Jun 2022 08:46:21 +0200
-Subject: [PATCH] easy_lock.h: include sched.h if available to fix build
-
-Patched-by: Harry Sintonen
----
- lib/easy_lock.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/easy_lock.h b/lib/easy_lock.h
-index 819f50ce815b8..1f54289ceb2d3 100644
---- a/lib/easy_lock.h
-+++ b/lib/easy_lock.h
-@@ -36,6 +36,9 @@
- 
- #elif defined (HAVE_ATOMIC)
- #include <stdatomic.h>
-+#if defined(HAVE_SCHED_YIELD)
-+#include <sched.h>
-+#endif
- 
- #define curl_simple_lock atomic_bool
- #define CURL_SIMPLE_LOCK_INIT false
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index eb8c4204a6cd..fd42e43c2c56 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.84.0
-revision=2
+version=7.85.0
+revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp librtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
@@ -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=702fb26e73190a3bd77071aa146f507b9817cc4dfce218d2ab87f00cd3bc059d
+checksum=21a7e83628ee96164ac2b36ff6bf99d467c7b0b621c1f7e317d8f0d96011539c
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"
 vopt_conflict ssl gnutls

Re: curl: update to 7.85.0.

[tjkirch]

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

New comment by tjkirch on void-packages repository

https://github.com/void-linux/void-packages/pull/39823#issuecomment-1272414627

Comment:
The `libcurl-7.85.0_1 in transaction breaks installed pkg 'chroot-curl-7.84.0_2'` error in CI was also reported in the [7.84 update PR](https://github.com/void-linux/void-packages/pull/38039) with @ericonr saying "This is caused by a funky behavior in how we define shlib dependencies for subpackages, I need to PR a fix for it."  Apart from that, x86-64 failed because of test 3001, as I noted in my description; I'm not sure what to think about that.

Re: [PR PATCH] [Closed]: curl: update to 7.85.0.

[leahneukirchen]

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

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

curl: update to 7.85.0.
https://github.com/void-linux/void-packages/pull/39823

Description:
#### Testing the changes
- I tested the changes in this PR: **YES** - I curled http, https, and gopher sites, then used two programs that link to libcurl - rustup and fwupd.  All unit tests passed on x86-64 glibc except for test 3001, which failed because its port was already in use; this test has been reported flaky elsewhere.

#### 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-glibc
  - armv7l-glibc
  - armv6l-glibc
  - armv6l-musl

I confirmed that the two patches we had are upstream in this release.