v10.3

Resolves: #2311120 - AVCs for using a netlink socket in FRR

.gitignore

@@ -22,6 +22,3 @@
 /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

0002-enable-openssl.patch

@@ -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/mgmt_defines.h \
 @@ -191,7 +190,6 @@ pkginclude_HEADERS += \
  	lib/route_opaque.h \
  	lib/sbuf.h \

0006-autorp-segfault.patch

@@ -0,0 +1,41 @@
+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__);
+ 

frr.spec

@@ -10,8 +10,8 @@
 %bcond selinux 1
 
 Name:           frr
-Version:        10.4.0
-Release:        2%{?dist}
+Version:        10.3
+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,11 +28,7 @@ Patch0002:      0002-enable-openssl.patch
 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
+Patch0006:      0006-autorp-segfault.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -50,15 +46,13 @@ BuildRequires:  grpc-plugins
 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
@@ -73,6 +67,7 @@ BuildRequires:  protobuf-c-devel
 Requires:       ncurses
 Requires:       net-snmp
 Requires(post): hostname
+%{?sysusers_requires_compat}
 Requires(post): systemd
 Requires(postun): systemd
 Requires(preun): systemd
@@ -117,14 +112,11 @@ 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 \
     --sbindir=%{frr_libdir} \
-    --sysconfdir=%{_sysconfdir} \
+    --sysconfdir=%{_sysconfdir}/frr \
     --libdir=%{_libdir}/frr \
     --libexecdir=%{_libexecdir}/frr \
     --localstatedir=/var \
@@ -137,6 +129,8 @@ autoreconf -ivf
     --enable-group=frr \
     --enable-vty-group=frrvty \
     --enable-rtadv \
+    --disable-exampledir \
+    --enable-systemd=yes \
     --enable-static=no \
     --disable-ldpd \
     --disable-babeld \
@@ -145,7 +139,6 @@ autoreconf -ivf
     --with-crypto=openssl \
     --with-vici-socket=/run/strongswan/charon.vici \
     --enable-fpm \
-    --enable-pcre2posix \
     %{?with_grpc:--enable-grpc}
 
 %make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
@@ -161,8 +154,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}
@@ -198,6 +191,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 +227,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 +248,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*
@@ -286,43 +280,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
 

frr.te

@@ -98,7 +98,6 @@ 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)

sources

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