diff options
author | Robert Joslyn <robert.joslyn@redrectangle.org> | 2022-08-31 13:45:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-02 15:58:25 +0100 |
commit | 0c0cd1644773c4ec2c145c11d6a958025b64f8bd (patch) | |
tree | 369468ebd902696e9425ebf305bd0895472a674d /meta/recipes-support | |
parent | a23e6516eea78f094d08ed5b1b22c6e9d9def0d9 (diff) | |
download | poky-0c0cd1644773c4ec2c145c11d6a958025b64f8bd.tar.gz |
curl: Update to 7.85.0
Release notes are available at: https://curl.se/changes.html#7_85_0
Remove backported patches as they are included in the new release.
(From OE-Core rev: 5170b1a6088a623af86ffca635a10bd010d709e5)
Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/curl/curl_7.85.0.bb (renamed from meta/recipes-support/curl/curl_7.84.0.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch | 37 | ||||
-rw-r--r-- | meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch | 33 |
3 files changed, 1 insertions, 73 deletions
diff --git a/meta/recipes-support/curl/curl_7.84.0.bb b/meta/recipes-support/curl/curl_7.85.0.bb index 75417cd1bc..3b55830415 100644 --- a/meta/recipes-support/curl/curl_7.84.0.bb +++ b/meta/recipes-support/curl/curl_7.85.0.bb | |||
@@ -11,12 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=190c514872597083303371684954f238" | |||
11 | 11 | ||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | https://curl.se/download/${BP}.tar.xz \ | 13 | https://curl.se/download/${BP}.tar.xz \ |
14 | file://0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch \ | ||
15 | file://0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch \ | ||
16 | file://run-ptest \ | 14 | file://run-ptest \ |
17 | file://disable-tests \ | 15 | file://disable-tests \ |
18 | " | 16 | " |
19 | SRC_URI[sha256sum] = "2d118b43f547bfe5bae806d8d47b4e596ea5b25a6c1f080aef49fbcd817c5db8" | 17 | SRC_URI[sha256sum] = "88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6" |
20 | 18 | ||
21 | # Curl has used many names over the years... | 19 | # Curl has used many names over the years... |
22 | CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" | 20 | CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" |
diff --git a/meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch b/meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch deleted file mode 100644 index 878839a5e3..0000000000 --- a/meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Stenberg <daniel@haxx.se> | ||
3 | Date: Tue, 28 Jun 2022 09:00:25 +0200 | ||
4 | Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool | ||
5 | |||
6 | To work with more compilers without requiring separate libs to | ||
7 | link. Like with gcc-12 for RISC-V on Linux. | ||
8 | |||
9 | Reported-by: Adam Sampson | ||
10 | Fixes #9055 | ||
11 | Closes #9061 | ||
12 | |||
13 | Upstream-Status: Backport [50efb0822aa0e0ab165158dd0a26e65a2290e6d2] | ||
14 | |||
15 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
16 | --- | ||
17 | lib/easy_lock.h | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/lib/easy_lock.h b/lib/easy_lock.h | ||
21 | index 07c85c5ff..9c11bc50c 100644 | ||
22 | --- a/lib/easy_lock.h | ||
23 | +++ b/lib/easy_lock.h | ||
24 | @@ -40,8 +40,8 @@ | ||
25 | #include <sched.h> | ||
26 | #endif | ||
27 | |||
28 | -#define curl_simple_lock atomic_bool | ||
29 | -#define CURL_SIMPLE_LOCK_INIT false | ||
30 | +#define curl_simple_lock atomic_int | ||
31 | +#define CURL_SIMPLE_LOCK_INIT 0 | ||
32 | |||
33 | static inline void curl_simple_lock_lock(curl_simple_lock *lock) | ||
34 | { | ||
35 | -- | ||
36 | 2.25.1 | ||
37 | |||
diff --git a/meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch b/meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch deleted file mode 100644 index 771bdb2b96..0000000000 --- a/meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Stenberg <daniel@haxx.se> | ||
3 | Date: Mon, 27 Jun 2022 08:46:21 +0200 | ||
4 | Subject: [PATCH] easy_lock.h: include sched.h if available to fix build | ||
5 | |||
6 | Patched-by: Harry Sintonen | ||
7 | |||
8 | Closes #9054 | ||
9 | |||
10 | Upstream-Status: Backport [e2e7f54b7bea521fa8373095d0f43261a720cda0] | ||
11 | |||
12 | Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> | ||
13 | --- | ||
14 | lib/easy_lock.h | 3 +++ | ||
15 | 1 file changed, 3 insertions(+) | ||
16 | |||
17 | diff --git a/lib/easy_lock.h b/lib/easy_lock.h | ||
18 | index 819f50ce8..1f54289ce 100644 | ||
19 | --- a/lib/easy_lock.h | ||
20 | +++ b/lib/easy_lock.h | ||
21 | @@ -36,6 +36,9 @@ | ||
22 | |||
23 | #elif defined (HAVE_ATOMIC) | ||
24 | #include <stdatomic.h> | ||
25 | +#if defined(HAVE_SCHED_YIELD) | ||
26 | +#include <sched.h> | ||
27 | +#endif | ||
28 | |||
29 | #define curl_simple_lock atomic_bool | ||
30 | #define CURL_SIMPLE_LOCK_INIT false | ||
31 | -- | ||
32 | 2.35.1 | ||
33 | |||