From f10270279bc1e20d4d8e79981e45f12f1ba18d1d Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Thu, 25 Jan 2024 14:43:24 +0100
Subject: [PATCH] New version 9.1

---
 .gitignore           | 1 +
 0004-fips-mode.patch | 6 +++---
 frr.spec             | 7 +++++--
 sources              | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3ac093c..59edda5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /frr-8.5.1.tar.gz
 /frr-8.5.2.tar.gz
 /frr-9.0.1.tar.gz
+/frr-9.1.tar.gz
diff --git a/0004-fips-mode.patch b/0004-fips-mode.patch
index deedf14..ed324e8 100644
--- a/0004-fips-mode.patch
+++ b/0004-fips-mode.patch
@@ -3,8 +3,8 @@ index 631465f..e084ff3 100644
 --- a/ospfd/ospf_vty.c
 +++ b/ospfd/ospf_vty.c
 @@ -1136,6 +1136,11 @@ DEFUN (ospf_area_vlink,
- 
- 	if (argv_find(argv, argc, "message-digest", &idx)) {
+ 		vl_config.keychain = argv[idx+1]->arg;
+ 	} else if (argv_find(argv, argc, "message-digest", &idx)) {
  		/* authentication message-digest */
 +		if(FIPS_mode())
 +		{
@@ -41,7 +41,7 @@ index 631465f..e084ff3 100644
 +		}
  		SET_IF_PARAM(params, auth_type);
  		params->auth_type = OSPF_AUTH_CRYPTOGRAPHIC;
- 		return CMD_SUCCESS;
+ 		UNSET_IF_PARAM(params, keychain_name);
 @@ -6971,6 +6990,11 @@ DEFUN (ip_ospf_message_digest_key,
         "The OSPF password (key)\n"
         "Address of interface\n")
diff --git a/frr.spec b/frr.spec
index 7d5d03d..3fe92ef 100644
--- a/frr.spec
+++ b/frr.spec
@@ -8,8 +8,8 @@
 %bcond selinux 1
 
 Name:           frr
-Version:        9.0.1
-Release:        3%{?dist}
+Version:        9.1
+Release:        1%{?dist}
 Summary:        Routing daemon
 License:        GPL-2.0-or-later AND ISC AND LGPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-or-later  OR ISC) AND MIT
 URL:            http://www.frrouting.org
@@ -275,6 +275,9 @@ rm tests/lib/*grpc*
 %endif
 
 %changelog
+* Thu Jan 25 2024 Michal Ruprich <mruprich@redhat.com> - 9.1-1
+- New version 9.1
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index f3b1758..5f8e436 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (frr-9.0.1.tar.gz) = 30352e1a420e1bb1304f5b136a52f71dcfac972399d73356f273292767c5d5f4488f37e7601ff21126053cea65718b9be40e29cec4758eae0f12f6d4892bb826
+SHA512 (frr-9.1.tar.gz) = 5e77de9d26275ac8babd3bd467fe05c7fb6fa50c80fe61e13057784945372debe24f44557d9d52e76e2e785919cdfb4d5a80e7b2a06558f2a52745d0e0b92766
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d