summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl
diff options
context:
space:
mode:
authorRobert Joslyn <robert.joslyn@redrectangle.org>2022-07-03 15:26:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-04 15:15:14 +0100
commit48e4956d71cb0f6e27fce0ef32521c98fcb421ca (patch)
tree5e4b6f04343b717369faac28d93d3b1fd8b8a1a5 /meta/recipes-support/curl
parente8fd5149faf0b78ae5674e30b01077edecd53799 (diff)
downloadpoky-48e4956d71cb0f6e27fce0ef32521c98fcb421ca.tar.gz
curl: Update to 7.84.0
This is a feature and bugfix update. Release notes are available at: https://curl.se/changes.html#7_84_0 Backport a patch fixing a compile issue where sched.h was not included on certain platforms. (From OE-Core rev: 991a49672a8c45e319dc9d9b0466cf96725c1363) Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl')
-rw-r--r--meta/recipes-support/curl/curl_7.84.0.bb (renamed from meta/recipes-support/curl/curl_7.83.1.bb)7
-rw-r--r--meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch33
2 files changed, 38 insertions, 2 deletions
diff --git a/meta/recipes-support/curl/curl_7.83.1.bb b/meta/recipes-support/curl/curl_7.84.0.bb
index 1d9de29a65..74a19d20c9 100644
--- a/meta/recipes-support/curl/curl_7.83.1.bb
+++ b/meta/recipes-support/curl/curl_7.84.0.bb
@@ -9,8 +9,11 @@ SECTION = "console/network"
9LICENSE = "MIT-open-group" 9LICENSE = "MIT-open-group"
10LIC_FILES_CHKSUM = "file://COPYING;md5=190c514872597083303371684954f238" 10LIC_FILES_CHKSUM = "file://COPYING;md5=190c514872597083303371684954f238"
11 11
12SRC_URI = "https://curl.se/download/${BP}.tar.xz" 12SRC_URI = " \
13SRC_URI[sha256sum] = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4" 13 https://curl.se/download/${BP}.tar.xz \
14 file://0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch \
15"
16SRC_URI[sha256sum] = "2d118b43f547bfe5bae806d8d47b4e596ea5b25a6c1f080aef49fbcd817c5db8"
14 17
15# Curl has used many names over the years... 18# Curl has used many names over the years...
16CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" 19CVE_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.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
new file mode 100644
index 0000000000..771bdb2b96
--- /dev/null
+++ b/meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch
@@ -0,0 +1,33 @@
1From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001
2From: Daniel Stenberg <daniel@haxx.se>
3Date: Mon, 27 Jun 2022 08:46:21 +0200
4Subject: [PATCH] easy_lock.h: include sched.h if available to fix build
5
6Patched-by: Harry Sintonen
7
8Closes #9054
9
10Upstream-Status: Backport [e2e7f54b7bea521fa8373095d0f43261a720cda0]
11
12Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
13---
14 lib/easy_lock.h | 3 +++
15 1 file changed, 3 insertions(+)
16
17diff --git a/lib/easy_lock.h b/lib/easy_lock.h
18index 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--
322.35.1
33