From aae4b061d08fa5f6084b5239337b5175175deed4 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 23 Oct 2023 16:21:32 +0800 Subject: [PATCH 01/10] libyang: upgrade 2.1.111 -> 2.1.128 Changelog: =========== revert of identityref canonical value change the identity always printed with the module name as the prefix data tree and hash table optimizations opaque node handling fixes and improvements lots of other bug fixes Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../libyang/{libyang_2.1.111.bb => libyang_2.1.128.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename recipes-extended/libyang/{libyang_2.1.111.bb => libyang_2.1.128.bb} (96%) diff --git a/recipes-extended/libyang/libyang_2.1.111.bb b/recipes-extended/libyang/libyang_2.1.128.bb similarity index 96% rename from recipes-extended/libyang/libyang_2.1.111.bb rename to recipes-extended/libyang/libyang_2.1.128.bb index e5923569..55dbb820 100644 --- a/recipes-extended/libyang/libyang_2.1.111.bb +++ b/recipes-extended/libyang/libyang_2.1.128.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" -SRCREV = "8b0b910a2dcb7360cb5b0aaefbd1338271d50946" +SRCREV = "7e5ea21030fe6632b6faad30c0de8d9669503773" SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ file://0001-test_context-skip-test-case-test_searchdirs.patch \ From c5ba4afc34ed01fb18ff8a7aff17d01ac64bf828 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 23 Jan 2024 09:15:23 +0800 Subject: [PATCH 02/10] libyang: upgrade 2.1.128 -> 2.1.148 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../libyang/{libyang_2.1.128.bb => libyang_2.1.148.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename recipes-extended/libyang/{libyang_2.1.128.bb => libyang_2.1.148.bb} (96%) diff --git a/recipes-extended/libyang/libyang_2.1.128.bb b/recipes-extended/libyang/libyang_2.1.148.bb similarity index 96% rename from recipes-extended/libyang/libyang_2.1.128.bb rename to recipes-extended/libyang/libyang_2.1.148.bb index 55dbb820..0eff3247 100644 --- a/recipes-extended/libyang/libyang_2.1.128.bb +++ b/recipes-extended/libyang/libyang_2.1.148.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" -SRCREV = "7e5ea21030fe6632b6faad30c0de8d9669503773" +SRCREV = "fc4dbd923e044006c93df020590a1e5a8656c09e" SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ file://0001-test_context-skip-test-case-test_searchdirs.patch \ From bc8386cbd4de0209f2123c881db83f2d8f0c2748 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 5 Jun 2024 15:47:52 +0200 Subject: [PATCH 03/10] frr: upgrade 9.0.2 -> 9.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj [jonas.gorski: rebase onto 9.0.2] Signed-off-by: Jonas Gorski --- .../frr/frr/0001-CVE-2024-44070.patch | 55 ------------------- .../frr/{frr_9.0.3.bb => frr_9.1.bb} | 7 ++- .../{frr_9.0.3.bbappend => frr_9.1.bbappend} | 0 3 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 recipes-protocols/frr/frr/0001-CVE-2024-44070.patch rename recipes-protocols/frr/{frr_9.0.3.bb => frr_9.1.bb} (97%) rename recipes-protocols/frr/{frr_9.0.3.bbappend => frr_9.1.bbappend} (100%) diff --git a/recipes-protocols/frr/frr/0001-CVE-2024-44070.patch b/recipes-protocols/frr/frr/0001-CVE-2024-44070.patch deleted file mode 100644 index 9472d7a7..00000000 --- a/recipes-protocols/frr/frr/0001-CVE-2024-44070.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ab70eee423cce4a06103f52cb4a2e3bd2740afa2 Mon Sep 17 00:00:00 2001 -From: Donatas Abraitis -Date: Wed, 31 Jul 2024 08:35:14 +0300 -Subject: [PATCH] bgpd: Check the actual remaining stream length before taking - TLV value - -``` - 0 0xb50b9f898028 in __sanitizer_print_stack_trace (/home/ubuntu/frr-public/frr_public_private-libfuzzer/bgpd/.libs/bgpd+0x368028) (BuildId: 3292703ed7958b20076550c967f879db8dc27ca7) - 1 0xb50b9f7ed8e4 in fuzzer::PrintStackTrace() (/home/ubuntu/frr-public/frr_public_private-libfuzzer/bgpd/.libs/bgpd+0x2bd8e4) (BuildId: 3292703ed7958b20076550c967f879db8dc27ca7) - 2 0xb50b9f7d4d9c in fuzzer::Fuzzer::CrashCallback() (/home/ubuntu/frr-public/frr_public_private-libfuzzer/bgpd/.libs/bgpd+0x2a4d9c) (BuildId: 3292703ed7958b20076550c967f879db8dc27ca7) - 3 0xe0d12d7469cc (linux-vdso.so.1+0x9cc) (BuildId: 1a77697e9d723fe22246cfd7641b140c427b7e11) - 4 0xe0d12c88f1fc in __pthread_kill_implementation nptl/pthread_kill.c:43:17 - 5 0xe0d12c84a678 in gsignal signal/../sysdeps/posix/raise.c:26:13 - 6 0xe0d12c83712c in abort stdlib/abort.c:79:7 - 7 0xe0d12d214724 in _zlog_assert_failed /home/ubuntu/frr-public/frr_public_private-libfuzzer/lib/zlog.c:789:2 - 8 0xe0d12d1285e4 in stream_get /home/ubuntu/frr-public/frr_public_private-libfuzzer/lib/stream.c:324:3 - 9 0xb50b9f8e47c4 in bgp_attr_encap /home/ubuntu/frr-public/frr_public_private-libfuzzer/bgpd/bgp_attr.c:2758:3 - 10 0xb50b9f8dcd38 in bgp_attr_parse /home/ubuntu/frr-public/frr_public_private-libfuzzer/bgpd/bgp_attr.c:3783:10 - 11 0xb50b9faf74b4 in bgp_update_receive /home/ubuntu/frr-public/frr_public_private-libfuzzer/bgpd/bgp_packet.c:2383:20 - 12 0xb50b9faf1dcc in bgp_process_packet /home/ubuntu/frr-public/frr_public_private-libfuzzer/bgpd/bgp_packet.c:4075:11 - 13 0xb50b9f8c90d0 in LLVMFuzzerTestOneInput /home/ubuntu/frr-public/frr_public_private-libfuzzer/bgpd/bgp_main.c:582:3 -``` - -Reported-by: Iggy Frankovic -Signed-off-by: Donatas Abraitis -(cherry picked from commit 0998b38e4d61179441f90dd7e7fd6a3a8b7bd8c5) -CVE: CVE-2024-44070 -Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/5748034271261aa622b967283ccefdc89272f8fe] -Signed-off-by: Jonas Gorski ---- - bgpd/bgp_attr.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c -index 0023a0176826..889902efcb0a 100644 ---- a/bgpd/bgp_attr.c -+++ b/bgpd/bgp_attr.c -@@ -2687,6 +2687,14 @@ static int bgp_attr_encap(struct bgp_attr_parser_args *args) - args->total); - } - -+ if (STREAM_READABLE(BGP_INPUT(peer)) < sublength) { -+ zlog_err("Tunnel Encap attribute sub-tlv length %d exceeds remaining stream length %zu", -+ sublength, STREAM_READABLE(BGP_INPUT(peer))); -+ return bgp_attr_malformed(args, -+ BGP_NOTIFY_UPDATE_OPT_ATTR_ERR, -+ args->total); -+ } -+ - /* alloc and copy sub-tlv */ - /* TBD make sure these are freed when attributes are released */ - tlv = XCALLOC(MTYPE_ENCAP_TLV, --- -2.46.0 - diff --git a/recipes-protocols/frr/frr_9.0.3.bb b/recipes-protocols/frr/frr_9.1.bb similarity index 97% rename from recipes-protocols/frr/frr_9.0.3.bb rename to recipes-protocols/frr/frr_9.1.bb index 29fff9d0..9db6710d 100644 --- a/recipes-protocols/frr/frr_9.0.3.bb +++ b/recipes-protocols/frr/frr_9.1.bb @@ -9,12 +9,13 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.0 \ - file://0001-CVE-2024-44070.patch \ +PR = "r1" + +SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \ file://frr.pam \ " -SRCREV = "d8319ddcce37045cd4f5692981664df1445f2097" +SRCREV = "312faf8008bb4f3b9e84b8e2758cd2cbdf5742b5" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P\d+(\.\d+)+)$" diff --git a/recipes-protocols/frr/frr_9.0.3.bbappend b/recipes-protocols/frr/frr_9.1.bbappend similarity index 100% rename from recipes-protocols/frr/frr_9.0.3.bbappend rename to recipes-protocols/frr/frr_9.1.bbappend From 01e4e82bc7111b3281fcede0bfc698b4d52f592d Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 12 Jan 2024 10:50:23 +0800 Subject: [PATCH 04/10] frr: use update-alternatives for ietf-interfaces.yang Error: Transaction test error: file /usr/share/yang/ietf-interfaces.yang conflicts between attempted installs of libsmi-yang-0.5.0-r0.cortexa57 and frr-9.1-r1.cortexa57 libsmi also uses the doc 'ietf-interfaces.yang'. libsmi has a priority of 50. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- recipes-protocols/frr/frr_9.1.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-protocols/frr/frr_9.1.bb b/recipes-protocols/frr/frr_9.1.bb index 9db6710d..5cc19d09 100644 --- a/recipes-protocols/frr/frr_9.1.bb +++ b/recipes-protocols/frr/frr_9.1.bb @@ -74,6 +74,11 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "frr.service" SYSTEMD_AUTO_ENABLE = "disable" +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = " ietf-interfaces " +ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" do_compile:prepend () { sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ -e 's#${RECIPE_SYSROOT}##g' ${S}/lib/version.h From 27780415ae7665b689569d4217a16bbbe1e44fb4 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 12 Jan 2024 16:51:23 +0800 Subject: [PATCH 05/10] frr: Fix install conflict when enable multilib. Error: Transaction test error: file /usr/lib/systemd/system/frr.service conflicts between attempted installs of frr-9.1-r1.cortexa57 and lib32-frr-9.1-r1.armv7ahf_neon file /usr/lib/systemd/system/frr@.service conflicts between attempted installs of frr-9.1-r1.cortexa57 and lib32-frr-9.1-r1.armv7ahf_neon file /usr/include/frr/version.h conflicts between attempted installs of lib32-frr-dev-9.1-r1.armv7ahf_neon and frr-dev-9.1-r1.cortexa57 The differences of version.h are as follows: @@ -32,7 +32,7 @@ #define FRR_VER_SHORT "9.1" #define FRR_BUG_ADDRESS "https://github.com/frrouting/frr/issues" #define FRR_COPYRIGHT "Copyright 1996-2005 Kunihiro Ishiguro, et al." -#define FRR_CONFIG_ARGS "'--build=x86_64-linux' '--host=aarch64-poky-linux' '--target=aarch64-poky-linux' '--prefix=/usr' '--exec_prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin' '--libexecdir=/usr/libexec' '--datadir=/usr/share' '--sysconfdir=/etc' '--sharedstatedir=/com' '--localstatedir=/var' '--libdir=/usr/lib64' '--includedir=/usr/include' '--oldincludedir=/usr/include' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--disable-silent-rules' '--disable-dependency-tracking' '--with-libtool-sysroot=' '--sbindir=/usr/lib64/frr' '--sysconfdir=/etc/frr' '--localstatedir=/var/run/frr' '--enable-vtysh' '--enable-multipath=64' '--enable-user=frr' '--enable-group=frr' '--enable-vty-group=frrvty' '--enable-configfile-mask=0640' '--enable-logfile-mask=0640' '--disable-doc' '--with-clippy=/usr/lib/clippy' '--disable-static' '--disable-capabilities' '--disable-cumulus' '--disable-datacenter' '--disable-fpm' '--disable-grpc' '--disable-ospfapi' '--disable-ospfclient' '--without-l ibpam' '--disable-protobuf' '--disable-snmp' '--disable-zeromq' 'build_alias=x86_64-linux' 'host_alias=aarch64-poky-linux' 'target_alias=aarch64-poky-linux' 'AR=aarch64-poky-linux-gcc-ar' 'LD=aarch64-poky-linux-ld --sysroot= ' 'OBJCOPY=aarch64-poky-linux-objcopy' 'OBJDUMP=aarch64-poky-linux-objdump' 'RANLIB=aarch64-poky-linux-gcc-ranlib' 'STRIP=aarch64-poky-linux-strip' 'PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/share/pkgconfig://usr/share/pkgconfig' 'PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig' 'CC=aarch64-poky-linux-gcc -mcpu=cortex-a57 -march=armv8-a+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=' 'CPPFLAGS=' 'CPP=aarch64-poky-linux-gcc -E --sysroot= -mcpu=cortex-a57 -march=armv8-a+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security' 'CXX=aarch64-poky-linux-g++ -mcpu=cortex-a57 -march=armv8-a+crc -mbranch-prot ection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=' 'PYTHON=/usr/bin/python3-native/python3'" +#define FRR_CONFIG_ARGS "'--build=x86_64-linux' '--host=arm-pokymllib32-linux-gnueabi' '--target=arm-pokymllib32-linux-gnueabi' '--prefix=/usr' '--exec_prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin' '--libexecdir=/usr/libexec' '--datadir=/usr/share' '--sysconfdir=/etc' '--sharedstatedir=/com' '--localstatedir=/var' '--libdir=/usr/lib' '--includedir=/usr/include' '--oldincludedir=/usr/include' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--disable-silent-rules' '--disable-dependency-tracking' '--with-libtool-sysroot=' '--sbindir=/usr/lib/frr' '--sysconfdir=/etc/frr' '--localstatedir=/var/run/frr' '--enable-vtysh' '--enable-multipath=64' '--enable-user=frr' '--enable-group=frr' '--enable-vty-group=frrvty' '--enable-configfile-mask=0640' '--enable-logfile-mask=0640' '--disable-doc' '--with-clippy=/usr/lib/clippy' '--disable-static' '--disable-capabilities' '--disable-cumulus' '--disable-datacenter' '--disable-fpm' '--disable-grpc' '--disable-ospfapi' '--disable-ospfcl ient' '--without-libpam' '--disable-protobuf' '--disable-snmp' '--disable-zeromq' 'build_alias=x86_64-linux' 'host_alias=arm-pokymllib32-linux-gnueabi' 'target_alias=arm-pokymllib32-linux-gnueabi' 'AR=arm-pokymllib32-linux-gnueabi-gcc-ar' 'LD=arm-pokymllib32-linux-gnueabi-ld --sysroot= ' 'OBJCOPY=arm-pokymllib32-linux-gnueabi-objcopy' 'OBJDUMP=arm-pokymllib32-linux-gnueabi-objdump' 'RANLIB=arm-pokymllib32-linux-gnueabi-gcc-ranlib' 'STRIP=arm-pokymllib32-linux-gnueabi-strip' 'PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/ubinux-dev/ubinux001/contribution/build_xh/tmp/work/armv7ahf-neon-pokymllib32-linux-gnueabi/lib32-frr/9.1/recipe-sysroot//usr/share/pkgconfig' 'PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig' 'CC=arm-pokymllib32-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 --sysroot=' 'CPPFLAGS=' 'CPP=arm-pokymllib32-linux-gnueabi -gcc -E --sysroot= -march=armv7-a -mfpu=neon -mfloat-abi=hard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64' 'CXX=arm-pokymllib32-linux-gnueabi-g++ -march=armv7-a -mfpu=neon -mfloat-abi=hard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 --sysroot=' 'PYTHON=/usr/bin/python3-native/python3'" #define FRR_DEFAULT_MOTD \ "\n" \ Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj [jonas.gorski: update modified .service files accordingly] Signed-off-by: Jonas Gorski --- recipes-protocols/frr/files/frr.service | 6 +++--- recipes-protocols/frr/files/frr@.service | 6 +++--- recipes-protocols/frr/frr_9.1.bb | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/recipes-protocols/frr/files/frr.service b/recipes-protocols/frr/files/frr.service index dd57847e..19ee8534 100644 --- a/recipes-protocols/frr/files/frr.service +++ b/recipes-protocols/frr/files/frr.service @@ -18,9 +18,9 @@ RestartSec=5 Restart=on-abnormal LimitNOFILE=1024 PIDFile=/var/run/frr/watchfrr.pid -ExecStart=/usr/lib/frr/frrinit.sh start -ExecStop=/usr/lib/frr/frrinit.sh stop -ExecReload=/usr/lib/frr/frrinit.sh reload +ExecStart=/usr/libexec/frr/frrinit.sh start +ExecStop=/usr/libexec/frr/frrinit.sh stop +ExecReload=/usr/libexec/frr/frrinit.sh reload [Install] WantedBy=multi-user.target diff --git a/recipes-protocols/frr/files/frr@.service b/recipes-protocols/frr/files/frr@.service index 975aa929..107c967d 100644 --- a/recipes-protocols/frr/files/frr@.service +++ b/recipes-protocols/frr/files/frr@.service @@ -18,9 +18,9 @@ RestartSec=5 Restart=on-abnormal LimitNOFILE=1024 PIDFile=/var/run/frr/%I/watchfrr.pid -ExecStart=/usr/lib/frr/frrinit.sh start %I -ExecStop=/usr/lib/frr/frrinit.sh stop %I -ExecReload=/usr/lib/frr/frrinit.sh reload %I +ExecStart=/usr/libexec/frr/frrinit.sh start %I +ExecStop=/usr/libexec/frr/frrinit.sh stop %I +ExecReload=/usr/libexec/frr/frrinit.sh reload %I [Install] WantedBy=multi-user.target diff --git a/recipes-protocols/frr/frr_9.1.bb b/recipes-protocols/frr/frr_9.1.bb index 5cc19d09..0926f842 100644 --- a/recipes-protocols/frr/frr_9.1.bb +++ b/recipes-protocols/frr/frr_9.1.bb @@ -46,7 +46,7 @@ PACKAGECONFIG[ospfclient] = "--enable-ospfapi --enable-ospfclient,--disable-ospf EXTRA_OECONF:class-native = "--enable-clippy-only" -EXTRA_OECONF:class-target = "--sbindir=${libdir}/frr \ +EXTRA_OECONF:class-target = "--sbindir=${libexecdir}/frr \ --sysconfdir=${sysconfdir}/frr \ --localstatedir=${localstatedir}/run/frr \ --enable-vtysh \ @@ -74,7 +74,7 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "frr.service" SYSTEMD_AUTO_ENABLE = "disable" -inherit update-alternatives +inherit update-alternatives multilib_script multilib_header ALTERNATIVE_PRIORITY = "100" ALTERNATIVE:${PN} = " ietf-interfaces " @@ -95,6 +95,7 @@ do_install:class-native () { do_install:append:class-target () { install -m 0755 -d ${D}${sysconfdir}/frr + install -m 0755 -d ${D}${libexecdir}/frr install -m 0640 ${S}/tools/etc/frr/* ${D}${sysconfdir}/frr/ chown frr:frrvty ${D}${sysconfdir}/frr chown frr:frr ${D}${sysconfdir}/frr/* @@ -123,6 +124,7 @@ do_install:append:class-target () { echo "d /run/frr 0755 frr frr -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf fi + oe_multilib_header frr/version.h } USERADD_PACKAGES = "${PN}" From f954f2205a9557a2c23a561a5ecb51936e7bc18d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 15 Mar 2024 06:37:21 +0100 Subject: [PATCH 06/10] recipes: Drop remaining PR values from recipes * as oe-core did in: https://git.openembedded.org/openembedded-core/commit/?id=d4c346e8ab * when people are have to maintain own PRs for recipes in oe-core, they might add them for meta-oe recipes at the same time when upgrading to next LTS Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- recipes-protocols/frr/frr_9.1.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-protocols/frr/frr_9.1.bb b/recipes-protocols/frr/frr_9.1.bb index 0926f842..8ea917af 100644 --- a/recipes-protocols/frr/frr_9.1.bb +++ b/recipes-protocols/frr/frr_9.1.bb @@ -9,7 +9,6 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" -PR = "r1" SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \ file://frr.pam \ From ed8f5ca6232b36cecc75bfe38933998d0066564e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Mar 2024 11:38:56 -0700 Subject: [PATCH 07/10] frr: Upgrade to latest on 9.1 stable Signed-off-by: Khem Raj --- recipes-protocols/frr/frr_9.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-protocols/frr/frr_9.1.bb b/recipes-protocols/frr/frr_9.1.bb index 8ea917af..bc9fc4f2 100644 --- a/recipes-protocols/frr/frr_9.1.bb +++ b/recipes-protocols/frr/frr_9.1.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \ file://frr.pam \ " -SRCREV = "312faf8008bb4f3b9e84b8e2758cd2cbdf5742b5" +SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P\d+(\.\d+)+)$" From b573bccf0e0056e21140843f825a90362e537f41 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Mar 2024 14:43:03 -0700 Subject: [PATCH 08/10] frr: Fix build on newer musl provide GNU like basename on non-glibc systems Signed-off-by: Khem Raj --- ...basename-API-for-non-glibc-library-e.patch | 34 +++++++++++++++++++ recipes-protocols/frr/frr_9.1.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch diff --git a/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch b/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch new file mode 100644 index 00000000..8c83d5c8 --- /dev/null +++ b/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch @@ -0,0 +1,34 @@ +From 49aeccbec4bf620bb594999bbd4a9de669a3984c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 15 Mar 2024 14:34:06 -0700 +Subject: [PATCH] zebra: Mimic GNU basename() API for non-glibc library e.g. + musl musl only provides POSIX version of basename and it has also removed + providing it via string.h header [1] which now results in compile errors with + newer compilers e.g. clang-18 + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561/] +Signed-off-by: Khem Raj +--- + zebra/zebra_netns_notify.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c +index 1bb1292e34..d55df2f62d 100644 +--- a/zebra/zebra_netns_notify.c ++++ b/zebra/zebra_netns_notify.c +@@ -41,6 +41,10 @@ + #define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000 + #define ZEBRA_NS_POLLING_MAX_RETRIES 200 + ++#if !defined(__GLIBC__) ++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) ++#endif ++ + DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); + static struct event *zebra_netns_notify_current; + +-- +2.44.0 + diff --git a/recipes-protocols/frr/frr_9.1.bb b/recipes-protocols/frr/frr_9.1.bb index bc9fc4f2..eea6d62f 100644 --- a/recipes-protocols/frr/frr_9.1.bb +++ b/recipes-protocols/frr/frr_9.1.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \ file://frr.pam \ + file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ " SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5" From 7e440dbdc3eb905d596c75756937e0439906ae77 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 5 Jun 2024 10:15:37 +0200 Subject: [PATCH 09/10] frr: update 9.1 to 10.0 Update FRR from version 9.1 to newest 10.0. [jonas.gorski: update bbappend and support_bundle_commands.conf] Signed-off-by: Jonas Gorski --- .../frr/files/support_bundle_commands.conf | 26 ++++++++++++++++--- .../frr/{frr_9.1.bb => frr_10.0.bb} | 4 +-- .../{frr_9.1.bbappend => frr_10.0.bbappend} | 2 +- 3 files changed, 25 insertions(+), 7 deletions(-) rename recipes-protocols/frr/{frr_9.1.bb => frr_10.0.bb} (98%) rename recipes-protocols/frr/{frr_9.1.bbappend => frr_10.0.bbappend} (99%) diff --git a/recipes-protocols/frr/files/support_bundle_commands.conf b/recipes-protocols/frr/files/support_bundle_commands.conf index fa991243..b9f3de4e 100644 --- a/recipes-protocols/frr/files/support_bundle_commands.conf +++ b/recipes-protocols/frr/files/support_bundle_commands.conf @@ -34,6 +34,8 @@ show bgp nexthop show bgp vrf all summary show bgp vrf all ipv4 show bgp vrf all ipv6 +show bgp vrf all ipv4 vpn +show bgp vrf all ipv6 vpn show bgp vrf all neighbors show bgp evpn route @@ -78,9 +80,9 @@ show vrf show work-queues show debugging hashtable show running-config -show thread cpu -show thread poll -show thread timers +show event cpu +show event poll +show event timers show daemons show version CMD_LIST_END @@ -192,7 +194,7 @@ CMD_LIST_END PROC_NAME:ospf6 CMD_LIST_START show ipv6 ospf6 vrf all -show ipv6 ospf6 vrfs +show ipv6 ospf6 vrfs show ipv6 ospf6 vrf all border-routers show ipv6 ospf6 vrf all border-routers detail show ipv6 ospf6 vrf all database @@ -258,3 +260,19 @@ show ipv6 pim bsr show ipv6 pim bsrp-info show ipv6 pim bsm-databases CMD_LIST_END + +#MGMT Support Bundle Command List +PROC_NAME:mgmt +CMD_LIST_START +show mgmt backend-adapter all +show mgmt backend-yang-xpath-registry +show mgmt commit-history +show mgmt datastore all +show mgmt datastore-contents candidate json +show mgmt datastore-contents running json +show mgmt frontend-adapter all detail +show mgmt get-config candidate / +show mgmt get-config running / +show mgmt transaction all +show mgmt yang-xpath-subscription / +CMD_LIST_END diff --git a/recipes-protocols/frr/frr_9.1.bb b/recipes-protocols/frr/frr_10.0.bb similarity index 98% rename from recipes-protocols/frr/frr_9.1.bb rename to recipes-protocols/frr/frr_10.0.bb index eea6d62f..3b472be4 100644 --- a/recipes-protocols/frr/frr_9.1.bb +++ b/recipes-protocols/frr/frr_10.0.bb @@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \ +SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \ file://frr.pam \ file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ " -SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5" +SRCREV = "03a143cd49ed1b190cb38f48a31ef4d71fa01a02" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P\d+(\.\d+)+)$" diff --git a/recipes-protocols/frr/frr_9.1.bbappend b/recipes-protocols/frr/frr_10.0.bbappend similarity index 99% rename from recipes-protocols/frr/frr_9.1.bbappend rename to recipes-protocols/frr/frr_10.0.bbappend index fce04256..cb011816 100644 --- a/recipes-protocols/frr/frr_9.1.bbappend +++ b/recipes-protocols/frr/frr_10.0.bbappend @@ -6,7 +6,7 @@ SRC_URI:append = " \ file://support_bundle_commands.conf;subdir=git/tools/etc/frr \ " -PR = "r2" +PR = "r1" SYSTEMD_AUTO_ENABLE = "enable" From d4691cbb52b52caef14a9a24dad8538b71f01f44 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 7 Jun 2024 12:17:44 +0200 Subject: [PATCH 10/10] frr: update 10.0 to 10.1.1 Update FRR 10 to newest release 10.1.1 Signed-off-by: Jonas Gorski --- ...basename-API-for-non-glibc-library-e.patch | 34 ------------------- .../frr/{frr_10.0.bb => frr_10.1.1.bb} | 3 +- ...{frr_10.0.bbappend => frr_10.1.1.bbappend} | 0 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch rename recipes-protocols/frr/{frr_10.0.bb => frr_10.1.1.bb} (97%) rename recipes-protocols/frr/{frr_10.0.bbappend => frr_10.1.1.bbappend} (100%) diff --git a/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch b/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch deleted file mode 100644 index 8c83d5c8..00000000 --- a/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 49aeccbec4bf620bb594999bbd4a9de669a3984c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 15 Mar 2024 14:34:06 -0700 -Subject: [PATCH] zebra: Mimic GNU basename() API for non-glibc library e.g. - musl musl only provides POSIX version of basename and it has also removed - providing it via string.h header [1] which now results in compile errors with - newer compilers e.g. clang-18 - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561/] -Signed-off-by: Khem Raj ---- - zebra/zebra_netns_notify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c -index 1bb1292e34..d55df2f62d 100644 ---- a/zebra/zebra_netns_notify.c -+++ b/zebra/zebra_netns_notify.c -@@ -41,6 +41,10 @@ - #define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000 - #define ZEBRA_NS_POLLING_MAX_RETRIES 200 - -+#if !defined(__GLIBC__) -+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) -+#endif -+ - DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); - static struct event *zebra_netns_notify_current; - --- -2.44.0 - diff --git a/recipes-protocols/frr/frr_10.0.bb b/recipes-protocols/frr/frr_10.1.1.bb similarity index 97% rename from recipes-protocols/frr/frr_10.0.bb rename to recipes-protocols/frr/frr_10.1.1.bb index 3b472be4..5b3f0e02 100644 --- a/recipes-protocols/frr/frr_10.0.bb +++ b/recipes-protocols/frr/frr_10.1.1.bb @@ -12,10 +12,9 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \ file://frr.pam \ - file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ " -SRCREV = "03a143cd49ed1b190cb38f48a31ef4d71fa01a02" +SRCREV = "dbf8dac1cea2b1235746e2d966a8ded9cffd5dc3" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P\d+(\.\d+)+)$" diff --git a/recipes-protocols/frr/frr_10.0.bbappend b/recipes-protocols/frr/frr_10.1.1.bbappend similarity index 100% rename from recipes-protocols/frr/frr_10.0.bbappend rename to recipes-protocols/frr/frr_10.1.1.bbappend