package/frr: bump to version 10.5.0

Update FRR to the latest stable version (10.5.0; see [1]).

The 'lib-make-getloadavg-optional-in-late-timer-warnings' patch can be
dropped, as it has been merged upstream in FRR 10.5.

[1] https://github.com/FRRouting/frr/releases/tag/frr-10.5.0

Signed-off-by: Maxime Leroy <maxime@leroys.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Maxime Leroy
2025-12-01 15:48:18 +01:00
committed by Julien Olivain
parent 7599c95be6
commit c8845983ae
3 changed files with 2 additions and 51 deletions

View File

@@ -1,49 +0,0 @@
From d76100a2b9a2ec814ad0a1fb844a395a6dc2f6bd Mon Sep 17 00:00:00 2001
From: Maxime Leroy <maxime@leroys.fr>
Date: Mon, 11 Aug 2025 13:44:02 +0200
Subject: [PATCH] lib: make getloadavg() optional in late timer warnings
Commit ff76fb21d7b3 ("lib: improve late timer warnings") added an
unconditional getloadavg() call. Older libcs (e.g. uClibc, dietlibc)
lack this function, breaking the build. Before, no system load was
shown, so skipping it restores prior behavior.
Fixes: ff76fb21d7b3 ("lib: improve late timer warnings")
Signed-off-by: Maxime Leroy <maxime@leroys.fr>
Upstream: https://github.com/FRRouting/frr/pull/19366
---
configure.ac | 1 +
lib/event.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/configure.ac b/configure.ac
index 87eba6784a..b8ef7bb777 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1369,6 +1369,7 @@ dnl ---------------
AC_CHECK_FUNCS([ \
strlcat strlcpy \
getgrouplist \
+ getloadavg \
openat \
unlinkat \
posix_fallocate \
diff --git a/lib/event.c b/lib/event.c
index 1eb41d07ce..22876574fb 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -1924,7 +1924,11 @@ static void event_tardy_warn(struct event *thread, unsigned long since_us)
double loadavg[3];
int rv;
+#ifdef HAVE_GETLOADAVG
rv = getloadavg(loadavg, array_size(loadavg));
+#else
+ rv = -1;
+#endif
if (rv < 0)
bprintfrr(&fb, "not available");
else {
--
2.43.0

View File

@@ -1,5 +1,5 @@
# Locally calculated
sha256 8e4003eaba168626c5ea7a6735f2c85c87b04214e6f8c8f2715b21f8ae40970b frr-10.4.1.tar.gz
sha256 a84b973e713349dca09e2009f33dc499564f2e9faba01c0d3cba9204802b0cd5 frr-10.5.0.tar.gz
sha256 7bf053957d6c38e39a06a112c60ff35b228d3bd03edbe8c9a03508b051128d16 COPYING
sha256 f9e0c21faf738da586281c0beaad3cd56204c19085a10fe05e4d3d7f8b5863d2 doc/licenses/BSD-2-Clause
sha256 aca297b8fd3a43e3bb200f1e2e043c0db6c897325f5ff7f23f7530302a6bf713 doc/licenses/BSD-3-Clause

View File

@@ -4,7 +4,7 @@
#
################################################################################
FRR_VERSION = 10.4.1
FRR_VERSION = 10.5.0
FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION))
FRR_LICENSE = GPL-2.0+
FRR_LICENSE_FILES = \