From 18a38a140da0916dc39ef73fd519937572638801 Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Fri, 15 Sep 2023 10:44:52 +0200
Subject: [PATCH 1/2] frr: 8.5.2 -> 9.0.1

frr series 9 adds first and foremost:
- mgmtd: YANG-based daemon for frr configuration
- reduced memory footprint

See: https://frrouting.org/release/9.0/

Furthermore 9.0.1 contains important bug fixes, e.g. for
CVE-2023-38802.

See: https://frrouting.org/release/9.0.1/

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/servers/frr/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix
index 87fd2064a563..d6d016b5e4be 100644
--- a/pkgs/servers/frr/default.nix
+++ b/pkgs/servers/frr/default.nix
@@ -25,6 +25,7 @@
 , python3
 , readline
 , rtrlib
+, protobufc
 
 # tests
 , nettools
@@ -47,6 +48,7 @@
 , rtadvSupport ? true
 , irdpSupport ? true
 , routeReplacementSupport ? true
+, mgmtdSupport ? true
 
 # routing daemon options
 , bgpdSupport ? true
@@ -83,13 +85,13 @@ lib.warnIf (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform))
 
 stdenv.mkDerivation rec {
   pname = "frr";
-  version = "8.5.2";
+  version = "9.0.1";
 
   src = fetchFromGitHub {
     owner = "FRRouting";
     repo = pname;
     rev = "${pname}-${version}";
-    hash = "sha256-xJCaVh/PlV6WRv/JRHO/vzF72E6Ap8/RaqLnkYTnk14=";
+    hash = "sha256-o0AVx7sDRowQz6NpKPQThC8NcGA3QN8xFzfE0k4AIVg=";
   };
 
   nativeBuildInputs = [
@@ -114,6 +116,7 @@ stdenv.mkDerivation rec {
     python3
     readline
     rtrlib
+    protobufc
   ] ++ lib.optionals stdenv.isLinux [
     libcap
   ] ++ lib.optionals snmpSupport [
@@ -149,6 +152,8 @@ stdenv.mkDerivation rec {
     (lib.strings.enableFeature rtadvSupport "rtadv")
     (lib.strings.enableFeature irdpSupport "irdp")
     (lib.strings.enableFeature routeReplacementSupport "rr-semantics")
+    (lib.strings.enableFeature mgmtdSupport "mgmtd")
+
     # routing protocols
     (lib.strings.enableFeature bgpdSupport "bgpd")
     (lib.strings.enableFeature ripdSupport "ripd")

From 8e5d42e8e93a9a67ef8aea7e07d1bc23277ae86b Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Fri, 15 Sep 2023 13:19:19 +0200
Subject: [PATCH 2/2] nixos/frr: add mgmtd to service list

mgmtd is a new service in frr >= 9.0.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 nixos/modules/services/networking/frr.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/frr.nix b/nixos/modules/services/networking/frr.nix
index d350fe3548ae..8488a4e4ef48 100644
--- a/nixos/modules/services/networking/frr.nix
+++ b/nixos/modules/services/networking/frr.nix
@@ -23,6 +23,7 @@ let
     "pbr"
     "bfd"
     "fabric"
+    "mgmt"
   ];
 
   allServices = services ++ [ "zebra" ];