From 12cd4431e43bda4e96663f59c16d3be0aa455754 Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Thu, 12 Jan 2023 16:29:19 +0100
Subject: [PATCH] New version 8.4.2

---
 .gitignore           |  1 +
 0004-fips-mode.patch | 12 ++++++++++++
 frr.spec             |  5 ++++-
 sources              |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 70723e7..829852b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /frr-8.3.1.tar.gz
 /frr-8.4.tar.gz
 /frr-8.4.1.tar.gz
+/frr-8.4.2.tar.gz
diff --git a/0004-fips-mode.patch b/0004-fips-mode.patch
index e8efeb7..deedf14 100644
--- a/0004-fips-mode.patch
+++ b/0004-fips-mode.patch
@@ -101,3 +101,15 @@ index 5bb81ef..02a09ef 100644
  	nb_cli_enqueue_change(vty, "./authentication-scheme/mode", NB_OP_MODIFY,
  			      strmatch(mode, "md5") ? "md5" : "plain-text");
  	if (strmatch(mode, "md5"))
+diff --git a/lib/zebra.h b/lib/zebra.h
+index 53ae5b4..930307f 100644
+--- a/lib/zebra.h
++++ b/lib/zebra.h
+@@ -114,6 +114,7 @@
+ #ifdef CRYPTO_OPENSSL
+ #include <openssl/evp.h>
+ #include <openssl/hmac.h>
++#include <openssl/fips.h>
+ #endif
+
+ #include "openbsd-tree.h"
diff --git a/frr.spec b/frr.spec
index 239c808..6e8fe32 100644
--- a/frr.spec
+++ b/frr.spec
@@ -6,7 +6,7 @@
 %bcond_without selinux
 
 Name:           frr
-Version:        8.4.1
+Version:        8.4.2
 Release:        1%{?dist}
 Summary:        Routing daemon
 License:        GPLv2+
@@ -267,6 +267,9 @@ rm tests/lib/*grpc*
 %endif
 
 %changelog
+* Thu Jan 12 2023 Michal Ruprich <mruprich@redhat.com> - 8.4.2-1
+- New version 8.4.2
+
 * Fri Nov 25 2022 Michal Ruprich <mruprich@redhat.com> - 8.4.1-1
 - New version 8.4.1
 - Fix for rhbz #2140705
diff --git a/sources b/sources
index b25e3c0..906a508 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+SHA512 (frr-8.4.2.tar.gz) = 1079bf3f597cc21ccbc37c5617cfb95f6e066de2a726a9b8ffb5825f92af3049d0e19ef4e9944a9e11dabc4309c56f0ab22e4c9188f5008ebcea47e0428f3ff0
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d
-SHA512 (frr-8.4.1.tar.gz) = bc29088979bf0a1383d5bdb1bbe93697941048a489993a276ba6e6aa994b1c651fc630b47fa847805d60278657f3c6b45c5150256d01058d5483fb0867f0589e