Custom nhrp patches

.gitignore

@@ -17,5 +17,5 @@
 /frr-8.5.tar.gz
 /frr-8.5.1.tar.gz
 /frr-8.5.2.tar.gz
-/frr-9.0.1.tar.gz
+/frr-8.5.3.tar.gz
-/frr-9.1.tar.gz
+/frr-8.5.4.tar.gz

0000-remove-babeld-and-ldpd.patch

@@ -16,9 +16,9 @@ index 5be3264..33abc1d 100644
  	snapcraft/helpers \
  	snapcraft/snap \
 -	babeld/Makefile \
- 	mgmtd/Makefile \
  	bgpd/Makefile \
  	bgpd/rfp-example/librfp/Makefile \
+ 	bgpd/rfp-example/rfptest/Makefile \
 @@ -193,7 +190,6 @@ EXTRA_DIST += \
  	fpm/Makefile \
  	grpc/Makefile \

0002-enable-openssl.patch

@@ -8,8 +8,8 @@ index 0b7af18..0533e24 100644
  	lib/log_vty.c \
 -	lib/md5.c \
  	lib/memory.c \
- 	lib/mgmt_be_client.c \
+ 	lib/mlag.c \
- 	lib/mgmt_fe_client.c \
+ 	lib/module.c \
 @@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \
  	lib/routemap_northbound.c \
  	lib/sbuf.c \
@@ -24,8 +24,8 @@ index 0b7af18..0533e24 100644
  	lib/log_vty.h \
 -	lib/md5.h \
  	lib/memory.h \
