diff --git a/.gitignore b/.gitignore index 33ef4d8..3ac093c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /frr-8.5.tar.gz /frr-8.5.1.tar.gz /frr-8.5.2.tar.gz +/frr-9.0.1.tar.gz diff --git a/0000-remove-babeld-and-ldpd.patch b/0000-remove-babeld-and-ldpd.patch index 4fac02b..b355ce6 100644 --- a/0000-remove-babeld-and-ldpd.patch +++ b/0000-remove-babeld-and-ldpd.patch @@ -16,9 +16,9 @@ index 5be3264..33abc1d 100644 snapcraft/helpers \ snapcraft/snap \ - babeld/Makefile \ + mgmtd/Makefile \ bgpd/Makefile \ bgpd/rfp-example/librfp/Makefile \ - bgpd/rfp-example/rfptest/Makefile \ @@ -193,7 +190,6 @@ EXTRA_DIST += \ fpm/Makefile \ grpc/Makefile \ diff --git a/0002-enable-openssl.patch b/0002-enable-openssl.patch index fa30a88..5101f06 100644 --- a/0002-enable-openssl.patch +++ b/0002-enable-openssl.patch @@ -8,8 +8,8 @@ index 0b7af18..0533e24 100644 lib/log_vty.c \ - lib/md5.c \ lib/memory.c \ - lib/mlag.c \ - lib/module.c \ + lib/mgmt_be_client.c \ + lib/mgmt_fe_client.c \ @@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \ lib/routemap_northbound.c \ lib/sbuf.c \ @@ -24,8 +24,8 @@ index 0b7af18..0533e24 100644 lib/log_vty.h \ - lib/md5.h \ lib/memory.h \ - lib/module.h \ - lib/monotime.h \ + lib/mgmt.pb-c.h \ + lib/mgmt_be_client.h \ @@ -191,7 +190,6 @@ pkginclude_HEADERS += \ lib/route_opaque.h \ lib/sbuf.h \ diff --git a/0005-remove-grpc-test.patch b/0005-remove-grpc-test.patch index c669b74..a22d9d6 100644 --- a/0005-remove-grpc-test.patch +++ b/0005-remove-grpc-test.patch @@ -3,8 +3,8 @@ index 7b5eaa4..5c82f69 100644 --- a/tests/lib/subdir.am +++ b/tests/lib/subdir.am @@ -18,18 +18,6 @@ tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c - EXTRA_DIST += tests/lib/test_frrscript.py - + test -e tests/lib/script1.lua || \ + $(INSTALL_SCRIPT) $< tests/lib/script1.lua -############################################################################## -GRPC_TESTS_LDADD = staticd/libstatic.a grpc/libfrrgrpc_pb.la -lgrpc++ -lprotobuf $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm diff --git a/frr.spec b/frr.spec index 66b49e2..e3082d2 100644 --- a/frr.spec +++ b/frr.spec @@ -8,8 +8,8 @@ %bcond selinux 1 Name: frr -Version: 8.5.2 -Release: 4%{?dist} +Version: 9.0.1 +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 @@ -59,6 +59,7 @@ BuildRequires: readline-devel BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros BuildRequires: texinfo +BuildRequires: protobuf-c-devel Requires: ncurses Requires: net-snmp @@ -274,6 +275,9 @@ rm tests/lib/*grpc* %endif %changelog +* Mon Oct 16 2023 Michal Ruprich - 9.0.1-1 +- New version 9.0.1 + * Fri Sep 01 2023 Michal Ruprich - 8.5.2-4 - Adding a couple of SELinux rules, includes fix for rhbz#2149299 diff --git a/sources b/sources index 7bb9433..f3b1758 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (frr-8.5.2.tar.gz) = a5eadd8c88966b58ebc0e7b92311bda16b391abe727861eed772ded678f5a84d84421fbfd4b23c4a2b18ab3d2dcd5b2c9099491dab6958b63c39a9c67c4508d2 +SHA512 (frr-9.0.1.tar.gz) = 30352e1a420e1bb1304f5b136a52f71dcfac972399d73356f273292767c5d5f4488f37e7601ff21126053cea65718b9be40e29cec4758eae0f12f6d4892bb826 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d