v.ims.1 - Bump version

nhrp: configure strongswan vici path
New version 8.4.2
2023-01-25 18:37:31 +01:00 · 2023-01-25 18:37:31 +01:00 · 2023-01-12 16:29:19 +01:00 · 2022-11-25 18:07:53 +01:00 · 2022-11-10 10:31:46 +01:00 · 2022-09-22 10:10:15 +02:00
6 changed files with 21 additions and 141 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +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-8.5.3.tar.gz
--- a/frr.fc
+++ b/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)

@@ -21,8 +21,6 @@
 /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)
-/var/lock/subsys/vrrpd      --  gen_context(system_u:object_r:frr_lock_t,s0)
-/var/lock/subsys/pathd      --  gen_context(system_u:object_r:frr_lock_t,s0)

 /var/run/frr(/.*)?              gen_context(system_u:object_r:frr_var_run_t,s0)

--- a/frr.if
+++ b/frr.if
@@ -160,56 +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',`
-	interface(`sysnet_watch_ifconfig_run',`
-		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',`
-	interface(`sysnet_read_ifconfig_run',`
-		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)
-	')
-')
-
--- a/frr.spec
+++ b/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:        8.5.3
+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
@@ -38,10 +36,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
@@ -82,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
@@ -106,8 +101,6 @@ 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
 autoreconf -ivf
@@ -136,7 +129,7 @@ autoreconf -ivf
    --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}

@@ -177,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

@@ -277,49 +270,6 @@ rm tests/lib/*grpc*
 %endif

 %changelog
-* Tue Oct 10 2023 Michal Ruprich <mruprich@redhat.com> - 8.5.3-1
- New version 8.5.3
-
-* 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

@@ -330,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
@@ -347,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

--- a/frr.te
+++ b/frr.te
@@ -31,9 +31,9 @@ files_pid_file(frr_var_run_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: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 };
@@ -70,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)

@@ -84,8 +83,8 @@ 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_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)
@@ -98,10 +97,6 @@ domain_use_interactive_fds(frr_t)
 fs_read_nsfs_files(frr_t)

 sysnet_exec_ifconfig(frr_t)
-sysnet_read_ifconfig_run(frr_t)
-sysnet_watch_ifconfig_run(frr_t)
-
-ipsec_domtrans_mgmt(frr_t)

 userdom_read_admin_home_files(frr_t)

@@ -121,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")
 ')
--- a/2
+++ b/2
@@ -1,2 +1,2 @@
-SHA512 (frr-8.5.3.tar.gz) = 8d965670c03b4a40d880b72788b4940b8ac25953f0157419d9548672957554cfbd631707a9d6bf75cd33540c1b5af03687b2fe5f9c1df5736a52fc6524be9560
+SHA512 (frr-8.4.2.tar.gz) = 1079bf3f597cc21ccbc37c5617cfb95f6e066de2a726a9b8ffb5825f92af3049d0e19ef4e9944a9e11dabc4309c56f0ab22e4c9188f5008ebcea47e0428f3ff0
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d
Author	SHA1	Message	Date
Zoran Peričić	9f47d698f5	v.ims.1 - Bump version	2023-01-25 18:37:31 +01:00
Zoran Peričić	cb7be7535f	nhrp: configure strongswan vici path	2023-01-25 18:37:31 +01:00
Michal Ruprich	12cd4431e4	New version 8.4.2	2023-01-12 16:29:19 +01:00
Michal Ruprich	858f96ce3e	New version 8.4.1 Fix for rhbz #2140705	2022-11-25 18:07:53 +01:00
Michal Ruprich	519e1a5f6a	New version 8.4	2022-11-10 10:31:46 +01:00
Michal Ruprich	964a13758e	Rebuilding because of weird abseil-cpp version mismatch in the compose (rhbz #2128691 )	2022-09-22 10:10:15 +02:00
Michal Ruprich	a5ca1b7fce	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	2022-09-16 16:02:34 +02:00
Michal Ruprich	8c46bbbf5c	Adding a couple of rules to tackle AVCs	2022-09-09 19:07:50 +02:00
Michal Ruprich	61a4e5aa67	Resolves: #2124254 - frr can no longer update routes	2022-09-09 16:11:03 +02:00
Michal Ruprich	2462abb0da	Resolves: #2124253 - SELinux is preventing zebra from setattr access on the directory frr Better handling FRR files during upgrade	2022-09-07 11:48:06 +02:00
Michal Ruprich	c4595285be	Forgot to add a patch	2022-09-06 13:31:47 +02:00
Michal Ruprich	879b7a1f73	New version 8.3.1	2022-09-06 13:26:06 +02:00