From a6947d365df92a0ff33861ac984c112fe5e19e20 Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Fri, 31 Jan 2025 09:00:29 +0100 Subject: [PATCH] New version 10.2.1 --- .gitignore | 1 + 0006-autorp-segfault.patch | 41 -------------------------------------- frr.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 0006-autorp-segfault.patch diff --git a/.gitignore b/.gitignore index 114154f..8ea72dd 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /frr-10.0.1.tar.gz /frr-10.1.tar.gz /frr-10.2.tar.gz +/frr-10.2.1.tar.gz diff --git a/0006-autorp-segfault.patch b/0006-autorp-segfault.patch deleted file mode 100644 index f2d8925..0000000 --- a/0006-autorp-segfault.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 37b88191fb4736ff0a1e565fc22003d0ab853ea2 Mon Sep 17 00:00:00 2001 -From: Donald Sharp -Date: Wed, 4 Dec 2024 10:47:33 -0500 -Subject: [PATCH] pimd: Prevent crash of pim when auto-rp's socket is not - initialized - -If the socket associated with the auto-rp fails to initialize then -the memory for the auto-rp is just dropped on the floor. Additionally -any type of attempt at using the feature will just cause pimd to crash, -when the pointer is derefed. Since it is derefed all over the place -without checking. - -Clearly if you cannot bind/use the socket let's allow continuation. - -Fixes: #17540 -Signed-off-by: Donald Sharp ---- - pimd/pim_autorp.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c -index 3fb10f4..91ed005 100644 ---- a/pimd/pim_autorp.c -+++ b/pimd/pim_autorp.c -@@ -1014,12 +1014,14 @@ void pim_autorp_init(struct pim_instance *pim) - autorp->announce_interval = DEFAULT_ANNOUNCE_INTERVAL; - autorp->announce_holdtime = DEFAULT_ANNOUNCE_HOLDTIME; - -+ pim->autorp = autorp; -+ - if (!pim_autorp_socket_enable(autorp)) { -- zlog_err("%s: AutoRP failed to initialize", __func__); -+ zlog_err("%s: AutoRP failed to initialize, feature will not work correctly", -+ __func__); - return; - } - -- pim->autorp = autorp; - if (PIM_DEBUG_AUTORP) - zlog_debug("%s: AutoRP Initialized", __func__); - diff --git a/frr.spec b/frr.spec index fb51e95..acfcf8f 100644 --- a/frr.spec +++ b/frr.spec @@ -8,8 +8,8 @@ %bcond selinux 1 Name: frr -Version: 10.2 -Release: 4%{?dist} +Version: 10.2.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 @@ -26,7 +26,6 @@ Patch0002: 0002-enable-openssl.patch Patch0003: 0003-disable-eigrp-crypto.patch Patch0004: 0004-fips-mode.patch Patch0005: 0005-remove-grpc-test.patch -Patch0006: 0006-autorp-segfault.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval %if %{undefined fc40} && %{undefined fc41} @@ -284,6 +283,9 @@ rm tests/lib/*grpc* %endif %changelog +* Thu Jan 30 2025 Michal Ruprich - 10.2.1-1 +- New version 10.2.1 + * Thu Jan 16 2025 Fedora Release Engineering - 10.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 6dc978d..f8cae9d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (frr-10.2.tar.gz) = 40a0e1f1a7f2cc137aac6e838b2f865b93fdc1cd6bd0f6c5b15b4507cbff87cb60092682e45aca68633cb053fb2ce663386edb78e5d3c5f890f4666e871ab8c5 +SHA512 (frr-10.2.1.tar.gz) = c49b0afb7b9a923b65bdcc4d4a6868b08eaecc4620d251f18648e0a5d65fb28fef4af382e4d3a74c27f090eaeab02a649672845c29524d7339c1a1a1e23e14c2 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d