From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] frr: Update to version 8.5.2
Date: Fri, 21 Jul 2023 22:51:40 +0200
Message-ID: <20230721205144.2143152-4-adolf.belka@ipfire.org>
In-Reply-To: <20230721205144.2143152-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2573848757712894690=="
List-Id: <development.lists.ipfire.org>

--===============2573848757712894690==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- Update from version 8.0.1 to 8.5.2
- Update of rootfile
- tar.xz versions are no longer provided by the developers. They onl provide =
the tar.gz
   that is automatically created by github. This started shortly after 8.0.1 =
was released
- Changelog is too large to include here. For full details see the changelog =
details at
   https://github.com/FRRouting/frr/releases

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/packages/frr | 10 +++++++++-
 lfs/frr                       | 11 ++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/config/rootfiles/packages/frr b/config/rootfiles/packages/frr
index 3733e5a1c..092460ff6 100644
--- a/config/rootfiles/packages/frr
+++ b/config/rootfiles/packages/frr
@@ -4,6 +4,7 @@ usr/bin/vtysh
 #usr/include/frr/agg_table.h
 #usr/include/frr/assert.h
 #usr/include/frr/atomlist.h
+#usr/include/frr/base64.h
 #usr/include/frr/bfd.h
 #usr/include/frr/bfdd
 #usr/include/frr/bfdd/bfddp_packet.h
@@ -14,6 +15,7 @@ usr/bin/vtysh
 #usr/include/frr/command_graph.h
 #usr/include/frr/command_match.h
 #usr/include/frr/compiler.h
+#usr/include/frr/cspf.h
 #usr/include/frr/csv.h
 #usr/include/frr/db.h
 #usr/include/frr/debug.h
@@ -94,6 +96,7 @@ usr/bin/vtysh
 #usr/include/frr/queue.h
 #usr/include/frr/resolver.h
 #usr/include/frr/ringbuf.h
+#usr/include/frr/route_opaque.h
 #usr/include/frr/route_types.h
 #usr/include/frr/routemap.h
 #usr/include/frr/routing_nb.h
@@ -112,6 +115,7 @@ usr/bin/vtysh
 #usr/include/frr/stream.h
 #usr/include/frr/systemd.h
 #usr/include/frr/table.h
+#usr/include/frr/tc.h
 #usr/include/frr/termtable.h
 #usr/include/frr/thread.h
 #usr/include/frr/trace.h
@@ -133,6 +137,8 @@ usr/bin/vtysh
 #usr/include/frr/zclient.h
 #usr/include/frr/zebra.h
 #usr/include/frr/zlog.h
+#usr/include/frr/zlog_5424.h
+#usr/include/frr/zlog_live.h
 #usr/include/frr/zlog_targets.h
 #usr/lib/frr
 #usr/lib/frr/modules
@@ -157,18 +163,19 @@ usr/sbin/fabricd
 usr/sbin/frr
 usr/sbin/frr-reload
 usr/sbin/frr-reload.py
+usr/sbin/frr_babeltrace.py
 usr/sbin/frrcommon.sh
 usr/sbin/frrinit.sh
 usr/sbin/generate_support_bundle.py
 usr/sbin/ospfd
 usr/sbin/pathd
+usr/sbin/pim6d
 usr/sbin/ssd
 usr/sbin/staticd
 usr/sbin/vrrpd
 usr/sbin/watchfrr
 usr/sbin/watchfrr.sh
 usr/sbin/zebra
-#usr/share/yang
 #usr/share/yang/frr-bgp-bmp.yang
 #usr/share/yang/frr-bgp-common-multiprotocol.yang
 #usr/share/yang/frr-bgp-common-structure.yang
@@ -187,6 +194,7 @@ usr/sbin/zebra
 #usr/share/yang/frr-nexthop.yang
 #usr/share/yang/frr-ospf-route-map.yang
 #usr/share/yang/frr-ospf6-route-map.yang
+#usr/share/yang/frr-ospfd.yang
 #usr/share/yang/frr-pathd.yang
 #usr/share/yang/frr-route-map.yang
 #usr/share/yang/frr-route-types.yang
diff --git a/lfs/frr b/lfs/frr
index e1e33fc94..e61df8421 100644
--- a/lfs/frr
+++ b/lfs/frr
@@ -26,15 +26,15 @@ include Config
=20
 SUMMARY    =3D FRRouting Routing daemon
=20
-VER        =3D 8.0.1
+VER        =3D 8.5.2
=20
-THISAPP    =3D frr-$(VER)
-DL_FILE    =3D $(THISAPP).tar.xz
+THISAPP    =3D frr-frr-$(VER)
+DL_FILE    =3D $(THISAPP).tar.gz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D frr
-PAK_VER    =3D 5
+PAK_VER    =3D 6
=20
 DEPS       =3D elfutils
=20
@@ -50,7 +50,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D 1473ce1282f572522fe88397bbe078dd8224e6a35d87f09c89a023=
1620e8a740d223a2ed94809ed23545dd77c330429311d99c172a1bd75d9f08888ca9a401ad
+$(DL_FILE)_BLAKE2 =3D 2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b=
56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404
=20
 install : $(TARGET)
=20
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
+	cd $(DIR_APP) && ./bootstrap.sh
 	cd $(DIR_APP) && ./configure \
 		--prefix=3D/usr \
 		--sysconfdir=3D/etc/frr \
--=20
2.41.0


--===============2573848757712894690==--