v.ims.1 - Bump version

Resolves: #2011868 - systemctl frr reload does not stop daemons that are not enabled in /etc/frr/daemons

.gitignore

@@ -11,14 +11,3 @@
 /frr-8.2.tar.gz
 /frr-8.2.2.tar.gz
 /frr-8.3.1.tar.gz
-/frr-8.4.tar.gz
-/frr-8.4.1.tar.gz
-/frr-8.4.2.tar.gz
-/frr-8.5.tar.gz
-/frr-8.5.1.tar.gz
-/frr-8.5.2.tar.gz
-/frr-9.0.1.tar.gz
-/frr-9.1.tar.gz
-/frr-10.0.1.tar.gz
-/frr-10.1.tar.gz
-/frr-10.2.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 \
@@ -27,29 +27,3 @@ index 5be3264..33abc1d 100644
  	lib/Makefile \
  	nhrpd/Makefile \
  	ospf6d/Makefile \
-diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
-index 8aa0887..c92dcca 100644
---- a/tools/etc/frr/daemons
-+++ b/tools/etc/frr/daemons
-@@ -22,10 +22,8 @@ ripngd=no
- isisd=no
- pimd=no
- pim6d=no
--ldpd=no
- nhrpd=no
- eigrpd=no
--babeld=no
- sharpd=no
- pbrd=no
- bfdd=no
-@@ -48,10 +46,8 @@ ripngd_options=" -A ::1"
- isisd_options="  -A 127.0.0.1"
- pimd_options="   -A 127.0.0.1"
- pim6d_options="  -A ::1"
--ldpd_options="   -A 127.0.0.1"
- nhrpd_options="  -A 127.0.0.1"
- eigrpd_options=" -A 127.0.0.1"
--babeld_options=" -A 127.0.0.1"
- sharpd_options=" -A 127.0.0.1"
- pbrd_options="   -A 127.0.0.1"
- staticd_options="-A 127.0.0.1"

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/mgmt_fe_client.c \
+ 	lib/mlag.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/mgmt_be_client.h \
+ 	lib/module.h \
+ 	lib/monotime.h \
 @@ -191,7 +190,6 @@ pkginclude_HEADERS += \
  	lib/route_opaque.h \
  	lib/sbuf.h \

0004-fips-mode.patch

@@ -2,20 +2,9 @@ diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
 index 631465f..e084ff3 100644
 --- a/ospfd/ospf_vty.c
 +++ b/ospfd/ospf_vty.c
