diff options
5 files changed, 80 insertions, 5 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index ebacd8bd..01c695dd 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current" vyos_branch = "current" release_train = "current" -kernel_version = "6.6.15" +kernel_version = "6.6.16" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" diff --git a/packages/frr/patches/0001-ospfd-add-support-for-no-router-info-area-as-command.patch b/packages/frr/patches/0001-ospfd-add-support-for-no-router-info-area-as-command.patch new file mode 100644 index 00000000..f6e5a109 --- /dev/null +++ b/packages/frr/patches/0001-ospfd-add-support-for-no-router-info-area-as-command.patch @@ -0,0 +1,42 @@ +From c86cf962743f3db90c027967ba5c92eaed28dd77 Mon Sep 17 00:00:00 2001 +From: Christian Breunig <christian@breunig.cc> +Date: Thu, 8 Feb 2024 22:39:04 +0100 +Subject: [PATCH] ospfd: add support for "no router-info [<area|as>] command" + +frr-reload.py will walk through all config contexts and prepend no to the CLI +command. This requires that the vtysh shell code accepts a full command. + +To Reproduce + +vtysh -c "conf t" -c "router ospf" -c "router-info area" +vtysh -c "conf t" -c "router ospf" -c "no router-info area" +% Unknown command: no router-info area +vtysh -c "conf t" -c "router ospf" -c "no router-info" + +Signed-off-by: Christian Breunig <christian@breunig.cc> +(cherry picked from commit e744db5098dcdca1bce32169aaa0703a21ab6b0c) +--- + ospfd/ospf_ri.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c +index 725443f49..80e7f5931 100644 +--- a/ospfd/ospf_ri.c ++++ b/ospfd/ospf_ri.c +@@ -1722,9 +1722,11 @@ DEFUN (router_info, + + DEFUN (no_router_info, + no_router_info_cmd, +- "no router-info", ++ "no router-info [<area|as>]", + NO_STR +- "Disable the Router Information functionality\n") ++ "Disable the Router Information functionality\n" ++ "Disable the Router Information functionality with AS flooding scope\n" ++ "Disable the Router Information functionality with Area flooding scope\n") + { + + if (!OspfRI.enabled) +-- +2.39.2 + diff --git a/packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch b/packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch new file mode 100644 index 00000000..c814330c --- /dev/null +++ b/packages/frr/patches/0002-ospfd-can-not-delete-segment-routing-node-msd-when-S.patch @@ -0,0 +1,34 @@ +From 07dbae1f59592d4da0b6a248ba24506d23f1dcd9 Mon Sep 17 00:00:00 2001 +From: Christian Breunig <christian@breunig.cc> +Date: Thu, 8 Feb 2024 21:53:35 +0100 +Subject: [PATCH] ospfd: can not delete "segment-routing node-msd" when SR if + off + +This fixes the initial implementation of commit 7743f2f8c00 ("OSPFd: Update +Segment Routing PR following review") where it wsa not possible to remove +the "segment-routing node-msd" CLI nodes via vtysh once segment-routing got +disabled. + +Closes #14910 + +Signed-off-by: Christian Breunig <christian@breunig.cc> +(cherry picked from commit ba45aa62e7bcc4ea7b02773614f03efb6f7c595b) +--- + ospfd/ospf_sr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c +index 467cb0504..e26fe6f53 100644 +--- a/ospfd/ospf_sr.c ++++ b/ospfd/ospf_sr.c +@@ -580,6 +580,7 @@ static void ospf_sr_stop(void) + hash_clean(OspfSR.neighbors, (void *)sr_node_del); + OspfSR.self = NULL; + OspfSR.status = SR_OFF; ++ OspfSR.msd = 0; + } + + /* +-- +2.39.2 + diff --git a/packages/keepalived/Jenkinsfile b/packages/keepalived/Jenkinsfile index b91c927e..0d886751 100644 --- a/packages/keepalived/Jenkinsfile +++ b/packages/keepalived/Jenkinsfile @@ -24,7 +24,7 @@ def package_name = 'keepalived' def pkgList = [ ['name': "${package_name}", - 'scmCommit': 'debian/1%2.2.7-1', + 'scmCommit': 'debian/1%2.2.8-1', 'scmUrl': 'https://salsa.debian.org/debian/pkg-keepalived.git', 'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; ../build.py'], ] diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index 77f7b728..3824d36e 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.15 Kernel Configuration +# Linux/x86 6.6.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 12.2.0-14) 12.2.0" CONFIG_CC_IS_GCC=y @@ -2425,7 +2425,7 @@ CONFIG_TAP=m CONFIG_VETH=m CONFIG_VIRTIO_NET=m CONFIG_NLMON=m -CONFIG_NET_VRF=m +CONFIG_NET_VRF=y # CONFIG_VSOCKMON is not set # CONFIG_ARCNET is not set CONFIG_ETHERNET=y @@ -4101,7 +4101,6 @@ CONFIG_MFD_VIPERBOARD=m # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SKY81452 is not set CONFIG_MFD_SYSCON=y -# CONFIG_MFD_TI_AM335X_TSCADC is not set # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_TI_LMU is not set |