Skip to contentSkip to conversation

frr: upgrade 8.4.2 -> 8.4.4

PATCH New Yi Zhao 1 participant 2 messages Jun 28, 2023

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/2 frr: upgrade 8.4.2 -> 8.4.4

ChangeLog:
https://github.com/FRRouting/frr/releases/tag/frr-8.4.4
https://github.com/FRRouting/frr/commit/45e36c0c00a517ad1606135b18c5753e210cfc0d

---
 .../recipes-protocols/frr/{frr_8.4.2.bb => frr_8.4.4.bb}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-networking/recipes-protocols/frr/{frr_8.4.2.bb => frr_8.4.4.bb} (98%)
meta-networking/recipes-protocols/frr/frr_8.4.4.bb renamed from meta-networking/recipes-protocols/frr/frr_8.4.2.bb +1 -1
similarity index 98%
rename from meta-networking/recipes-protocols/frr/frr_8.4.2.bb
rename to meta-networking/recipes-protocols/frr/frr_8.4.4.bb
index 966926094..b87c3e78b 100644
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/8.4 \
            file://0001-m4-ax_python.m4-check-for-python-x.y-emded.pc-not-py.patch \
            "
 
-SRCREV = "62ac43de9f3bc470586cf4f51fadf013bf542b32"
+SRCREV = "45e36c0c00a517ad1606135b18c5753e210cfc0d"
 
 UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$"
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 mbedtls: upgrade 2.28.2 -> 2.28.3

Mbed TLS 2.28 is a long-time support branch. It will be supported with bug-fixes and security fixes until end of 2024.

ChangeLog:
https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.3

---
 .../mbedtls/{mbedtls_2.28.2.bb => mbedtls_2.28.3.bb}      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
 rename meta-networking/recipes-connectivity/mbedtls/{mbedtls_2.28.2.bb => mbedtls_2.28.3.bb} (93%)
meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.3.bb renamed from meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb +7 -1
similarity index 93%
rename from meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb
rename to meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.3.bb
index 242495e94..ce094d5af 100644
@@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "libs"
 
 S = "${WORKDIR}/git"
-SRCREV = "89f040a5c938985c5f30728baed21e49d0846a53"
+SRCREV = "981743de6fcdbe672e482b6fd724d31d0a0d2476"
 SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=mbedtls-2.28 \
            file://run-ptest \
           "
@@ -62,6 +62,12 @@ CVE_CHECK_IGNORE += "CVE-2021-43666"
 # Fix merged upstream https://github.com/Mbed-TLS/mbedtls/commit/9a4a9c66a48edfe9ece03c7e4a53310adf73a86c
 CVE_CHECK_IGNORE += "CVE-2021-45451"
 
+# Strip host paths from autogenerated test files
+do_compile:append() {
+	sed -i 's+${S}/++g' ${B}/tests/*.c 2>/dev/null || :
+	sed -i 's+${B}/++g' ${B}/tests/*.c 2>/dev/null || :
+}
+
 # Export source files/headers needed by Arm Trusted Firmware
 sysroot_stage_all:append() {
 	sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library"
Signature · 1 line
2.25.1