diff options
| -rw-r--r-- | 0005-remove-grpc-test.patch | 27 | ||||
| -rw-r--r-- | frr.spec | 42 |
2 files changed, 62 insertions, 7 deletions
diff --git a/0005-remove-grpc-test.patch b/0005-remove-grpc-test.patch new file mode 100644 index 0000000..148c1ea --- /dev/null +++ b/0005-remove-grpc-test.patch @@ -0,0 +1,27 @@ +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 + +-############################################################################## +-GRPC_TESTS_LDADD = mgmtd/libmgmt_be_nb.la staticd/libstatic.a grpc/libfrrgrpc_pb.la $(GRPC_LIBS) $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm +- +-if GRPC +-check_PROGRAMS += tests/lib/test_grpc +-endif +-tests_lib_test_grpc_CXXFLAGS = $(WERROR) $(TESTS_CXXFLAGS) +-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 +- +- + ############################################################################## + if ZEROMQ + check_PROGRAMS += tests/lib/test_zmq @@ -4,9 +4,14 @@ %global selinuxtype targeted %define _legacy_common_support 1 +%if 0%{?fedora} +%bcond grpc %{undefined rhel} +%bcond selinux 1 +%endif + Name: frr Version: 10.2.1 -Release: 1%{?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 @@ -18,6 +23,8 @@ Source3: frr.fc Source4: frr.te Source5: frr.if +Patch0005: 0005-remove-grpc-test.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: bison >= 2.7 @@ -34,6 +41,7 @@ BuildRequires: grpc-plugins BuildRequires: json-c-devel BuildRequires: libcap-devel BuildRequires: libtool +BuildRequires: libxcrypt-devel BuildRequires: libyang-devel >= 2.1.128 BuildRequires: make BuildRequires: ncurses @@ -41,6 +49,7 @@ 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 @@ -101,14 +110,16 @@ 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" 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 \ @@ -118,8 +129,6 @@ autoreconf -ivf --enable-group=frr \ --enable-vty-group=frrvty \ --enable-rtadv \ - --disable-exampledir \ - --enable-systemd=yes \ --enable-static=no \ --enable-rpki \ --with-moduledir=%{_libdir}/frr/modules \ @@ -142,8 +151,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}%{_unitdir} + %{buildroot}%{_localstatedir}/log/frr %{buildroot}%{_localstatedir}/lib/frr \ + %{buildroot}%{_infodir} %{buildroot}%{_unitdir} mkdir -p -m 0755 %{buildroot}%{_libdir}/frr mkdir -p %{buildroot}%{_tmpfilesdir} @@ -236,6 +245,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* @@ -268,6 +278,24 @@ rm tests/lib/*grpc* %endif %changelog +* 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 |