-@@ -7,6 +7,10 @@
- #include <zebra.h>
- #include <string.h>
- 
-+#ifdef CRYPTO_OPENSSL
-+#include <openssl/fips.h>
-+#endif
-+
- #include "printfrr.h"
- #include "monotime.h"
- #include "memory.h"
 @@ -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())
 +		{
@@ -52,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")
@@ -69,17 +58,6 @@ diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
 index 81b4b39..cce33d9 100644
 --- a/isisd/isis_circuit.c
 +++ b/isisd/isis_circuit.c
-@@ -13,6 +13,10 @@
- #include <netinet/if_ether.h>
- #endif
- 
-+#ifdef CRYPTO_OPENSSL
-+#include <openssl/fips.h>
-+#endif
-+
- #include "log.h"
- #include "memory.h"
- #include "vrf.h"
 @@ -1318,6 +1318,10 @@ static int isis_circuit_passwd_set(struct isis_circuit *circuit,
  		return ferr_code_bug(
  			"circuit password too long (max 254 chars)");
@@ -95,17 +73,6 @@ diff --git a/isisd/isisd.c b/isisd/isisd.c
 index 419127c..a6c36af 100644
 --- a/isisd/isisd.c
 +++ b/isisd/isisd.c
-@@ -9,6 +9,10 @@
- 
- #include <zebra.h>
- 
-+#ifdef CRYPTO_OPENSSL
-+#include <openssl/fips.h>
-+#endif
-+
- #include "frrevent.h"
- #include "vty.h"
- #include "command.h"
 @@ -1638,6 +1638,10 @@ static int isis_area_passwd_set(struct isis_area *area, int level,
  		if (len > 254)
  			return -1;
@@ -121,17 +88,6 @@ diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c
 index 5bb81ef..02a09ef 100644
 --- a/ripd/rip_cli.c
 +++ b/ripd/rip_cli.c
-@@ -7,6 +7,10 @@
- 
- #include <zebra.h>
- 
-+#ifdef CRYPTO_OPENSSL
-+#include <openssl/fips.h>
-+#endif
-+
- #include "if.h"
- #include "if_rmap.h"
- #include "vrf.h"
 @@ -796,6 +796,12 @@ DEFPY (ip_rip_authentication_mode,
  			value = "20";
  	}

0005-remove-grpc-test.patch

@@ -2,12 +2,12 @@ diff --git a/tests/lib/subdir.am b/tests/lib/subdir.am
 index 7b5eaa4..5c82f69 100644
 --- a/tests/lib/subdir.am
 +++ b/tests/lib/subdir.am
-@@ -18,22 +18,6 @@ tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c
- 	test -e tests/lib/script1.lua || \
- 	$(INSTALL_SCRIPT) $< tests/lib/script1.lua
+@@ -18,18 +18,6 @@ tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c
+ EXTRA_DIST += tests/lib/test_frrscript.py
+ 
  
 -##############################################################################
--GRPC_TESTS_LDADD = mgmtd/libmgmt_be_nb.la staticd/libstatic.a grpc/libfrrgrpc_pb.la $(GRPC_LIBS) $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm
+-GRPC_TESTS_LDADD = staticd/libstatic.a grpc/libfrrgrpc_pb.la -lgrpc++ -lprotobuf $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm
 -
 -if GRPC
 -check_PROGRAMS += tests/lib/test_grpc
@@ -16,10 +16,6 @@ index 7b5eaa4..5c82f69 100644
 -tests_lib_test_grpc_CPPFLAGS = $(TESTS_CPPFLAGS)
 -tests_lib_test_grpc_LDADD = $(GRPC_TESTS_LDADD)
 -tests_lib_test_grpc_SOURCES = tests/lib/test_grpc.cpp
--nodist_tests_lib_test_grpc_SOURCES = \
--	yang/frr-bfdd.yang.c \
--	yang/frr-staticd.yang.c \
--	# end
 -
 -
  ##############################################################################

0006-autorp-segfault.patch

@@ -1,41 +0,0 @@
-From 37b88191fb4736ff0a1e565fc22003d0ab853ea2 Mon Sep 17 00:00:00 2001
-From: Donald Sharp <sharpd@nvidia.com>
-Date: Wed, 4 Dec 2024 10:47:33 -0500
-Subject: [PATCH] pimd: Prevent crash of pim when auto-rp's socket is not
- initialized
-
-If the socket associated with the auto-rp fails to initialize then
-the memory for the auto-rp is just dropped on the floor.  Additionally
-any type of attempt at using the feature will just cause pimd to crash,
-when the pointer is derefed.  Since it is derefed all over the place
-without checking.
-
-Clearly if you cannot bind/use the socket let's allow continuation.
-
-Fixes: #17540
-Signed-off-by: Donald Sharp <sharpd@nvidia.com>
----
- pimd/pim_autorp.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c
-index 3fb10f4..91ed005 100644
---- a/pimd/pim_autorp.c
-+++ b/pimd/pim_autorp.c
-@@ -1014,12 +1014,14 @@ void pim_autorp_init(struct pim_instance *pim)
- 	autorp->announce_interval = DEFAULT_ANNOUNCE_INTERVAL;
- 	autorp->announce_holdtime = DEFAULT_ANNOUNCE_HOLDTIME;
- 
-+	pim->autorp = autorp;
-+
- 	if (!pim_autorp_socket_enable(autorp)) {
--		zlog_err("%s: AutoRP failed to initialize", __func__);
-+		zlog_err("%s: AutoRP failed to initialize, feature will not work correctly",
-+				__func__);
- 		return;
- 	}
- 
--	pim->autorp = autorp;
- 	if (PIM_DEBUG_AUTORP)
- 		zlog_debug("%s: AutoRP Initialized", __func__);
- 

0006-ospf-api.patch

@@ -0,0 +1,25 @@
+diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
+index 74a5674..aec9037 100644
+--- a/ospfd/ospf_spf.c
++++ b/ospfd/ospf_spf.c
+@@ -48,7 +48,10 @@
+ #include "ospfd/ospf_sr.h"
+ #include "ospfd/ospf_ti_lfa.h"
+ #include "ospfd/ospf_errors.h"
++
++#ifdef SUPPORT_OSPF_API
+ #include "ospfd/ospf_apiserver.h"
++#endif
+ 
+ /* Variables to ensure a SPF scheduled log message is printed only once */
+ 
+@@ -1897,7 +1900,9 @@ static void ospf_spf_calculate_schedule_worker(struct thread *thread)
+ 	/* Update all routers routing table */
+ 	ospf->oall_rtrs = ospf->all_rtrs;
+ 	ospf->all_rtrs = all_rtrs;
++#ifdef SUPPORT_OSPF_API
+ 	ospf_apiserver_notify_reachable(ospf->oall_rtrs, ospf->all_rtrs);
++#endif
+ 
+ 	/* Free old ABR/ASBR routing table */
+ 	if (ospf->old_rtrs)

frr.fc

@@ -1,30 +0,0 @@
-/usr/libexec/frr/(.*)?              gen_context(system_u:object_r:frr_exec_t,s0)
-
-/usr/lib/systemd/system/frr.*   gen_context(system_u:object_r:frr_unit_file_t,s0)
-
-/etc/frr(/.*)?                  gen_context(system_u:object_r:frr_conf_t,s0)
-
-/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)
-/var/lib/frr(/.*)?              gen_context(system_u:object_r:frr_var_lib_t,s0)
-
-/run/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)
-/run/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)
-/run/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)
-/run/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)
-/run/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)
-/run/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)
-/run/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)
-/run/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)
-
-/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

