From 52dce136b3c0b748bdc9ea2c4adef189bde24d11 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 09 2022 22:18:44 +0000
Subject: import frr-7.5-11.el8


---

diff --git a/SOURCES/0011-designated-router.patch b/SOURCES/0011-designated-router.patch
new file mode 100644
index 0000000..323a10e
--- /dev/null
+++ b/SOURCES/0011-designated-router.patch
@@ -0,0 +1,33 @@
+diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
+index 69a3e4587..57ef6029a 100644
+--- a/ospfd/ospf_vty.c
++++ b/ospfd/ospf_vty.c
+@@ -3737,6 +3737,28 @@ static void show_ip_ospf_interface_sub(struct vty *vty, struct ospf *ospf,
+ 				vty_out(vty,
+ 					"  No backup designated router on this network\n");
+ 		} else {
++			nbr = ospf_nbr_lookup_by_addr(oi->nbrs, &DR(oi));
++			if (nbr) {
++				if (use_json) {
++					json_object_string_add(
++						json_interface_sub, "drId",
++						inet_ntoa(nbr->router_id));
++					json_object_string_add(
++						json_interface_sub, "drAddress",
++						inet_ntoa(nbr->address.u
++								.prefix4));
++				} else {
++					vty_out(vty,
++						"  Designated Router (ID) %s",
++						inet_ntoa(nbr->router_id));
++					vty_out(vty,
++						" Interface Address %s\n",
++						inet_ntoa(nbr->address.u
++								.prefix4));
++				}
++			}
++			nbr = NULL;
++
+ 			nbr = ospf_nbr_lookup_by_addr(oi->nbrs, &BDR(oi));
+ 			if (nbr == NULL) {
+ 				if (!use_json)
diff --git a/SOURCES/0012-bfd-peers-crash.patch b/SOURCES/0012-bfd-peers-crash.patch
new file mode 100644
index 0000000..1e2d78e
--- /dev/null
+++ b/SOURCES/0012-bfd-peers-crash.patch
@@ -0,0 +1,25 @@
+From 1d923374f64e099d734899aff219d90cb0213fa6 Mon Sep 17 00:00:00 2001
+From: Emanuele Bovisio <emanuele.bovisio@eolo.it>
+Date: Thu, 5 Nov 2020 14:27:51 +0100
+Subject: [PATCH] bfdd: fix crash on show bfd peers counters json
+
+wrong pointer passed to bfd_id_iterate function
+
+Signed-off-by: Emanuele Bovisio <emanuele.bovisio@eolo.it>
+---
+ bfdd/bfdd_vty.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
+index a3f1638e5f6..837a7b7d7d6 100644
+--- a/bfdd/bfdd_vty.c
++++ b/bfdd/bfdd_vty.c
+@@ -447,7 +447,7 @@ static void _display_peers_counter(struct vty *vty, char *vrfname, bool use_json
+ 
+ 	jo = json_object_new_array();
+ 	bvt.jo = jo;
+-	bfd_id_iterate(_display_peer_counter_json_iter, jo);
++	bfd_id_iterate(_display_peer_counter_json_iter, &bvt);
+ 
+ 	vty_out(vty, "%s\n", json_object_to_json_string_ext(jo, 0));
+ 	json_object_free(jo);
diff --git a/SPECS/frr.spec b/SPECS/frr.spec
index a988232..1a3b1a8 100644
--- a/SPECS/frr.spec
+++ b/SPECS/frr.spec
@@ -5,7 +5,7 @@
 
 Name: frr
 Version: 7.5
-Release: 9%{?checkout}%{?dist}
+Release: 11%{?checkout}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
 URL: http://www.frrouting.org
@@ -40,6 +40,8 @@ Patch0007: 0007-frrinit.patch
 Patch0008: 0008-ospf-multi-instance.patch
 Patch0009: 0009-bgp-ttl-security.patch
 Patch0010: 0010-bfd-reload.patch
+Patch0011: 0011-designated-router.patch
+Patch0012: 0012-bfd-peers-crash.patch
 
 %description
 FRRouting is free software that manages TCP/IP based routing protocols. It takes
@@ -200,6 +202,12 @@ make check PYTHON=%{__python3}
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Wed Jan 05 2022 Michal Ruprich <mruprich@redhat.com> - 7.5-11
+- Resolves: #2034328 - Bfdd crash in metallb CI
+
+* Tue Jan 04 2022 Michal Ruprich <mruprich@redhat.com> - 7.5-10
+- Resolves: #2020878 - frr ospfd show ip ospf interface does not show designated router info
+
 * Fri Dec 10 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-9
 - Resolves: #2029958 - FRR reloader generating invalid BFD configurations, exits with error