From 5170b1a6088a623af86ffca635a10bd010d709e5 Mon Sep 17 00:00:00 2001 From: Robert Joslyn Date: Wed, 31 Aug 2022 13:45:02 -0700 Subject: [PATCH] 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. Signed-off-by: Robert Joslyn Signed-off-by: Alexandre Belloni --- .../curl/{curl_7.84.0.bb => curl_7.85.0.bb} | 4 +- ...-to-using-atomic_int-instead-of-bool.patch | 37 ------------------- ...ude-sched.h-if-available-to-fix-buil.patch | 33 ----------------- 3 files changed, 1 insertion(+), 73 deletions(-) rename meta/recipes-support/curl/{curl_7.84.0.bb => curl_7.85.0.bb} (95%) delete mode 100644 meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch delete mode 100644 meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch diff --git a/meta/recipes-support/curl/curl_7.84.0.bb b/meta/recipes-support/curl/curl_7.85.0.bb similarity index 95% rename from meta/recipes-support/curl/curl_7.84.0.bb rename to meta/recipes-support/curl/curl_7.85.0.bb index 75417cd1bc5..3b558304151 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" SRC_URI = " \ https://curl.se/download/${BP}.tar.xz \ - file://0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch \ - file://0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch \ file://run-ptest \ file://disable-tests \ " -SRC_URI[sha256sum] = "2d118b43f547bfe5bae806d8d47b4e596ea5b25a6c1f080aef49fbcd817c5db8" +SRC_URI[sha256sum] = "88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6" # Curl has used many names over the years... 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 878839a5e33..00000000000 --- a/meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Tue, 28 Jun 2022 09:00:25 +0200 -Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool - -To work with more compilers without requiring separate libs to -link. Like with gcc-12 for RISC-V on Linux. - -Reported-by: Adam Sampson -Fixes #9055 -Closes #9061 - -Upstream-Status: Backport [50efb0822aa0e0ab165158dd0a26e65a2290e6d2] - -Signed-off-by: He Zhe ---- - lib/easy_lock.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/easy_lock.h b/lib/easy_lock.h -index 07c85c5ff..9c11bc50c 100644 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -40,8 +40,8 @@ - #include - #endif - --#define curl_simple_lock atomic_bool --#define CURL_SIMPLE_LOCK_INIT false -+#define curl_simple_lock atomic_int -+#define CURL_SIMPLE_LOCK_INIT 0 - - static inline void curl_simple_lock_lock(curl_simple_lock *lock) - { --- -2.25.1 - 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 771bdb2b96d..00000000000 --- 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 @@ -From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -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 - -Upstream-Status: Backport [e2e7f54b7bea521fa8373095d0f43261a720cda0] - -Signed-off-by: Robert Joslyn ---- - lib/easy_lock.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/easy_lock.h b/lib/easy_lock.h -index 819f50ce8..1f54289ce 100644 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -36,6 +36,9 @@ - - #elif defined (HAVE_ATOMIC) - #include -+#if defined(HAVE_SCHED_YIELD) -+#include -+#endif - - #define curl_simple_lock atomic_bool - #define CURL_SIMPLE_LOCK_INIT false --- -2.35.1 - -- 2.47.3