View | Details | Raw Unified | Return to bug 282958
Collapse All | Expand All

(-)b/net/frr10/Makefile (-2 / +1 lines)
Lines 1-7 Link Here
1
PORTNAME=	frr
1
PORTNAME=	frr
2
DISTVERSIONPREFIX=	frr-
2
DISTVERSIONPREFIX=	frr-
3
DISTVERSION=	10.1.1
3
DISTVERSION=	10.2
4
PORTREVISION=	1
5
CATEGORIES=	net
4
CATEGORIES=	net
6
.if defined(PYTHONTOOLS)
5
.if defined(PYTHONTOOLS)
7
PKGNAMESUFFIX=	10-pythontools
6
PKGNAMESUFFIX=	10-pythontools
(-)b/net/frr10/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1727640851
1
TIMESTAMP = 1732513048
2
SHA256 (FRRouting-frr-frr-10.1.1_GH0.tar.gz) = 76004c312de3348b6164f6ae15db4c0cf0f504945f8c69aed871c0b4dcedfa29
2
SHA256 (FRRouting-frr-frr-10.2_GH0.tar.gz) = f9212701a8bba9ce32b4f2d361149db7778bb7bdc053bfb27415ec1948d83a47
3
SIZE (FRRouting-frr-frr-10.1.1_GH0.tar.gz) = 11044980
3
SIZE (FRRouting-frr-frr-10.2_GH0.tar.gz) = 11173035
(-)a/net/frr10/files/patch-lib_event.c (-14 lines)
Removed Link Here
1
--- lib/event.c.orig	2024-09-12 07:46:05 UTC
2
+++ lib/event.c
3
@@ -571,8 +571,9 @@ struct event_loop *event_master_create(const char *nam
4
 	}
5
 
6
 	if (rv->fd_limit > STUPIDLY_LARGE_FD_SIZE) {
7
-		zlog_warn("FD Limit set: %u is stupidly large.  Is this what you intended?  Consider using --limit-fds also limiting size to %u",
8
-			  rv->fd_limit, STUPIDLY_LARGE_FD_SIZE);
9
+		if (frr_is_daemon())
10
+			zlog_warn("FD Limit set: %u is stupidly large.  Is this what you intended?  Consider using --limit-fds also limiting size to %u",
11
+				  rv->fd_limit, STUPIDLY_LARGE_FD_SIZE);
12
 
13
 		rv->fd_limit = STUPIDLY_LARGE_FD_SIZE;
14
 	}
(-)a/net/frr10/files/patch-lib_libfrr.c (-14 lines)
Removed Link Here
1
--- lib/libfrr.c.orig	2024-09-12 07:46:05 UTC
2
+++ lib/libfrr.c
3
@@ -1463,3 +1463,11 @@ const char *frr_vers2str(uint32_t version, char *buf, 
4
 
5
 	return buf;
6
 }
7
+
8
+bool frr_is_daemon(void)
9
+{
10
+	if (di)
11
+		return true;
12
+
13
+	return false;
14
+}
(-)a/net/frr10/files/patch-lib_libfrr.h (-11 lines)
Removed Link Here
1
--- lib/libfrr.h.orig	2024-09-12 07:46:05 UTC
2
+++ lib/libfrr.h
3
@@ -188,7 +188,7 @@ extern bool frr_is_startup_fd(int fd);
4
 extern enum frr_cli_mode frr_get_cli_mode(void);
5
 extern uint32_t frr_get_fd_limit(void);
6
 extern bool frr_is_startup_fd(int fd);
7
-
8
+extern bool frr_is_daemon(void);
9
 /* call order of these hooks is as ordered here */
10
 DECLARE_HOOK(frr_early_init, (struct event_loop * tm), (tm));
11
 DECLARE_HOOK(frr_late_init, (struct event_loop * tm), (tm));

Return to bug 282958