MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

curl: upgrade 8.12.1 -> 8.14.1

Browse Source 
Handle CVE-2025-4947 and CVE-2025-5025.

CVE-2025-5399 fixed in 8.14.1 was introduced only in 8.13.0, so Yocto
never had version vulnerable to it.

Rebase patches.

Add openssl-native dependency fo ptest to fix following error:

    Missing or broken 'openssl' tool. openssl 1.0.2+ is required.
    Without it, this script cannot generate the necessary certificates
    the curl test suite needs for all its TLS related tests. at
    ../../../curl-8.14.0/tests/certs/genserv.pl line 33.

Install curlinfo for tests required since 8.14.0
7a1211d474

(From OE-Core rev: d990ee6c49e3fcf969e54688397d47f0d0892ba1)

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Marko 2025-06-07 23:34:17 +02:00 committed by Richard Purdie
parent 9ec3fc636a
commit 140fde4c34
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-support/curl/curl/no-test-timeout.patch
View File

@ -14,7 +14,7 @@ diff --git a/tests/servers.pm b/tests/servers.pm
index d4472d5..9999938 100644 index d4472d5..9999938 100644
--- a/tests/servers.pm --- a/tests/servers.pm
+++ b/tests/servers.pm +++ b/tests/servers.pm
@@ -123,7 +123,7 @@ my $sshdverstr; # for socks server, ssh daemon version string @@ -124,7 +124,7 @@ my $sshdverstr; # for socks server, ssh daemon version string
my $sshderror; # for socks server, ssh daemon version error my $sshderror; # for socks server, ssh daemon version error
my %doesntrun; # servers that don't work, identified by pidfile my %doesntrun; # servers that don't work, identified by pidfile
my %PORT = (nolisten => 47); # port we use for a local non-listening service my %PORT = (nolisten => 47); # port we use for a local non-listening service

7
meta/recipes-support/curl/curl_8.12.1.bb → meta/recipes-support/curl/curl_8.14.1.bb
View File

@ -20,7 +20,7 @@ SRC_URI:append:class-nativesdk = " \
file://environment.d-curl.sh \ file://environment.d-curl.sh \
" "
SRC_URI[sha256sum] = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202" SRC_URI[sha256sum] = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd"
# Curl has used many names over the years... # Curl has used many names over the years...
CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"
@ -126,12 +126,17 @@ do_install_ptest() {
${B}/libtool --mode=install install ${B}/tests/server/$name ${D}${PTEST_PATH}/tests/server ${B}/libtool --mode=install install ${B}/tests/server/$name ${D}${PTEST_PATH}/tests/server
done done
install -d ${D}${PTEST_PATH}/src
install -m 755 ${B}/src/curlinfo ${D}${PTEST_PATH}/src
cp -r ${S}/tests/data ${D}${PTEST_PATH}/tests/ cp -r ${S}/tests/data ${D}${PTEST_PATH}/tests/
# More tests that we disable for automated QA as they're not reliable # More tests that we disable for automated QA as they're not reliable
cat ${UNPACKDIR}/disable-tests >>${D}${PTEST_PATH}/tests/data/DISABLED cat ${UNPACKDIR}/disable-tests >>${D}${PTEST_PATH}/tests/data/DISABLED
} }
DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' openssl-native', '', d)}"
RDEPENDS:${PN}-ptest += " \ RDEPENDS:${PN}-ptest += " \
locale-base-en-us \ locale-base-en-us \
perl-module-b \ perl-module-b \