v.ims.1 - Bump version

After https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers,
rpm will handle account creation automatically.

.gitignore

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

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-noprefixroute-network-manager.patch

@@ -1,167 +0,0 @@
---- b/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py
-+++ a/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py
-@@ -144,23 +144,6 @@
-     assert result is None, "Kernel route is missing from zebra"
- 
- 
--def test_zebra_noprefix_connected():
--    "Test that a noprefixroute created does not create a connected route"
--
--    tgen = get_topogen()
--    if tgen.routers_have_failure():
--        pytest.skip(tgen.errors)
--
--    router = tgen.gears["r1"]
--    router.run("ip addr add 192.168.44.1/24 dev r1-eth1 noprefixroute")
--    expected = "% Network not in table"
--    test_func = partial(
--        topotest.router_output_cmp, router, "show ip route 192.168.44.0/24", expected
--    )
--    result, diff = topotest.run_and_expect(test_func, "", count=20, wait=1)
--    assert result, "Connected Route should not have been added"
--
--
- if __name__ == "__main__":
-     args = ["-s"] + sys.argv[1:]
-     sys.exit(pytest.main(args))
---- b/zebra/if_netlink.c
-+++ a/zebra/if_netlink.c
-@@ -1423,9 +1423,6 @@
- 	if (kernel_flags & IFA_F_SECONDARY)
- 		dplane_ctx_intf_set_secondary(ctx);
- 
--	if (kernel_flags & IFA_F_NOPREFIXROUTE)
--		dplane_ctx_intf_set_noprefixroute(ctx);
--
- 	/* Label */
- 	if (tb[IFA_LABEL]) {
- 		label = (char *)RTA_DATA(tb[IFA_LABEL]);
---- b/zebra/zebra_dplane.c
-+++ a/zebra/zebra_dplane.c
-@@ -230,7 +230,6 @@
- #define DPLANE_INTF_BROADCAST   (1 << 2)
- #define DPLANE_INTF_HAS_DEST    DPLANE_INTF_CONNECTED
- #define DPLANE_INTF_HAS_LABEL   (1 << 4)
--#define DPLANE_INTF_NOPREFIXROUTE (1 << 5)
- 
- 	/* Interface address/prefix */
- 	struct prefix prefix;
-@@ -2542,13 +2541,6 @@
- 	return (ctx->u.intf.flags & DPLANE_INTF_CONNECTED);
- }
- 
--bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx)
--{
--	DPLANE_CTX_VALID(ctx);
--
--	return (ctx->u.intf.flags & DPLANE_INTF_NOPREFIXROUTE);
--}
--
- bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx)
- {
- 	DPLANE_CTX_VALID(ctx);
-@@ -2577,13 +2569,6 @@
- 	ctx->u.intf.flags |= DPLANE_INTF_SECONDARY;
- }
- 
--void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx)
--{
--	DPLANE_CTX_VALID(ctx);
--
--	ctx->u.intf.flags |= DPLANE_INTF_NOPREFIXROUTE;
--}
--
- void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx)
- {
- 	DPLANE_CTX_VALID(ctx);
---- b/zebra/zebra_dplane.h
-+++ a/zebra/zebra_dplane.h
-@@ -658,8 +658,6 @@
- void dplane_ctx_intf_set_connected(struct zebra_dplane_ctx *ctx);
- bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx);
- void dplane_ctx_intf_set_secondary(struct zebra_dplane_ctx *ctx);
--bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx);
--void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx);
- bool dplane_ctx_intf_is_broadcast(const struct zebra_dplane_ctx *ctx);
- void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx);
- const struct prefix *dplane_ctx_get_intf_addr(
---- b/lib/if.h
-+++ a/lib/if.h
-@@ -434,8 +434,6 @@
- #define ZEBRA_IFA_SECONDARY    (1 << 0)
- #define ZEBRA_IFA_PEER         (1 << 1)
- #define ZEBRA_IFA_UNNUMBERED   (1 << 2)
--#define ZEBRA_IFA_NOPREFIXROUTE (1 << 3)
--
- 	/* N.B. the ZEBRA_IFA_PEER flag should be set if and only if
- 	   a peer address has been configured.  If this flag is set,
- 	   the destination field must contain the peer address.
---- b/zebra/connected.c
-+++ a/zebra/connected.c
-@@ -282,15 +282,13 @@
- 			return;
- 	}
- 
-+	rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
-+		flags, &p, NULL, &nh, 0, zvrf->table_id, metric, 0, 0, 0,
-+		false);
--	if (!CHECK_FLAG(ifc->flags, ZEBRA_IFA_NOPREFIXROUTE)) {
--		rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id,
--			ZEBRA_ROUTE_CONNECT, 0, flags, &p, NULL, &nh, 0,
--			zvrf->table_id, metric, 0, 0, 0, false);
- 
-+	rib_add(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
-+		flags, &p, NULL, &nh, 0, zvrf->table_id, metric, 0, 0, 0,
-+		false);
--		rib_add(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id,
--			ZEBRA_ROUTE_CONNECT, 0, flags, &p, NULL, &nh, 0,
--			zvrf->table_id, metric, 0, 0, 0, false);
--	}
- 
- 	if (install_local) {
- 		rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_LOCAL,
-@@ -483,15 +481,11 @@
- 	 * Same logic as for connected_up(): push the changes into the
- 	 * head.
- 	 */
-+	rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
-+		   0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false);
--	if (!CHECK_FLAG(ifc->flags, ZEBRA_IFA_NOPREFIXROUTE)) {
--		rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id,
--			   ZEBRA_ROUTE_CONNECT, 0, 0, &p, NULL, &nh, 0,
--			   zvrf->table_id, 0, 0, false);
- 
-+	rib_delete(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT,
-+		   0, 0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false);
--		rib_delete(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id,
--			   ZEBRA_ROUTE_CONNECT, 0, 0, &p, NULL, &nh, 0,
--			   zvrf->table_id, 0, 0, false);
--	}
- 
- 	if (remove_local) {
- 		rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id,
---- b/zebra/interface.c
-+++ a/zebra/interface.c
-@@ -1317,9 +1317,6 @@
- 	if (dplane_ctx_intf_is_secondary(ctx))
- 		SET_FLAG(flags, ZEBRA_IFA_SECONDARY);
- 
--	if (dplane_ctx_intf_is_noprefixroute(ctx))
--		SET_FLAG(flags, ZEBRA_IFA_NOPREFIXROUTE);
--
- 	/* Label? */
- 	if (dplane_ctx_intf_has_label(ctx))
- 		label = dplane_ctx_get_intf_label(ctx);
-@@ -2337,12 +2334,6 @@
- 	else if (CHECK_FLAG(connected->flags, ZEBRA_IFA_SECONDARY))
- 		vty_out(vty, " secondary");
- 
--	if (json)
--		json_object_boolean_add(json_addr, "noPrefixRoute",
--					CHECK_FLAG(connected->flags, ZEBRA_IFA_NOPREFIXROUTE));
--	else if (CHECK_FLAG(connected->flags, ZEBRA_IFA_NOPREFIXROUTE))
--		vty_out(vty, " noprefixroute");
--
- 	if (json)
- 		json_object_boolean_add(
- 			json_addr, "unnumbered",

frr.spec

@@ -1,3 +1,5 @@
+%global dist .ims.1%{?dist}
+
 %global frr_libdir %{_libexecdir}/frr
 
 %global _hardened_build 1
@@ -8,8 +10,8 @@
 %bcond selinux 1
 
 Name:           frr
-Version:        10.1
+Version:        10.4.0
-Release:        4%{?dist}
+Release:        2%{?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
@@ -26,7 +28,11 @@ Patch0002:      0002-enable-openssl.patch
 Patch0003:      0003-disable-eigrp-crypto.patch
 Patch0004:      0004-fips-mode.patch
 Patch0005:      0005-remove-grpc-test.patch
-Patch0006:      0006-noprefixroute-network-manager.patch
+
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+%if %{undefined fc40} && %{undefined fc41}
+ExcludeArch:       %{ix86}
+%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -44,13 +50,15 @@ BuildRequires:  grpc-plugins
 BuildRequires:  json-c-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libtool
-BuildRequires:  libyang-devel >= 2.0.0
+BuildRequires:  libxcrypt-devel
+BuildRequires:  libyang-devel >= 2.1.128
 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
@@ -65,7 +73,6 @@ BuildRequires:  protobuf-c-devel
 Requires:       ncurses
 Requires:       net-snmp
 Requires(post): hostname
-%{?sysusers_requires_compat}
 Requires(post): systemd
 Requires(postun): systemd
 Requires(preun): systemd
@@ -110,14 +117,17 @@ 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}/frr \
+    --sysconfdir=%{_sysconfdir} \
     --libdir=%{_libdir}/frr \
     --libexecdir=%{_libexecdir}/frr \
-    --localstatedir=/run/frr \
+    --localstatedir=/var \
     --enable-multipath=64 \
     --enable-vtysh=yes \
     --disable-ospfclient \
@@ -127,15 +137,15 @@ 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}
 
 %make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
@@ -151,8 +161,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}%{_infodir} \
+         %{buildroot}%{_localstatedir}/log/frr %{buildroot}%{_localstatedir}/lib/frr \
-         %{buildroot}%{_unitdir}
+         %{buildroot}%{_infodir} %{buildroot}%{_unitdir}
 
 mkdir -p -m 0755 %{buildroot}%{_libdir}/frr
 mkdir -p %{buildroot}%{_tmpfilesdir}
@@ -188,8 +198,6 @@ 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
@@ -224,8 +232,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/tmp/frr &> /dev/null || :
-    %{_sbindir}/restorecon -R /var/run/frr &> /dev/null
+    %{_sbindir}/restorecon -R /var/run/frr &> /dev/null || :
 fi
 
 %postun selinux
@@ -245,6 +253,7 @@ 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*
@@ -277,6 +286,49 @@ 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

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)
 

sources

@@ -1,2 +1,2 @@
-SHA512 (frr-10.1.tar.gz) = 7484238a502ab12f178e4a210e6e4a33d0ce53edbb49b127fdc3167e31dd61c1122c1ef2d30e4bcb83b7f520b37fb9ad73e2a6a16790b608b1adf2e23b556445
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d
+SHA512 (frr-10.4.0.tar.gz) = 705cde41c6ce882fda5044133cf053047a6f9f9c4e7c511d965f62669ccf6776409b2dcda98d23dd297d5679b4475c3efeb50be042f059210d2ec453a7cce7bc