- 	lib/mgmt.pb-c.h \
+ 	lib/module.h \
- 	lib/mgmt_be_client.h \
+ 	lib/monotime.h \
 @@ -191,7 +190,6 @@ pkginclude_HEADERS += \
  	lib/route_opaque.h \
  	lib/sbuf.h \

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,
- 		vl_config.keychain = argv[idx+1]->arg;
+ 
- 	} else if (argv_find(argv, argc, "message-digest", &idx)) {
+ 	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;
- 		UNSET_IF_PARAM(params, keychain_name);
+ 		return CMD_SUCCESS;
 @@ -6971,6 +6990,11 @@ DEFUN (ip_ospf_message_digest_key,
         "The OSPF password (key)\n"
         "Address of interface\n")

0005-remove-grpc-test.patch

@@ -3,8 +3,8 @@ index 7b5eaa4..5c82f69 100644
 --- a/tests/lib/subdir.am
 +++ b/tests/lib/subdir.am
 @@ -18,18 +18,6 @@ tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c
- 	test -e tests/lib/script1.lua || \
+ EXTRA_DIST += tests/lib/test_frrscript.py
- 	$(INSTALL_SCRIPT) $< tests/lib/script1.lua
+ 
  
 -##############################################################################
 -GRPC_TESTS_LDADD = staticd/libstatic.a grpc/libfrrgrpc_pb.la -lgrpc++ -lprotobuf $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm

0010-nhrpd-zebra-Read-GRE-addresses-only-if-sent.patch

@@ -0,0 +1,49 @@
+From 114bd532ac0c3b6d819f516eb41021eb250b65bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= <zpericic@netst.org>
+Date: Wed, 15 Sep 2021 19:44:56 +0200
+Subject: [PATCH 10/11] nhrpd, zebra: Read GRE addresses only if sent
+
+GRE addresses are not send if interface is missing in kernel. We
+should first check if they have been sent.
+---
+ nhrpd/nhrp_route.c | 7 ++++---
+ zebra/zapi_msg.c   | 2 --
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c
+index 698c6d0cdf..2e7923bf33 100644
+--- a/nhrpd/nhrp_route.c
++++ b/nhrpd/nhrp_route.c
+@@ -493,12 +493,13 @@ int nhrp_gre_update(ZAPI_CALLBACK_ARGS)
+ 	STREAM_GETL(s, gre_info.okey);
+ 	STREAM_GETL(s, gre_info.ifindex_link);
+ 	STREAM_GETL(s, gre_info.vrfid_link);
+-	STREAM_GETL(s, gre_info.vtep_ip.s_addr);
+-	STREAM_GETL(s, gre_info.vtep_ip_remote.s_addr);
+ 	if (gre_info.ifindex == IFINDEX_INTERNAL)
+ 		val = NULL;
+-	else
++	else {
+ 		val = hash_lookup(nhrp_gre_list, &gre_info);
++		STREAM_GETL(s, gre_info.vtep_ip.s_addr);
++		STREAM_GETL(s, gre_info.vtep_ip_remote.s_addr);
++	}
+ 	if (val) {
+ 		if (gre_info.vtep_ip.s_addr != val->vtep_ip.s_addr ||
+ 		    gre_info.vrfid_link != val->vrfid_link ||
+diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
+index 68bb9783f8..72d06d71ea 100644
+--- a/zebra/zapi_msg.c
++++ b/zebra/zapi_msg.c
+@@ -3618,8 +3618,6 @@ static inline void zebra_gre_get(ZAPI_HANDLER_ARGS)
+ 		stream_putl(s, 0);
+ 		stream_putl(s, IFINDEX_INTERNAL);
+ 		stream_putl(s, VRF_UNKNOWN);
+-		stream_putl(s, 0);
+-		stream_putl(s, 0);
+ 	}
+ 	/* Write packet size. */
+ 	stream_putw_at(s, 0, stream_get_endp(s));
+-- 
+2.41.0
+

0011-nhrp-Peer-should-not-be-connected-if-interface-is-ac.patch

@@ -0,0 +1,92 @@
+From f9876d6106263632287fcef2912ba4223b145672 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= <zpericic@netst.org>
+Date: Mon, 20 Sep 2021 23:51:06 +0200
+Subject: [PATCH 11/11] nhrp: Peer should not be connected if interface is
+ active
+
+---
+ nhrpd/nhrp_interface.c |  1 +
+ nhrpd/nhrp_nhs.c       | 21 +++++++++++++++++++--
+ nhrpd/nhrp_peer.c      |  2 ++
+ nhrpd/nhrpd.h          |  1 +
+ 4 files changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c
+index 4ac30a7d75..6a8b6e6997 100644
+--- a/nhrpd/nhrp_interface.c
++++ b/nhrpd/nhrp_interface.c
+@@ -461,6 +461,7 @@ int nhrp_ifp_up(struct interface *ifp)
+ {
+ 	debugf(NHRP_DEBUG_IF, "if-up: %s", ifp->name);
+ 	nhrp_interface_update_nbma(ifp, NULL);
++	nhrp_nhs_interface_add(ifp);
+ 
+ 	return 0;
+ }
+diff --git a/nhrpd/nhrp_nhs.c b/nhrpd/nhrp_nhs.c
+index 03b4b533bb..bd05813d28 100644
+--- a/nhrpd/nhrp_nhs.c
++++ b/nhrpd/nhrp_nhs.c
+@@ -351,8 +351,9 @@ int nhrp_nhs_add(struct interface *ifp, afi_t afi, union sockunion *proto_addr,
+ 		.reglist_head = INIT_DLIST(nhs->reglist_head),
+ 	};
+ 	nhrp_nhslist_add_tail(&nifp->afi[afi].nhslist_head, nhs);
+-	thread_add_timer_msec(master, nhrp_nhs_resolve, nhs, 1000,
+-			      &nhs->t_resolve);
++	if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE))
++		thread_add_timer_msec(master, nhrp_nhs_resolve, nhs, 1000,
++				      &nhs->t_resolve);
+ 
+ 	return NHRP_OK;
+ }
+@@ -394,6 +395,22 @@ int nhrp_nhs_free(struct nhrp_interface *nifp, afi_t afi, struct nhrp_nhs *nhs)
+ 	return 0;
+ }
+ 
++void nhrp_nhs_interface_add(struct interface *ifp)
++{
++	struct nhrp_interface *nifp = ifp->info;
++	struct nhrp_nhs *nhs;
++	afi_t afi;
++
++	for (afi = 0; afi < AFI_MAX; afi++) {
++		debugf(NHRP_DEBUG_COMMON, "Adding nhs entries (%zu)",
++		       nhrp_nhslist_count(&nifp->afi[afi].nhslist_head));
++		frr_each (nhrp_nhslist, &nifp->afi[afi].nhslist_head, nhs) {
++			thread_add_timer_msec(master, nhrp_nhs_resolve, nhs, 1000,
++					      &nhs->t_resolve);
++		}
++	}
++}
++
+ void nhrp_nhs_interface_del(struct interface *ifp)
+ {
+ 	struct nhrp_interface *nifp = ifp->info;
+diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c
+index e7f2eaf5a7..9e76d16db3 100644
+--- a/nhrpd/nhrp_peer.c
++++ b/nhrpd/nhrp_peer.c
+@@ -309,6 +309,8 @@ int nhrp_peer_check(struct nhrp_peer *p, int establish)
+ 	struct interface *ifp = p->ifp;
+ 	struct nhrp_interface *nifp = ifp->info;
+ 
++	if (!CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE))
++		return 0;
+ 	if (p->online)
+ 		return 1;
+ 	if (!establish)
+diff --git a/nhrpd/nhrpd.h b/nhrpd/nhrpd.h
+index 753c6e9b22..4850c12b49 100644
+--- a/nhrpd/nhrpd.h
++++ b/nhrpd/nhrpd.h
+@@ -400,6 +400,7 @@ void nhrp_nhs_foreach(struct interface *ifp, afi_t afi,
+ 		      void (*cb)(struct nhrp_nhs *, struct nhrp_registration *,
+ 				 void *),
+ 		      void *ctx);
++void nhrp_nhs_interface_add(struct interface *ifp);
+ void nhrp_nhs_interface_del(struct interface *ifp);
+ 
+ int nhrp_multicast_add(struct interface *ifp, afi_t afi,
+-- 
+2.41.0
+

frr.fc

@@ -7,23 +7,23 @@
 /var/log/frr(/.*)?              gen_context(system_u:object_r:frr_log_t,s0)
 /var/tmp/frr(/.*)?              gen_context(system_u:object_r:frr_tmp_t,s0)
 
-/run/lock/subsys/bfdd       --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/bfdd       --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/bgpd       --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/bgpd       --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/eigrpd     --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/eigrpd     --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/fabricd    --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/fabricd    --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/isisd      --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/isisd      --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/nhrpd      --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/nhrpd      --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/ospf6d     --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/ospf6d     --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/ospfd      --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/ospfd      --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/pbrd       --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/pbrd       --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/pimd       --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/pimd       --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/ripd       --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/ripd       --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/ripngd     --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/ripngd     --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/staticd    --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/staticd    --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/zebra      --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/zebra      --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/vrrpd      --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/vrrpd      --  gen_context(system_u:object_r:frr_lock_t,s0)
-/run/lock/subsys/pathd      --  gen_context(system_u:object_r:frr_lock_t,s0)
+/var/lock/subsys/pathd      --  gen_context(system_u:object_r:frr_lock_t,s0)
 
-/run/frr(/.*)?              gen_context(system_u:object_r:frr_var_run_t,s0)
+/var/run/frr(/.*)?              gen_context(system_u:object_r:frr_var_run_t,s0)
 
 /usr/bin/vtysh              --  gen_context(system_u:object_r:frr_exec_t,s0)

frr.if

@@ -181,8 +181,8 @@ interface(`frr_admin',`
 ##	</summary>
 ## </param>
 #
-ifndef(`sysnet_watch_ifconfig_run_dirs',`
+ifndef(`sysnet_watch_ifconfig_run',`
-	interface(`sysnet_watch_ifconfig_run_dirs',`
+	interface(`sysnet_watch_ifconfig_run',`
 		gen_require(`
 			type ifconfig_var_run_t;
 		')
@@ -201,8 +201,8 @@ ifndef(`sysnet_watch_ifconfig_run_dirs',`
 ##	</summary>
 ## </param>
 #
-ifndef(`sysnet_read_ifconfig_run_files',`
+ifndef(`sysnet_read_ifconfig_run',`
-	interface(`sysnet_read_ifconfig_run_files',`
+	interface(`sysnet_read_ifconfig_run',`
 		gen_require(`
 			type ifconfig_var_run_t;
 		')
@@ -212,3 +212,4 @@ ifndef(`sysnet_read_ifconfig_run_files',`
 		read_lnk_files_pattern($1, ifconfig_var_run_t, ifconfig_var_run_t)
 	')
 ')
+

frr.spec

@@ -1,4 +1,4 @@
-%global dist .ims.1%{?dist}
+%global dist .ims.2%{?dist}
 
 %global frr_libdir %{_libexecdir}/frr
 
@@ -10,8 +10,8 @@
 %bcond selinux 1
 
 Name:           frr
-Version:        9.1
+Version:        8.5.4
-Release:        3%{?dist}
+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
@@ -28,7 +28,8 @@ Patch0002:      0002-enable-openssl.patch
 Patch0003:      0003-disable-eigrp-crypto.patch
 Patch0004:      0004-fips-mode.patch
 Patch0005:      0005-remove-grpc-test.patch
-
+Patch0010:      0010-nhrpd-zebra-Read-GRE-addresses-only-if-sent.patch
+Patch0011:      0011-nhrp-Peer-should-not-be-connected-if-interface-is-ac.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison >= 2.7
@@ -61,7 +62,6 @@ BuildRequires:  readline-devel
 BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  texinfo
-BuildRequires:  protobuf-c-devel
 
 Requires:       ncurses
 Requires:       net-snmp
@@ -278,23 +278,11 @@ rm tests/lib/*grpc*
 %endif
 
 %changelog
-* Wed Apr 10 2024 Michal Ruprich <mruprich@redhat.com> - 9.1-3
+* Wed Jan 03 2024 Michal Ruprich <mruprich@redhat.com> - 8.5.4-1
-- Resolves: #2273524 - frr fails to start: SELinux is preventing watchfrr from create access on the sock_file
+- New version 8.5.4
 
-* Sun Feb 04 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 9.1-2
+* Tue Oct 10 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.3-1
-- Rebuilt for abseil-cpp-20240116.0
+- New version 8.5.3
-
-* 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
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Oct 16 2023 Michal Ruprich <mruprich@redhat.com> - 9.0.1-1
-- New version 9.0.1
 
 * Fri Sep 01 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.2-4
 - Adding a couple of SELinux rules, includes fix for rhbz#2149299

frr.te

@@ -98,8 +98,8 @@ domain_use_interactive_fds(frr_t)
 fs_read_nsfs_files(frr_t)
 
 sysnet_exec_ifconfig(frr_t)
-sysnet_read_ifconfig_run_files(frr_t)
+sysnet_read_ifconfig_run(frr_t)
-sysnet_watch_ifconfig_run_dirs(frr_t)
+sysnet_watch_ifconfig_run(frr_t)
 
 ipsec_domtrans_mgmt(frr_t)
 

sources

@@ -1,2 +1,2 @@
-SHA512 (frr-9.1.tar.gz) = 5e77de9d26275ac8babd3bd467fe05c7fb6fa50c80fe61e13057784945372debe24f44557d9d52e76e2e785919cdfb4d5a80e7b2a06558f2a52745d0e0b92766
+SHA512 (frr-8.5.4.tar.gz) = f234fe73a019db2188e56988dc5cb3807c83d16c6f8723c68cb8f6154e8e63140f3cf8c3adec64a7661dd988089a8253fc3f910b31a1e6505ea1a6fec3df2e14
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d