From d09de17a4bfa15097d8f1fe3534904848997622a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 7 Dec 2021 12:02:56 -0500 Subject: [PATCH] import frr-8.0-5.el9 --- SOURCES/0007-ospf-opaque-lsa.patch | 28 ++++++++++++++++++++++++++++ SPECS/frr.spec | 9 ++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0007-ospf-opaque-lsa.patch diff --git a/SOURCES/0007-ospf-opaque-lsa.patch b/SOURCES/0007-ospf-opaque-lsa.patch new file mode 100644 index 0000000..96cc069 --- /dev/null +++ b/SOURCES/0007-ospf-opaque-lsa.patch @@ -0,0 +1,28 @@ +From 57e4c21583a9fa4c9d34fa8263930c3a1d5c6cd9 Mon Sep 17 00:00:00 2001 +From: Igor Ryzhov +Date: Tue, 31 Aug 2021 13:41:40 +0300 +Subject: [PATCH] ospfd: correctly cleanup spf data + +ospf_spf_cleanup frees the data so we need to reset the stale pointers. + +Fixes #9523. + +Signed-off-by: Igor Ryzhov +--- + ospfd/ospf_spf.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c +index 6a51440266e..8b4d55984c8 100644 +--- a/ospfd/ospf_spf.c ++++ b/ospfd/ospf_spf.c +@@ -1781,6 +1781,9 @@ void ospf_spf_calculate_area(struct ospf *ospf, struct ospf_area *area, + ospf->ti_lfa_protection_type); + + ospf_spf_cleanup(area->spf, area->spf_vertex_list); ++ ++ area->spf = NULL; ++ area->spf_vertex_list = NULL; + } + + void ospf_spf_calculate_areas(struct ospf *ospf, struct route_table *new_table, diff --git a/SPECS/frr.spec b/SPECS/frr.spec index 81c4c25..7ea406e 100644 --- a/SPECS/frr.spec +++ b/SPECS/frr.spec @@ -5,7 +5,7 @@ Name: frr Version: 8.0 -Release: 3%{?checkout}%{?dist} +Release: 5%{?checkout}%{?dist} Summary: Routing daemon License: GPLv2+ URL: http://www.frrouting.org @@ -59,6 +59,7 @@ Patch0005: 0005-use-python3.patch #Adding a patch from frr after rebase #We would have hit this surely later, better apply the patch now Patch0006: 0006-prefix-list-duplication.patch +Patch0007: 0007-ospf-opaque-lsa.patch %description FRRouting is free software that manages TCP/IP based routing protocols. It takes @@ -210,6 +211,12 @@ make check PYTHON=%{__python3} %{_tmpfilesdir}/%{name}.conf %changelog +* Tue Nov 16 2021 Michal Ruprich - 8.0-5 +- Resolves: #2023318 - Rebuilding for the new json-c library + +* Wed Sep 01 2021 Michal Ruprich - 8.0-4 +- Resolves: #1997603 - ospfd not running with ospf opaque-lsa option used + * Mon Aug 16 2021 Michal Ruprich - 8.0-3 - Related: #1990858 - Fixing prefix-list duplication check