@@ -1,214 +0,0 @@
-## <summary>policy for frr</summary>
-
-########################################
-## <summary>
-##	Execute frr_exec_t in the frr domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`frr_domtrans',`
-	gen_require(`
-		type frr_t, frr_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	domtrans_pattern($1, frr_exec_t, frr_t)
-')
-
-######################################
-## <summary>
-##	Execute frr in the caller domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`frr_exec',`
-	gen_require(`
-		type frr_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	can_exec($1, frr_exec_t)
-')
-
-########################################
-## <summary>
-##	Read frr's log files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
-interface(`frr_read_log',`
-	gen_require(`
-		type frr_log_t;
-	')
-
-	read_files_pattern($1, frr_log_t, frr_log_t)
-	optional_policy(`
-		logging_search_logs($1)
-	')
-')
-
-########################################
-## <summary>
-##	Append to frr log files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`frr_append_log',`
-	gen_require(`
-		type frr_log_t;
-	')
-
-	append_files_pattern($1, frr_log_t, frr_log_t)
-	optional_policy(`
-		logging_search_logs($1)
-	')
-')
-
-########################################
-## <summary>
-##	Manage frr log files
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`frr_manage_log',`
-	gen_require(`
-		type frr_log_t;
-	')
-
-	manage_dirs_pattern($1, frr_log_t, frr_log_t)
-	manage_files_pattern($1, frr_log_t, frr_log_t)
-	manage_lnk_files_pattern($1, frr_log_t, frr_log_t)
-	optional_policy(`
-		logging_search_logs($1)
-	')
-')
-
-########################################
-## <summary>
-##	Read frr PID files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`frr_read_pid_files',`
-	gen_require(`
-		type frr_var_run_t;
-	')
-
-	files_search_pids($1)
-	read_files_pattern($1, frr_var_run_t, frr_var_run_t)
-')
-
-########################################
-## <summary>
-##	All of the rules required to administrate
-##	an frr environment
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`frr_admin',`
-	gen_require(`
-		type frr_t;
-		type frr_log_t;
-		type frr_var_run_t;
-	')
-
-	allow $1 frr_t:process { signal_perms };
-	ps_process_pattern($1, frr_t)
-
-	tunable_policy(`deny_ptrace',`',`
-		allow $1 frr_t:process ptrace;
-	')
-
-	admin_pattern($1, frr_log_t)
-
-	files_search_pids($1)
-	admin_pattern($1, frr_var_run_t)
-	optional_policy(`
-		logging_search_logs($1)
-	')
-	optional_policy(`
-		systemd_passwd_agent_exec($1)
-		systemd_read_fifo_file_passwd_run($1)
-	')
-')
-
-########################################
-#
-# Interface compatibility blocks
-#
-# The following definitions ensure compatibility with distribution policy
-# versions that do not contain given interfaces (epel, or older Fedora
-# releases).
-# Each block tests for existence of given interface and defines it if needed.
-#
-
-######################################
-## <summary>
-##	Watch ifconfig_var_run_t directories
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-ifndef(`sysnet_watch_ifconfig_run_dirs',`
-	interface(`sysnet_watch_ifconfig_run_dirs',`
-		gen_require(`
-			type ifconfig_var_run_t;
-		')
-
-		watch_dirs_pattern($1, ifconfig_var_run_t, ifconfig_var_run_t)
-	')
-')
-
-########################################
-## <summary>
-##	Read ifconfig_var_run_t files and link files
-## </summary>
-## <param name="domain">
-##	<summary>
-##      Domain allowed access.
-##	</summary>
-## </param>
-#
-ifndef(`sysnet_read_ifconfig_run_files',`
-	interface(`sysnet_read_ifconfig_run_files',`
-		gen_require(`
-			type ifconfig_var_run_t;
-		')
-
-		list_dirs_pattern($1, ifconfig_var_run_t, ifconfig_var_run_t)
-		read_files_pattern($1, ifconfig_var_run_t, ifconfig_var_run_t)
-		read_lnk_files_pattern($1, ifconfig_var_run_t, ifconfig_var_run_t)
-	')
-')

frr.spec

@@ -3,32 +3,24 @@
 %global frr_libdir %{_libexecdir}/frr
 
 %global _hardened_build 1
-%global selinuxtype targeted
 %define _legacy_common_support 1
 
-%bcond grpc %{undefined rhel}
-%bcond selinux 1
-
 Name:           frr
-Version:        10.2
-Release:        2%{?dist}
+Version:        8.3.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
+License:        GPLv2+
 URL:            http://www.frrouting.org
 Source0:        https://github.com/FRRouting/frr/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}-tmpfiles.conf
 Source2:        %{name}-sysusers.conf
-#Decentralized SELinux policy
-Source3:        frr.fc
-Source4:        frr.te
-Source5:        frr.if
 
 Patch0000:      0000-remove-babeld-and-ldpd.patch
 Patch0002:      0002-enable-openssl.patch
 Patch0003:      0003-disable-eigrp-crypto.patch
 Patch0004:      0004-fips-mode.patch
 Patch0005:      0005-remove-grpc-test.patch
-Patch0006:      0006-autorp-segfault.patch
+Patch0006:      0006-ospf-api.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -39,10 +31,8 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  git-core
 BuildRequires:  groff
-%if %{with grpc}
 BuildRequires:  grpc-devel
 BuildRequires:  grpc-plugins
-%endif
 BuildRequires:  json-c-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libtool
@@ -62,7 +52,6 @@ BuildRequires:  readline-devel
 BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  texinfo
-BuildRequires:  protobuf-c-devel
 
 Requires:       ncurses
 Requires:       net-snmp
@@ -71,11 +60,6 @@ Requires(post): hostname
 Requires(post): systemd
 Requires(postun): systemd
 Requires(preun): systemd
-
-%if 0%{?with_selinux}
-Requires: (%{name}-selinux = %{version}-%{release} if selinux-policy-%{selinuxtype})
-%endif
-
 Obsoletes:      quagga < 1.2.4-17
 Provides:       routingdaemon = %{version}-%{release}
 
@@ -84,32 +68,12 @@ FRRouting is free software that manages TCP/IP based routing protocols. It takes
 a multi-server and multi-threaded approach to resolve the current complexity
 of the Internet.
 
-FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, NHRP, PBR,
-EIGRP and BFD.
+FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, NHRP, PBR, EIGRP and BFD.
 
 FRRouting is a fork of Quagga.
 
-%if 0%{?with_selinux}
-%package selinux
-Summary:  Selinux policy for FRR
-BuildArch:  noarch
-Requires:  selinux-policy-%{selinuxtype}
-Requires(post):  selinux-policy-%{selinuxtype}
-BuildRequires:  selinux-policy-devel
-%{?selinux_requires}
-
-%description selinux
-SELinux policy modules for FRR package
-
-%endif
-
 %prep
 %autosetup -S git
-#Selinux
-mkdir selinux
-cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} selinux
-# C++14 or later needed for abseil-cpp 20230125; string_view needs C++17:
-sed -r -i 's/(AX_CXX_COMPILE_STDCXX\(\[)11(\])/\117\2/' configure.ac
 
 %build
 autoreconf -ivf
@@ -119,7 +83,7 @@ autoreconf -ivf
     --sysconfdir=%{_sysconfdir}/frr \
     --libdir=%{_libdir}/frr \
     --libexecdir=%{_libexecdir}/frr \
-    --localstatedir=/var \
+    --localstatedir=%{_localstatedir}/run/frr \
     --enable-multipath=64 \
     --enable-vtysh=yes \
     --disable-ospfclient \
@@ -135,23 +99,16 @@ autoreconf -ivf
     --disable-ldpd \
     --disable-babeld \
     --with-moduledir=%{_libdir}/frr/modules \
-    --with-yangmodelsdir=%{_datadir}/frr-yang/ \
     --with-crypto=openssl \
     --with-vici-socket=/run/strongswan/charon.vici \
     --enable-fpm \
-    %{?with_grpc:--enable-grpc}
+    --enable-grpc
 
 %make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
 
 # Build info documentation
 %make_build -C doc info
 
-#SELinux policy
-%if 0%{?with_selinux}
-make -C selinux -f %{_datadir}/selinux/devel/Makefile %{name}.pp
-bzip2 -9 selinux/%{name}.pp
-%endif
-
 %install
 mkdir -p %{buildroot}%{_sysconfdir}/{frr,rc.d/init.d,sysconfig,logrotate.d,pam.d,default} \
          %{buildroot}%{_localstatedir}/log/frr %{buildroot}%{_infodir} \
@@ -178,12 +135,6 @@ install -p -m 644 redhat/frr.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/fr
 install -p -m 644 redhat/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr
 install -d -m 775 %{buildroot}/run/frr
 
-%if 0%{?with_selinux}
-install -D -m 644 selinux/%{name}.pp.bz2 \
-  %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
-install -D -m 644 selinux/%{name}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if
-%endif
-
 # Delete libtool archives
 find %{buildroot} -type f -name "*.la" -delete -print
 
@@ -194,6 +145,7 @@ rm -r %{buildroot}%{_includedir}/frr/
 %pre
 %sysusers_create_compat %{SOURCE2}
 
+
 %post
 %systemd_post frr.service
 
@@ -217,28 +169,6 @@ fi
 %preun
 %systemd_preun frr.service
 
-#SELinux
-%if 0%{?with_selinux}
-%pre selinux
-%selinux_relabel_pre -s %{selinuxtype}
-
-%post selinux
-%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
-%selinux_relabel_post -s %{selinuxtype}
-#/var/tmp and /var/run need to be relabeled as well if FRR is running before upgrade
-if [ $1 == 2 ]; then
-    %{_sbindir}/restorecon -R /var/tmp/frr &> /dev/null
-    %{_sbindir}/restorecon -R /var/run/frr &> /dev/null
-fi
-
-%postun selinux
-if [ $1 -eq 0 ]; then
-    %selinux_modules_uninstall -s %{selinuxtype} %{name}
-    %selinux_relabel_post -s %{selinuxtype}
-fi
-
-%endif
-
 %check
 #this should be temporary, the grpc test is just badly designed
 rm tests/lib/*grpc*
@@ -251,14 +181,10 @@ rm tests/lib/*grpc*
 %dir %attr(755,frr,frr) %{_localstatedir}/log/frr
 %dir %attr(755,frr,frr) /run/frr
 %{_infodir}/*info*
-%{_mandir}/man1/frr.1*
-%{_mandir}/man1/vtysh.1*
-%{_mandir}/man8/frr-*.8*
-%{_mandir}/man8/mtracebis.8*
+%{_mandir}/man*/*
 %dir %{frr_libdir}/
 %{frr_libdir}/*
-%{_bindir}/mtracebis
-%{_bindir}/vtysh
+%{_bindir}/*
 %dir %{_libdir}/frr
 %{_libdir}/frr/*.so.*
 %dir %{_libdir}/frr/modules
@@ -267,167 +193,22 @@ rm tests/lib/*grpc*
 %config(noreplace) %attr(644,frr,frr) %{_sysconfdir}/frr/daemons
 %config(noreplace) %{_sysconfdir}/pam.d/frr
 %{_unitdir}/*.service
-%dir %{_datadir}/frr-yang
-%{_datadir}/frr-yang/*.yang
+%dir %{_datadir}/yang
+%{_datadir}/yang/*.yang
 %{_tmpfilesdir}/%{name}.conf
 %{_sysusersdir}/%{name}.conf
 
-%if 0%{?with_selinux}
-%files selinux
-%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.*
-%{_datadir}/selinux/devel/include/distributed/%{name}.if
-%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
-%endif
-
 %changelog
-* Thu Dec 05 2024 Michal Ruprich <mruprich@redhat.com> - 10.2-2
-- Resolves: rhbz#2329643 - upgrading frr to 10.2 causes pimd crashes
-
-* Fri Nov 22 2024 Michal Ruprich <mruprich@redhat.com> - 10.2-1
-- New version 10.2
-
-* Tue Sep 10 2024 Michal Ruprich <mruprich@redhat.com> - 10.1-4
-- Resolves: #2311119 - Multiple AVCs for accessing lib_t in FRR-10.1
-- Resolves: #2311120 - AVCs for using a netlink socket in FRR
-
-* Sun Aug 25 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 10.1-3
-- Rebuilt for abseil-cpp-20240722.0
-
-* Thu Aug 15 2024 Michal Ruprich <mruprich@redhat.com> - 10.1-2
-- Rebuilding for the libre soname bump
-
-* Mon Aug 12 2024 Michal Ruprich <mruprich@redhat.com> - 10.1-1
-- New version 10.1
-
-* Wed Jul 31 2024 Michal Ruprich <mruprich@redhat.com> - 10.0.1-1
-- New version 10.0.1
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Apr 17 2024 Michal Ruprich <mruprich@redhat.com> - 9.1-4
-- Moving yang modules to frr specific dir to avoid conflicts
-- Adding rpminspect.yaml
-
-* Sat Feb 24 2024 Paul Wouters <paul.wouters@aiven.io> - 9.1-3
-- Rebuild for libre2.so.11 bump
-
-* Sun Feb 04 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 9.1-2
-- Rebuilt for abseil-cpp-20240116.0
-
-* 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
-
-* Wed Aug 30 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 8.5.2-3
-- Rebuilt for abseil-cpp 20230802.0
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.5.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jun 30 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.2-1
-- New version 8.5.2
-- Fixing some rpmlint warnings
-
-* Mon Jun 26 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.1-4
-- Resolves: #2216073 - SELinux is preventing FRR-Zebra to access to network namespaces.
-
-* Mon Jun 05 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 8.5.1-3
-- Disable grpc in RHEL builds
-
-* Fri May 19 2023 Petr Pisar <ppisar@redhat.com> - 8.5.1-2
-- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)
-
-* Wed Apr 26 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.1-1
-- New version 8.5.1
-
-* Wed Apr 12 2023 Michal Ruprich <mruprich@redhat.com> - 8.5-1
-- New version 8.5
-
-* Thu Mar 23 2023 Michal Ruprich <mruprich@redhat.com> - 8.4.2-5
-- Rebuilding for new abseil-cpp version
-
-* Wed Mar 22 2023 Michal Ruprich <mruprich@redhat.com> - 8.4.2-4
-- SPDX migration
-
-* Wed Mar 08 2023 Benjamin A. Beasley <code@musicinmybrain.net> - 8.4.2-3
-- Build as C++17, required by abseil-cpp 20230125
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* 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
-
-* Thu Nov 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.4-1
-- New version 8.4
-
-* Fri Sep 16 2022 Michal Ruprich <mruprich@redhat.com> - 8.3.1-5
-- Adding SELinux rule to enable zebra to write to sysctl_net_t
-- Adding SELinux rule to enable bgpd to call name_connect to bgp_port_t
-
-* Fri Sep 09 2022 Michal Ruprich <mruprich@redhat.com> - 8.3.1-4
-- Fixing an error in post scriptlet
-
-* Fri Sep 09 2022 Michal Ruprich <mruprich@redhat.com> - 8.3.1-3
-- Resolves: #2124254 - frr can no longer update routes
-
-* Wed Sep 07 2022 Michal Ruprich <mruprich@redhat.com> - 8.3.1-2
-- Resolves: #2124253 - SELinux is preventing zebra from setattr access on the directory frr
-- Better handling FRR files during upgrade
-
 * Tue Sep 06 2022 Michal Ruprich <mruprich@redhat.com> - 8.3.1-1
 - New version 8.3.1
 
-* Mon Aug 22 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-10
-- Rebuilding for new abseil-cpp and grpc updates
-
-* Wed Aug 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-9
-- Adding vrrpd and pathd as daemons to the policy
-
-* Wed Aug 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-8
-- Finalizing SELinux policy
-
-* Tue Aug 02 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-7
-- Fixing wrong path for vtysh in frr.fc
-
-* Fri Jul 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 8.2.2-6
-- Rebuild with abseil-cpp-20211102.0-4.fc37 (RHBZ#2108658)
-
-* Wed Jul 27 2022 Michal Ruprich - 8.2.2-5
-- Packaging SELinux policy for FRR
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue May 17 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-3
-- Rebuild for grpc-1.46.1
-
 * Mon Apr 11 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-2
 - Fix for CVE-2022-16126
 
 * Tue Mar 15 2022 Michal Ruprich <mruprich@redhat.com> - 8.2.2-1
 - New version 8.2.2
 
-* Thu Mar 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.2-2
-- Rebuild for abseil-cpp 20211102.0
-
-* Wed Mar 09 2022 Michal Ruprich <mruprich@redhat.com> - 8.2-1
+* Thu Mar 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.2-1
 - New version 8.2 (rhbz#2020439)
 - Resolves: #2011868 - systemctl frr reload does not stop daemons that are not enabled in /etc/frr/daemons
 

frr.te

@@ -1,139 +0,0 @@
-policy_module(frr, 1.0.0)
-
-########################################
-#
-# Declarations
-#
-
-type frr_t;
-type frr_exec_t;
-init_daemon_domain(frr_t, frr_exec_t)
-
-type frr_log_t;
-logging_log_file(frr_log_t)
-
-type frr_tmp_t;
-files_tmp_file(frr_tmp_t)
-
-type frr_lock_t;
-files_lock_file(frr_lock_t)
-
-type frr_conf_t;
-files_config_file(frr_conf_t)
-
-type frr_unit_file_t;
-systemd_unit_file(frr_unit_file_t)
-
-type frr_var_run_t;
-files_pid_file(frr_var_run_t)
-
-type frr_var_lib_t;
-files_type(frr_var_lib_t)
-
-########################################
-#
-# frr local policy
-#
-allow frr_t self:capability { chown dac_override dac_read_search kill net_bind_service net_raw setgid setuid net_admin sys_admin };
-allow frr_t self:netlink_route_socket rw_netlink_socket_perms;
-allow frr_t self:netlink_generic_socket create;
-allow frr_t self:netlink_generic_socket setopt;
-allow frr_t self:netlink_generic_socket getopt;
-allow frr_t self:netlink_generic_socket getattr;
-allow frr_t self:netlink_generic_socket bind;
-allow frr_t self:packet_socket create_socket_perms;
-allow frr_t self:process { setcap setpgid };
-allow frr_t self:rawip_socket create_socket_perms;
-allow frr_t self:tcp_socket { connect connected_stream_socket_perms };
-allow frr_t self:udp_socket create_socket_perms;
-allow frr_t self:unix_stream_socket connectto;
-
-allow frr_t frr_conf_t:dir list_dir_perms;
-manage_files_pattern(frr_t, frr_conf_t, frr_conf_t)
-read_lnk_files_pattern(frr_t, frr_conf_t, frr_conf_t)
-
-manage_dirs_pattern(frr_t, frr_log_t, frr_log_t)
-manage_files_pattern(frr_t, frr_log_t, frr_log_t)
-manage_lnk_files_pattern(frr_t, frr_log_t, frr_log_t)
-logging_log_filetrans(frr_t, frr_log_t, { dir file lnk_file })
-
-manage_dirs_pattern(frr_t, frr_var_lib_t, frr_var_lib_t)
-manage_files_pattern(frr_t, frr_var_lib_t, frr_var_lib_t)
-files_var_lib_filetrans(frr_t, frr_var_lib_t, { dir file })
-
-allow frr_t frr_tmp_t:file map;
-manage_dirs_pattern(frr_t, frr_tmp_t, frr_tmp_t)
-manage_files_pattern(frr_t, frr_tmp_t, frr_tmp_t)
-files_tmp_filetrans(frr_t, frr_tmp_t, { file dir })
-
-manage_files_pattern(frr_t, frr_lock_t, frr_lock_t)
-manage_lnk_files_pattern(frr_t, frr_lock_t, frr_lock_t)
-files_lock_filetrans(frr_t, frr_lock_t, { file lnk_file })
-
-manage_dirs_pattern(frr_t, frr_var_run_t, frr_var_run_t)
-manage_files_pattern(frr_t, frr_var_run_t, frr_var_run_t)
-manage_lnk_files_pattern(frr_t, frr_var_run_t, frr_var_run_t)
-manage_sock_files_pattern(frr_t, frr_var_run_t, frr_var_run_t)
-files_pid_filetrans(frr_t, frr_var_run_t, { dir file lnk_file })
-
-allow frr_t frr_exec_t:dir search_dir_perms;
-can_exec(frr_t, frr_exec_t)
-
-kernel_read_network_state(frr_t)
-kernel_rw_net_sysctls(frr_t)
-kernel_read_system_state(frr_t)
-kernel_request_load_module(frr_t)
-
-auth_use_nsswitch(frr_t)
-
-corecmd_exec_bin(frr_t)
-
-corenet_tcp_bind_appswitch_emp_port(frr_t)
-corenet_udp_bind_bfd_control_port(frr_t)
-corenet_udp_bind_bfd_echo_port(frr_t)
-corenet_udp_bind_bfd_multi_port(frr_t)
-corenet_tcp_bind_bgp_port(frr_t)
-corenet_tcp_connect_bgp_port(frr_t)
-corenet_tcp_bind_cmadmin_port(frr_t)
-corenet_udp_bind_cmadmin_port(frr_t)
-corenet_tcp_bind_firepower_port(frr_t)
-corenet_tcp_bind_generic_port(frr_t)
-corenet_tcp_bind_priority_e_com_port(frr_t)
-corenet_udp_bind_router_port(frr_t)
-corenet_tcp_bind_qpasa_agent_port(frr_t)
-corenet_tcp_bind_smntubootstrap_port(frr_t)
-corenet_tcp_bind_versa_tek_port(frr_t)
-corenet_tcp_bind_zebra_port(frr_t)
-# general reserved port for pimd
-corenet_tcp_bind_reserved_port(frr_t)
-
-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_watch_ifconfig_run_dirs(frr_t)
-
-ipsec_domtrans_mgmt(frr_t)
-
-userdom_read_admin_home_files(frr_t)
-
-optional_policy(`
-	logging_send_syslog_msg(frr_t)
-')
-
-optional_policy(`
-	modutils_exec_kmod(frr_t)
-	modutils_getattr_module_deps(frr_t)
-	modutils_read_module_config(frr_t)
-	modutils_read_module_deps_files(frr_t)
-')
-
-optional_policy(`
-	networkmanager_read_state(frr_t)
-')
-
-optional_policy(`
-	userdom_admin_home_dir_filetrans(frr_t, frr_conf_t, file, ".history_frr")
-')

rpminspect.yaml

@@ -1,7 +0,0 @@
----
-runpath:
-    allowed_paths:
-        - /usr/lib64/frr
-        - /usr/lib/frr
-inspections:
-    badfuncs: off

sources

@@ -1,2 +1,2 @@
-SHA512 (frr-10.2.tar.gz) = 40a0e1f1a7f2cc137aac6e838b2f865b93fdc1cd6bd0f6c5b15b4507cbff87cb60092682e45aca68633cb053fb2ce663386edb78e5d3c5f890f4666e871ab8c5
+SHA512 (frr-8.3.1.tar.gz) = a15b53c98c9739f316663c723c35954284b63ffd49cf88e22d3ac82e66a4b63ffc5f43a8d622f531d129436464fdbfcf103b2866240762510ec490c03563a8ae
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d