4 files changed, 14 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 6c318a3..1032eef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
 /frr-10.2.tar.gz
 /frr-10.2.1.tar.gz
 /frr-10.3.tar.gz
+/frr-10.3.1.tar.gz
+/frr-10.4.0.tar.gz
+/frr-10.4.1.tar.gz
+/frr-10.5.0.tar.gz
diff --git a/frr.spec b/frr.spec
index c8554e6..ba08340 100644
--- a/frr.spec
+++ b/frr.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:           frr
-Version:        10.3
+Version:        10.5.0
 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
@@ -110,8 +110,8 @@ cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} selinux
 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 \
@@ -128,7 +128,6 @@ autoreconf -ivf
     --enable-user=frr \
     --enable-group=frr \
     --enable-vty-group=frrvty \
-    --enable-rtadv \
     --enable-static=no \
     --enable-rpki \
     --with-moduledir=%{_libdir}/frr/modules \
@@ -186,6 +185,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 #Upstream does not maintain a stable API, these headers from -devel subpackage are no longer needed
 rm %{buildroot}%{_libdir}/frr/*.so
+rm -r %{buildroot}%{_libdir}/frr/pkgconfig/
 rm -r %{buildroot}%{_includedir}/frr/
 
 %pre
@@ -224,8 +224,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
diff --git a/frr.te b/frr.te
index 8d39d90..e6820cc 100644
--- a/frr.te
+++ b/frr.te
@@ -98,12 +98,15 @@ 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_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)
 
diff --git a/sources b/sources
index 66a18d7..4038ca2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abd22784c4eabcb192913e78f33270aa  frr-10.3.tar.gz
+111e3f95419b2244f9922647805dc426  frr-10.5.0.tar.gz