summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2024-09-27 23:14:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-09-30 17:07:18 +0100
commitd41667a65320396012b3147a5c8132fbca487513 (patch)
tree0ff325fecc619f48e3ef000c8e98477eb5a19679
parentdfa892cfa698b73d4d68cc3e9b6bb17488f0952b (diff)
downloadpoky-d41667a65320396012b3147a5c8132fbca487513.tar.gz
curl: Upgrade 8.9.1 -> 8.10.1
resolves CVE-2024-8096 possibility to set random was removed in commit https://github.com/curl/curl/commit/269fdd4c6ed5d837d57448ac977f6f300968df15 tests have new perl module dependency removed backported patch present in new version (From OE-Core rev: 64c06dd06d747d7b53fb6ae6cf0550e13d63d8f6) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/curl/curl/0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch38
-rw-r--r--meta/recipes-support/curl/curl_8.10.1.bb (renamed from meta/recipes-support/curl/curl_8.9.1.bb)10
2 files changed, 3 insertions, 45 deletions
diff --git a/meta/recipes-support/curl/curl/0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch b/meta/recipes-support/curl/curl/0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch
deleted file mode 100644
index 15c69e1430..0000000000
--- a/meta/recipes-support/curl/curl/0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 3eec5afbd0b6377eca893c392569b2faf094d970 Mon Sep 17 00:00:00 2001
2From: Daniel Stenberg <daniel@haxx.se>
3Date: Mon, 5 Aug 2024 00:17:17 +0200
4Subject: [PATCH] sigpipe: init the struct so that first apply ignores
5
6Initializes 'no_signal' to TRUE, so that a call to sigpipe_apply() after
7init ignores the signal (unless CURLOPT_NOSIGNAL) is set.
8
9I have read the existing code multiple times now and I think it gets the
10initial state reversed this missing to ignore.
11
12Regression from 17e6f06ea37136c36d27
13
14Reported-by: Rasmus Thomsen
15Fixes #14344
16Closes #14390
17
18Upstream-Status: Backport [https://github.com/curl/curl/commit/3eec5afbd0b6377eca893c392569b2faf094d970]
19Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
20---
21 lib/sigpipe.h | 1 +
22 1 file changed, 1 insertion(+)
23
24diff --git a/lib/sigpipe.h b/lib/sigpipe.h
25index b91a2f513..d78afd905 100644
26--- a/lib/sigpipe.h
27+++ b/lib/sigpipe.h
28@@ -39,6 +39,7 @@ struct sigpipe_ignore {
29 static void sigpipe_init(struct sigpipe_ignore *ig)
30 {
31 memset(ig, 0, sizeof(*ig));
32+ ig->no_signal = TRUE;
33 }
34
35 /*
36--
372.44.2
38
diff --git a/meta/recipes-support/curl/curl_8.9.1.bb b/meta/recipes-support/curl/curl_8.10.1.bb
index 745224929b..0252d4475e 100644
--- a/meta/recipes-support/curl/curl_8.9.1.bb
+++ b/meta/recipes-support/curl/curl_8.10.1.bb
@@ -14,9 +14,8 @@ SRC_URI = " \
14 file://run-ptest \ 14 file://run-ptest \
15 file://disable-tests \ 15 file://disable-tests \
16 file://no-test-timeout.patch \ 16 file://no-test-timeout.patch \
17 file://0001-sigpipe-init-the-struct-so-that-first-apply-ignores.patch \
18" 17"
19SRC_URI[sha256sum] = "f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5" 18SRC_URI[sha256sum] = "73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee"
20 19
21# Curl has used many names over the years... 20# Curl has used many names over the years...
22CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" 21CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"
@@ -24,10 +23,7 @@ CVE_STATUS[CVE-2024-32928] = "ignored: CURLOPT_SSL_VERIFYPEER was disabled on go
24 23
25inherit autotools pkgconfig binconfig multilib_header ptest 24inherit autotools pkgconfig binconfig multilib_header ptest
26 25
27# Entropy source for random PACKAGECONFIG option 26COMMON_PACKAGECONFIG = "basic-auth bearer-auth digest-auth negotiate-auth openssl proxy threaded-resolver verbose zlib"
28RANDOM ?= "/dev/urandom"
29
30COMMON_PACKAGECONFIG = "basic-auth bearer-auth digest-auth negotiate-auth openssl proxy random threaded-resolver verbose zlib"
31PACKAGECONFIG ??= "${COMMON_PACKAGECONFIG} ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws libidn" 27PACKAGECONFIG ??= "${COMMON_PACKAGECONFIG} ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws libidn"
32PACKAGECONFIG:class-native = "${COMMON_PACKAGECONFIG} ipv6" 28PACKAGECONFIG:class-native = "${COMMON_PACKAGECONFIG} ipv6"
33PACKAGECONFIG:class-nativesdk = "${COMMON_PACKAGECONFIG} ipv6" 29PACKAGECONFIG:class-nativesdk = "${COMMON_PACKAGECONFIG} ipv6"
@@ -61,7 +57,6 @@ PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2"
61PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" 57PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
62PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," 58PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3,"
63PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," 59PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy,"
64PACKAGECONFIG[random] = "--with-random=${RANDOM},--without-random"
65PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" 60PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump"
66PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," 61PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp,"
67PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," 62PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,"
@@ -132,6 +127,7 @@ RDEPENDS:${PN}-ptest += " \
132 perl-module-cwd \ 127 perl-module-cwd \
133 perl-module-digest \ 128 perl-module-digest \
134 perl-module-digest-md5 \ 129 perl-module-digest-md5 \
130 perl-module-digest-sha \
135 perl-module-file-basename \ 131 perl-module-file-basename \
136 perl-module-file-spec \ 132 perl-module-file-spec \
137 perl-module-file-temp \ 133 perl-module-file-temp \