[PATCH frr 1/2] bump frr to 10.6.0, remove obsolete patch

Gabriel Goller
2026-04-01T12:36:20Z

Update the upstream source to the latest tag 10.6.0. This also allows us
to remove the fix-daemon starting order patch, as that has been merged
upstream.

This brings a number of new features, including IPv6 support for EVPN
VTEP endpoints.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
...n-starting-order-for-debian-packages.patch | 35 -------------------
debian/patches/series | 1 -
frr | 2 +-
3 files changed, 1 insertion(+), 37 deletions(-)
delete mode 100644 debian/patches/pve/0006-tools-fix-daemon-starting-order-for-debian-packages.patch

diff --git a/debian/patches/pve/0006-tools-fix-daemon-starting-order-for-debian-packages.patch b/debian/patches/pve/0006-tools-fix-daemon-starting-order-for-debian-packages.patch
deleted file mode 100644
index 0f28d9a7e5ed..000000000000
--- a/debian/patches/pve/0006-tools-fix-daemon-starting-order-for-debian-packages.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 800f336b0bfbe6bc932d438eac5ccce6ab7196e3 Mon Sep 17 00:00:00 2001
-From: Hannes Duerr <h.duerr@proxmox.com>
-Date: Wed, 16 Jul 2025 10:01:27 +0200
-Subject: [PATCH] tools: fix daemon starting order for debian packages
-
-Currently the management daemon (mgmtd) starts only after Zebra is
-started, which causes Zebra to throw some errors as described here [0].
-The problem is, when the MGMTD was introduced [1], the order in tools/frr.in
-was adjusted correctly, but not in tools/frrcommon.sh.in.
-We are therefore now also changing it in frrcommon.sh.in.
-
-[0] https://github.com/FRRouting/frr/issues/17931
-[1] https://github.com/FRRouting/frr/pull/13059/commits/1c84efe4fa8585df58a9b53459f94c47934f0786
-
-Signed-off-by: Hannes Duerr <h.duerr@proxmox.com>
----
- tools/frrcommon.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
-index 44355f8895..1848841aff 100755
---- a/tools/frrcommon.sh.in
-+++ b/tools/frrcommon.sh.in
-@@ -36,7 +36,7 @@ FRR_DEFAULT_PROFILE="@DFLT_NAME@" # traditional / datacenter
- # - keep zebra first
- # - watchfrr does NOT belong in this list
-
--DAEMONS="zebra mgmtd bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
-+DAEMONS="mgmtd zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
- RELOAD_SCRIPT="$D_PATH/frr-reload.py"
-
- #
---
-2.47.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 985909c64c45..cffe178f1ea1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
pve/0003-tests-add-bgp-evpn-autort-test.patch
pve/0004-fabricd-enable-dummy_as_loopback-option-per-default.patch
pve/0005-systemd-add-dependancy-to-networking.service.patch
-pve/0006-tools-fix-daemon-starting-order-for-debian-packages.patch
diff --git a/frr b/frr
index 88f5c06cbc1c..3fcbae55ef03 160000
--- a/frr
+++ b/frr
@@ -1 +1 @@
-Subproject commit 88f5c06cbc1cc4d62e1cba3e7791f5cea4179ba5
+Subproject commit 3fcbae55ef03cd1786aaa027668f92368fd877ef
--
2.47.3