gnu: cURL: Update to 7.85.0.

* gnu/packages/curl.scm (curl): Update to 7.85.0.
[source](patches): Remove obsolete.
[arguments]: Remove obsolete phase.
* gnu/packages/patches/curl-easy-lock.patch,
gnu/packages/patches/curl-nghttp2-compat.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.

2 files changed, 0 insertions, 172 deletions

diff --git a/gnu/packages/patches/curl-easy-lock.patch b/gnu/packages/patches/curl-easy-lock.patch
deleted file mode 100644
index 137106f57c..0000000000
--- a/gnu/packages/patches/curl-easy-lock.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-This patch is taken from upstream master, and should probably be dropped
-with the next release.
-
-ihttps://github.com/curl/curl/commit/e2e7f54b7bea521fa8373095d0f43261a720cda0.patch
-
-From e2e7f54b7bea521fa8373095d0f43261a720cda0 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
-
-Closes #9054
----
- 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/gnu/packages/patches/curl-nghttp2-compat.patch b/gnu/packages/patches/curl-nghttp2-compat.patch
deleted file mode 100644
index e3f69c6010..0000000000
--- a/gnu/packages/patches/curl-nghttp2-compat.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Use CRLF headers in test responses to cope with newer nghttp2.
-
-Taken from upstream:
-
-  https://github.com/curl/curl/commit/ef121401d6eabed204a716f16b2776ededc75c0e
-
-diff --git a/tests/data/test1700 b/tests/data/test1700
-index 8b1ef4ae336c3..7f78bcf5f92ed 100644
---- a/tests/data/test1700
-+++ b/tests/data/test1700
-@@ -11,26 +11,26 @@ HTTP/2
- # Server-side
- <reply>
- <data nocheck="yes">
--HTTP/1.1 200 OK
--Date: Tue, 09 Nov 2010 14:49:00 GMT
--Server: test-server/fake
--Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
--ETag: "21025-dc7-39462498"
--Accept-Ranges: bytes
--Content-Length: 6
--Connection: close
--Content-Type: text/html
--Funny-head: yesyes
--
-+HTTP/1.1 200 OK

-+Date: Tue, 09 Nov 2010 14:49:00 GMT

-+Server: test-server/fake

-+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT

-+ETag: "21025-dc7-39462498"

-+Accept-Ranges: bytes

-+Content-Length: 6

-+Connection: close

-+Content-Type: text/html

-+Funny-head: yesyes

-+

- -foo-
- </data>
- <data1>
--HTTP/1.1 200 OK
--Date: Tue, 09 Nov 2010 14:49:00 GMT
--Content-Length: 6
--Connection: close
--Content-Type: text/html
--
-+HTTP/1.1 200 OK

-+Date: Tue, 09 Nov 2010 14:49:00 GMT

-+Content-Length: 6

-+Connection: close

-+Content-Type: text/html

-+

- -maa-
- </data1>
- </reply>
-diff --git a/tests/data/test1701 b/tests/data/test1701
-index 3c1a2bd0b8217..22f6147d0503a 100644
---- a/tests/data/test1701
-+++ b/tests/data/test1701
-@@ -11,17 +11,17 @@ HTTP/2
- # Server-side
- <reply>
- <data nocheck="yes">
--HTTP/1.1 200 OK
--Date: Tue, 09 Nov 2010 14:49:00 GMT
--Server: test-server/fake
--Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
--ETag: "21025-dc7-39462498"
--Accept-Ranges: bytes
--Content-Length: 6
--Connection: close
--Content-Type: text/html
--Funny-head: yesyes
--
-+HTTP/1.1 200 OK

-+Date: Tue, 09 Nov 2010 14:49:00 GMT

-+Server: test-server/fake

-+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT

-+ETag: "21025-dc7-39462498"

-+Accept-Ranges: bytes

-+Content-Length: 6

-+Connection: close

-+Content-Type: text/html

-+Funny-head: yesyes

-+

- -foo-
- </data>
- </reply>
-diff --git a/tests/data/test358 b/tests/data/test358
-index 8b4f6606247a0..0f8a9801bbcb5 100644
---- a/tests/data/test358
-+++ b/tests/data/test358
-@@ -12,14 +12,14 @@ HTTP/2
- # Server-side
- <reply>
- <data nocheck="yes">
--HTTP/1.1 200 OK
--Date: Tue, 09 Nov 2010 14:49:00 GMT
--Content-Length: 6
--Connection: close
--Content-Type: text/html
--Funny-head: yesyes
--Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
--
-+HTTP/1.1 200 OK

-+Date: Tue, 09 Nov 2010 14:49:00 GMT

-+Content-Length: 6

-+Connection: close

-+Content-Type: text/html

-+Funny-head: yesyes

-+Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0

-+

- -foo-
- </data>
- </reply>
-diff --git a/tests/data/test359 b/tests/data/test359
-index a5ba4e3ae0971..0e684e39e5aa5 100644
---- a/tests/data/test359
-+++ b/tests/data/test359
-@@ -12,14 +12,14 @@ HTTP/2
- # Server-side
- <reply>
- <data nocheck="yes">
--HTTP/1.1 200 OK
--Date: Tue, 09 Nov 2010 14:49:00 GMT
--Content-Length: 6
--Connection: close
--Content-Type: text/html
--Funny-head: yesyes
--Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
--
-+HTTP/1.1 200 OK

-+Date: Tue, 09 Nov 2010 14:49:00 GMT

-+Content-Length: 6

-+Connection: close

-+Content-Type: text/html

-+Funny-head: yesyes

-+Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0

-+

- -foo-
- </data>
- </reply>