Compare commits
12 Commits
frr-10.4.1
...
9f47d698f5
| Author | SHA1 | Date | |
|---|---|---|---|
|
9f47d698f5 | ||
| cb7be7535f | |||
|
12cd4431e4 | ||
|
|
858f96ce3e | ||
|
|
519e1a5f6a | ||
|
|
964a13758e | ||
|
|
a5ca1b7fce | ||
|
|
8c46bbbf5c | ||
|
|
61a4e5aa67 | ||
|
|
2462abb0da | ||
|
|
c4595285be | ||
|
|
879b7a1f73 |
11
.gitignore
vendored
11
.gitignore
vendored
@@ -14,14 +14,3 @@
|
||||
/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
|
||||
/frr-10.2.1.tar.gz
|
||||
/frr-10.3.tar.gz
|
||||
/frr-10.4.0.tar.gz
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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_be_client.h \
|
||||
lib/mgmt_defines.h \
|
||||
lib/module.h \
|
||||
lib/monotime.h \
|
||||
@@ -191,7 +190,6 @@ pkginclude_HEADERS += \
|
||||
lib/route_opaque.h \
|
||||
lib/sbuf.h \
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
@@ -145,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"
|
||||
|
||||
@@ -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
|
||||
-
|
||||
-
|
||||
##############################################################################
|
||||
|
||||
35
frr.fc
35
frr.fc
@@ -1,4 +1,4 @@
|
||||
/usr/libexec/frr/(.*)? gen_context(system_u:object_r:frr_exec_t,s0)
|
||||
/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)
|
||||
|
||||
@@ -6,25 +6,22 @@
|
||||
|
||||
/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)
|
||||
/var/lock/subsys/bfdd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/bgpd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/eigrpd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/fabricd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/isisd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/nhrpd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/ospf6d -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/ospfd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/pbrd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/pimd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/ripd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/ripngd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||
/var/lock/subsys/staticd -- 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/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)
|
||||
|
||||
52
frr.if
52
frr.if
@@ -160,55 +160,3 @@ interface(`frr_admin',`
|
||||
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)
|
||||
')
|
||||
')
|
||||
|
||||
204
frr.spec
204
frr.spec
@@ -5,15 +5,13 @@
|
||||
%global _hardened_build 1
|
||||
%global selinuxtype targeted
|
||||
%define _legacy_common_support 1
|
||||
|
||||
%bcond grpc %{undefined rhel}
|
||||
%bcond selinux 1
|
||||
%bcond_without selinux
|
||||
|
||||
Name: frr
|
||||
Version: 10.4.1
|
||||
Version: 8.4.2
|
||||
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
|
||||
@@ -29,11 +27,6 @@ Patch0003: 0003-disable-eigrp-crypto.patch
|
||||
Patch0004: 0004-fips-mode.patch
|
||||
Patch0005: 0005-remove-grpc-test.patch
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||
%if %{undefined fc40} && %{undefined fc41}
|
||||
ExcludeArch: %{ix86}
|
||||
%endif
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison >= 2.7
|
||||
@@ -43,22 +36,18 @@ 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
|
||||
BuildRequires: libxcrypt-devel
|
||||
BuildRequires: libyang-devel >= 2.1.128
|
||||
BuildRequires: libyang-devel >= 2.0.0
|
||||
BuildRequires: make
|
||||
BuildRequires: ncurses
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: net-snmp-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: patch
|
||||
BuildRequires: pcre2-devel
|
||||
BuildRequires: perl-XML-LibXML
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: python3-devel
|
||||
@@ -68,11 +57,11 @@ BuildRequires: readline-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: protobuf-c-devel
|
||||
|
||||
Requires: ncurses
|
||||
Requires: net-snmp
|
||||
Requires(post): hostname
|
||||
%{?sysusers_requires_compat}
|
||||
Requires(post): systemd
|
||||
Requires(postun): systemd
|
||||
Requires(preun): systemd
|
||||
@@ -89,18 +78,17 @@ 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
|
||||
Summary: Selinux policy for FRR
|
||||
BuildArch: noarch
|
||||
Requires: selinux-policy-%{selinuxtype}
|
||||
Requires(post): selinux-policy-%{selinuxtype}
|
||||
BuildRequires: selinux-policy-devel
|
||||
%{?selinux_requires}
|
||||
|
||||
%description selinux
|
||||
@@ -113,21 +101,16 @@ SELinux policy modules for FRR package
|
||||
#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
|
||||
#hopefully just temporary due to rhbz#2327314
|
||||
export LDFLAGS="%{build_ldflags} -Wl,-z,noseparate-code"
|
||||
export CFLAGS="%{optflags} -DINET_NTOP_NO_OVERRIDE"
|
||||
autoreconf -ivf
|
||||
|
||||
%configure \
|
||||
--sbindir=%{frr_libdir} \
|
||||
--sysconfdir=%{_sysconfdir} \
|
||||
--sysconfdir=%{_sysconfdir}/frr \
|
||||
--libdir=%{_libdir}/frr \
|
||||
--libexecdir=%{_libexecdir}/frr \
|
||||
--localstatedir=/var \
|
||||
--localstatedir=/run/frr \
|
||||
--enable-multipath=64 \
|
||||
--enable-vtysh=yes \
|
||||
--disable-ospfclient \
|
||||
@@ -137,16 +120,16 @@ autoreconf -ivf
|
||||
--enable-group=frr \
|
||||
--enable-vty-group=frrvty \
|
||||
--enable-rtadv \
|
||||
--disable-exampledir \
|
||||
--enable-systemd=yes \
|
||||
--enable-static=no \
|
||||
--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 \
|
||||
--enable-pcre2posix \
|
||||
%{?with_grpc:--enable-grpc}
|
||||
--enable-grpc
|
||||
|
||||
%make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
|
||||
|
||||
@@ -161,8 +144,8 @@ bzip2 -9 selinux/%{name}.pp
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/{frr,rc.d/init.d,sysconfig,logrotate.d,pam.d,default} \
|
||||
%{buildroot}%{_localstatedir}/log/frr %{buildroot}%{_localstatedir}/lib/frr \
|
||||
%{buildroot}%{_infodir} %{buildroot}%{_unitdir}
|
||||
%{buildroot}%{_localstatedir}/log/frr %{buildroot}%{_infodir} \
|
||||
%{buildroot}%{_unitdir}
|
||||
|
||||
mkdir -p -m 0755 %{buildroot}%{_libdir}/frr
|
||||
mkdir -p %{buildroot}%{_tmpfilesdir}
|
||||
@@ -187,7 +170,7 @@ 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
|
||||
%{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
||||
install -D -m 644 selinux/%{name}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if
|
||||
%endif
|
||||
|
||||
@@ -198,6 +181,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
rm %{buildroot}%{_libdir}/frr/*.so
|
||||
rm -r %{buildroot}%{_includedir}/frr/
|
||||
|
||||
%pre
|
||||
%sysusers_create_compat %{SOURCE2}
|
||||
|
||||
%post
|
||||
%systemd_post frr.service
|
||||
@@ -232,8 +217,8 @@ fi
|
||||
%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 || :
|
||||
%{_sbindir}/restorecon -R /var/tmp/frr &> /dev/null
|
||||
%{_sbindir}/restorecon -R /var/run/frr &> /dev/null
|
||||
fi
|
||||
|
||||
%postun selinux
|
||||
@@ -253,7 +238,6 @@ rm tests/lib/*grpc*
|
||||
%license COPYING
|
||||
%doc doc/mpls
|
||||
%dir %attr(750,frr,frr) %{_sysconfdir}/frr
|
||||
%dir %attr(755,frr,frr) %{_localstatedir}/lib/frr
|
||||
%dir %attr(755,frr,frr) %{_localstatedir}/log/frr
|
||||
%dir %attr(755,frr,frr) /run/frr
|
||||
%{_infodir}/*info*
|
||||
@@ -273,8 +257,8 @@ 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
|
||||
|
||||
@@ -286,130 +270,6 @@ rm tests/lib/*grpc*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jul 29 2025 Michal Ruprich <mruprich@redhat.com> - 10.4.0-2
|
||||
- Improving the %post scriptlet in frr-selinux
|
||||
|
||||
* Mon Jul 28 2025 Michal Ruprich <mruprich@redhat.com> - 10.4.0-1
|
||||
- New version 10.4.0
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 10.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Jun 02 2025 Michal Ruprich <mruprich@redhat.com> - 10.3
|
||||
- New version 10.3
|
||||
|
||||
* Tue Feb 25 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 10.2.1-5
|
||||
- Rebuilt for abseil-cpp-20250127.0
|
||||
|
||||
* Thu Feb 13 2025 Alexey Kurov <nucleo@fedoraproject.org> - 10.2.1-4
|
||||
- Removed unrecognized options enable-systemd and disable-exampledir
|
||||
- Fixed sysconfdir option warning
|
||||
- Added option for support of PCRE2
|
||||
- Own local state file dir
|
||||
- Minimum libyang version 2.1.128
|
||||
|
||||
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 10.2.1-3
|
||||
- Drop call to %sysusers_create_compat
|
||||
|
||||
* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 10.2.1-2
|
||||
- Add explicit BR: libxcrypt-devel
|
||||
|
||||
* Thu Jan 30 2025 Michal Ruprich <mruprich@redhat.com> - 10.2.1-1
|
||||
- New version 10.2.1
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 10.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sat Jan 04 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 10.2-3
|
||||
- Drop i686 support (leaf package)
|
||||
|
||||
* 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
|
||||
|
||||
@@ -420,12 +280,15 @@ rm tests/lib/*grpc*
|
||||
* Thu Nov 10 2022 Michal Ruprich <mruprich@redhat.com> - 8.4-1
|
||||
- New version 8.4
|
||||
|
||||
* Thu Sep 22 2022 Michal Ruprich <mruprich@redhat.com> - 8.3.1-6
|
||||
- Rebuilding because of weird abseil-cpp version mismatch in the compose (rhbz #2128691)
|
||||
|
||||
* 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
|
||||
- Adding a couple of rules to tackle AVCs
|
||||
|
||||
* Fri Sep 09 2022 Michal Ruprich <mruprich@redhat.com> - 8.3.1-3
|
||||
- Resolves: #2124254 - frr can no longer update routes
|
||||
@@ -437,15 +300,6 @@ rm tests/lib/*grpc*
|
||||
* 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
|
||||
|
||||
|
||||
28
frr.te
28
frr.te
@@ -27,21 +27,13 @@ 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:capability { chown dac_override dac_read_search kill net_bind_service net_raw setgid setuid net_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:packet_socket { create setopt };
|
||||
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 };
|
||||
@@ -57,10 +49,6 @@ 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)
|
||||
@@ -82,7 +70,6 @@ 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)
|
||||
|
||||
@@ -96,27 +83,20 @@ 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_udp_bind_generic_port(frr_t)
|
||||
corenet_tcp_bind_firepower_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)
|
||||
|
||||
@@ -136,5 +116,5 @@ optional_policy(`
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
userdom_admin_home_dir_filetrans(frr_t, frr_conf_t, file, ".history_frr")
|
||||
userdom_admin_home_dir_filetrans(frr_t, frr_conf_t, file, ".history_frr")
|
||||
')
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
---
|
||||
runpath:
|
||||
allowed_paths:
|
||||
- /usr/lib64/frr
|
||||
- /usr/lib/frr
|
||||
inspections:
|
||||
badfuncs: off
|
||||
2
sources
2
sources
@@ -1,2 +1,2 @@
|
||||
SHA512 (frr-8.4.2.tar.gz) = 1079bf3f597cc21ccbc37c5617cfb95f6e066de2a726a9b8ffb5825f92af3049d0e19ef4e9944a9e11dabc4309c56f0ab22e4c9188f5008ebcea47e0428f3ff0
|
||||
SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d
|
||||
SHA512 (frr-10.4.0.tar.gz) = 705cde41c6ce882fda5044133cf053047a6f9f9c4e7c511d965f62669ccf6776409b2dcda98d23dd297d5679b4475c3efeb50be042f059210d2ec453a7cce7bc
|
||||
|
||||
Reference in New Issue
Block a user