From bb868d767431519d8b9133226dd55b359adaccdf Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 14 Dec 2024 12:19:51 +0100
Subject: [PATCH 1/3] frr: 10.1 -> 10.2.1

https://frrouting.org/release/10.2/
https://github.com/FRRouting/frr/blob/frr-10.2.1/redhat/frr.spec.in#L839
---
 pkgs/by-name/fr/frr/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
index bc96316e711117..8d72901e54c1b3 100644
--- a/pkgs/by-name/fr/frr/package.nix
+++ b/pkgs/by-name/fr/frr/package.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 
 # build time
 , autoreconfHook
@@ -77,23 +76,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "frr";
-  version = "10.1";
+  version = "10.2.1";
 
   src = fetchFromGitHub {
     owner = "FRRouting";
     repo = finalAttrs.pname;
     rev = "${finalAttrs.pname}-${finalAttrs.version}";
-    hash = "sha256-pmFdxL8QpyXvpX2YiSOZ+KIoNaj1OOH6/qnVAWZLE9s=";
+    hash = "sha256-TWqW6kI5dDl6IW2Ql6eeySDSyxp0fPgcJOOX1JxjAxs=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2024-44070.patch";
-      url = "https://github.com/FRRouting/frr/commit/fea4ed5043b4a523921f970a39a565d2c1ca381f.patch";
-      hash = "sha256-X9FjQeOvo92+mL1z3u5W0LBhhePDAyhFAqh8sAtNNm8=";
-    })
-  ];
-
   nativeBuildInputs = [
     autoreconfHook
     bison

From 4dd7ca03a3a63c5848f8f60e9ddd0e7ce0b2f961 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 08:22:15 +0000
Subject: [PATCH 2/3] libyang: 2.1.148 -> 3.4.2

---
 pkgs/by-name/li/libyang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
index 30b40d0a013e13..e0523222b28a7a 100644
--- a/pkgs/by-name/li/libyang/package.nix
+++ b/pkgs/by-name/li/libyang/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libyang";
-  version = "2.1.148";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "CESNET";
     repo = "libyang";
     rev = "v${version}";
-    hash = "sha256-uYZJo8lUv6tq0MRRJvbTS/8t1eZNGqcMb5k5sVCwMJM=";
+    hash = "sha256-pki4T6faY42UcnzOT6697FJWyPRNKNbUFEFZkkeWUx8=";
   };
 
   nativeBuildInputs = [

From 9478b2f3e8d7be47bbd0691afde74592d9b8cb82 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Mon, 6 Jan 2025 11:04:34 +0100
Subject: [PATCH 3/3] nixos/tests/frr: Adjust hello-interval and dead-interval

https://github.com/NixOS/nixpkgs/pull/365164#issuecomment-2572728393
---
 nixos/tests/frr.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/tests/frr.nix b/nixos/tests/frr.nix
index f4cd68c9d3155d..21e61bd768aa46 100644
--- a/nixos/tests/frr.nix
+++ b/nixos/tests/frr.nix
@@ -12,6 +12,10 @@ import ./make-test-python.nix (
     ifAddr = node: iface: (pkgs.lib.head node.networking.interfaces.${iface}.ipv4.addresses).address;
 
     ospfConf1 = ''
+      interface eth2
+        ip ospf hello-interval 1
+        ip ospf dead-interval 5
+      !
       router ospf
         network 192.168.0.0/16 area 0
     '';