frr: upgrade 10.4.1 -> 10.4.2
PATCH 1/5 frr: upgrade 10.4.1 -> 10.4.2
From: Ankur Tyagi <[email protected]>
Release Notes:
https://github.com/FRRouting/frr/releases/tag/frr-10.4.2
---
.../recipes-protocols/frr/{frr_10.4.1.bb => frr_10.4.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-protocols/frr/{frr_10.4.1.bb => frr_10.4.2.bb} (99%)meta-networking/recipes-protocols/frr/frr_10.4.2.bb renamed from meta-networking/recipes-protocols/frr/frr_10.4.1.bb +1 -1
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.4; file://frr.pam \ " -SRCREV = "88f5c06cbc1cc4d62e1cba3e7791f5cea4179ba5" +SRCREV = "642f65b9e5853c7207982a9cf8275732737d4e44" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$"
PATCH 2/5 dante: upgrade 1.4.3 -> 1.4.4
From: Gyorgy Sarvari <[email protected]>
License-Update: copyright year bump
Changelog:
- Fix potential security issue CVE-2024-54662, related to "socksmethod" use in client/hostid-rules.
- Add a missing call to setgroups(2).
- Patch to fix compilation with libminiupnp 2.2.8.
- Client connectchild optimizations.
- Client SIGIO handling improvements.
- Various configure/build fixes.
- Updated to support TCP_EXP1 version of TCP hostid format.
---
.../dante/{dante_1.4.3.bb => dante_1.4.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-protocols/dante/{dante_1.4.3.bb => dante_1.4.4.bb} (90%)meta-networking/recipes-protocols/dante/dante_1.4.4.bb renamed from meta-networking/recipes-protocols/dante/dante_1.4.3.bb +2 -2
@@ -9,11 +9,11 @@ what could be described as a non-transparent Layer 4 router." HOMEPAGE = "http://www.inet.no/dante/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=edd508404db7339042dfc861a3a690ad" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b3a8e7dc09bb720460f28c9d3796afa5" SRC_URI = "https://www.inet.no/dante/files/dante-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "418a065fe1a4b8ace8fbf77c2da269a98f376e7115902e76cda7e741e4846a5d" +SRC_URI[sha256sum] = "1973c7732f1f9f0a4c0ccf2c1ce462c7c25060b25643ea90f9b98f53a813faec" # without --without-gssapi, config.log will contain reference to /usr/lib # as a consequence of GSSAPI path being set to /usr by default.
PATCH 3/5 dante: Add _GNU_SOURCE for musl builds
In reply to [email protected]From: Khem Raj <[email protected]>
This helps build fixes e.g. cpuset_t definitions etc. glibc builds have _GNU_SOURCE defined inherently.
--- meta-networking/recipes-protocols/dante/dante_1.4.4.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-networking/recipes-protocols/dante/dante_1.4.4.bb +2 -0
@@ -29,6 +29,8 @@ CPPFLAGS += "-P" CFLAGS += "-I${STAGING_INCDIR}/tirpc" LIBS += "-ltirpc" +CFLAGS:append:libc-musl = " -D_GNU_SOURCE" + REQUIRED_DISTRO_FEATURES = "pam" EXTRA_AUTORECONF = "-I ${S}"
PATCH 4/5 tinyproxy: patch CVE-2025-63938
In reply to [email protected]From: Gyorgy Sarvari <[email protected]>
Details: https://nvd.nist.gov/vuln/detail/CVE-2025-63938
Pick the patch referenced by the nvd report.
--- .../tinyproxy/tinyproxy/CVE-2025-63938.patch | 43 +++++++++++++++++++ .../tinyproxy/tinyproxy_1.11.2.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch
meta-networking/recipes-support/tinyproxy/tinyproxy/CVE-2025-63938.patch new file +43 -0
@@ -0,0 +1,43 @@ +From cee659d2ac1e4e9d1ce388338f46df6c4bae8278 Mon Sep 17 00:00:00 2001 +From: Gyorgy Sarvari <[email protected]> +Date: Fri, 17 Oct 2025 22:57:39 +0000 +Subject: [PATCH] reqs: fix integer overflow in port number processing + +From: rofl0r <[email protected]> + +closes #586 + +CVE: CVE-2025-63938 +Upstream-Status: Backport [https://github.com/tinyproxy/tinyproxy/commit/3c0fde94981b025271ffa1788ae425257841bf5a] +Signed-off-by: Gyorgy Sarvari <[email protected]> +--- + src/reqs.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/reqs.c b/src/reqs.c +index a65ed54..1e5895c 100644 +--- a/src/reqs.c ++++ b/src/reqs.c +@@ -174,7 +174,7 @@ static int strip_return_port (char *host) + { + char *ptr1; + char *ptr2; +- int port; ++ unsigned port; + + ptr1 = strrchr (host, ':'); + if (ptr1 == NULL) +@@ -186,8 +186,11 @@ static int strip_return_port (char *host) + return 0; + + *ptr1++ = '\0'; +- if (sscanf (ptr1, "%d", &port) != 1) /* one conversion required */ +- return 0; ++ ++ port = atoi(ptr1); ++ /* check that port string is in the valid range 1-0xffff) */ ++ if(strlen(ptr1) > 5 || (port & 0xffff0000)) return 0; ++ + return port; + } +
meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb +1 -0
@@ -7,6 +7,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz file://disable-documentation.patch \ file://tinyproxy.service \ file://tinyproxy.conf \ + file://CVE-2025-63938.patch \ " SRC_URI[sha256sum] = "2c8fe5496f2c642bfd189020504ab98d74b9edbafcdb94d9f108e157b5bdf96d"
PATCH 5/5 python3-scapy: set CVE_PRODUCT
In reply to [email protected]From: Gyorgy Sarvari <[email protected]>
The default ${PN} (python3-scapy) CVE fails to match relevant CVEs, because they are tracked under the scapy:scapy CPE.
Set CVE_PRODUCT to the correct value.
See CVE db query:
sqlite> select * from products where product like '%scapy%'; CVE-2019-1010142|scapy|scapy|2.4.0|=||
--- meta-networking/recipes-devtools/python/python3-scapy_2.6.1.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-networking/recipes-devtools/python/python3-scapy_2.6.1.bb +2 -0
@@ -23,6 +23,8 @@ SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https;tag=v$ UPSTREAM_CHECK_COMMITS = "1" +CVE_PRODUCT = "scapy" + inherit python_setuptools_build_meta ptest do_install:append() {