ziggi/bsdports
1
0
Fork 0
mirror of https://github.com/beard7n/bsdports.git synced 2026-04-10 02:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

update net/frr7

Browse Source
This commit is contained in:
ziggi
2020-10-24 09:52:49 +00:00
parent cc2c8e85d1
commit f8679d1941
5 changed files with 68 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/frr7/files/patch-Makefile.am Normal file
View File

@@ -0,0 +1,10 @@
--- Makefile.am.orig 2020-06-30 11:08:57 UTC
+++ Makefile.am
@@ -134,7 +134,6 @@ include watchfrr/subdir.am
include qpb/subdir.am
include fpm/subdir.am
include grpc/subdir.am
-include tools/subdir.am
include solaris/subdir.am
include bgpd/subdir.am

16
net/frr7/files/patch-lib_zlog.c Normal file
View File

@@ -0,0 +1,16 @@
--- lib/zlog.c.orig 2020-06-30 11:08:57 UTC
+++ lib/zlog.c
@@ -246,10 +246,10 @@ void zlog_tls_buffer_init(void)
fchown(mmfd, zlog_uid, zlog_gid);
#ifdef HAVE_POSIX_FALLOCATE
- if (posix_fallocate(mmfd, 0, TLS_LOG_BUF_SIZE) < 0) {
-#else
- if (ftruncate(mmfd, TLS_LOG_BUF_SIZE) < 0) {
+ if (posix_fallocate(mmfd, 0, TLS_LOG_BUF_SIZE) != 0)
+ /* note next statement is under above if() */
#endif
+ if (ftruncate(mmfd, TLS_LOG_BUF_SIZE) < 0) {
zlog_err("failed to allocate thread log buffer \"%s\": %s",
mmpath, strerror(errno));
goto out_anon_unlink;

20
net/frr7/files/patch-tools_frr-reload.py Normal file
View File

@@ -0,0 +1,20 @@
From 1c23a0aaa1c5d20af50af75b070e93e1eff21222 Mon Sep 17 00:00:00 2001
From: Paul Manley <paul.manley@wholefoods.com>
Date: Thu, 9 Jul 2020 11:21:16 -0500
Subject: [PATCH] tools: create sub-context for bfd peers
add lines starting with 'peer' to the list of sub-contexts that are handled by frr-reload.py.
https://github.com/FRRouting/frr/issues/6511#issuecomment-655163833
Signed-off-by: Paul Manley <paul.manley@wholefoods.com>
--- tools/frr-reload.py.orig 2020-06-30 11:08:57 UTC
+++ tools/frr-reload.py
@@ -496,6 +496,7 @@ end
line.startswith("vnc defaults") or
line.startswith("vnc l2-group") or
line.startswith("vnc nve-group") or
+ line.startswith("peer") or
line.startswith("member pseudowire")):
main_ctx_key = []

22
net/frr7/files/patch-vtysh_vtysh.c Normal file
View File

@@ -0,0 +1,22 @@
From b727c12aabf1afc2b6e33f8590c9786e349e4fcb Mon Sep 17 00:00:00 2001
From: Paul Manley <paul.manley@wholefoods.com>
Date: Thu, 9 Jul 2020 11:25:34 -0500
Subject: [PATCH] vtysh: properly exit BFD_PEER_NODE when marking file
vtysh needs to be aware of how to properly exit a bfd peer when subsequent commands only succeed in a higher context.
https://github.com/FRRouting/frr/issues/6511#issuecomment-656166206
Signed-off-by: Paul Manley <paul.manley@wholefoods.com>
--- vtysh/vtysh.c.orig 2020-06-30 11:08:57 UTC
+++ vtysh/vtysh.c
@@ -809,6 +809,9 @@ int vtysh_mark_file(const char *filename)
} else if ((prev_node == KEYCHAIN_KEY_NODE)
&& (tried == 1)) {
vty_out(vty, "exit\n");
+ } else if ((prev_node == BFD_PEER_NODE)
+ && (tried == 1)) {
+ vty_out(vty, "exit\n");
} else if (tried) {
vty_out(vty, "end\n");
}

11
net/frr7/files/patch-x-Makefile.am
View File

@@ -1,11 +0,0 @@
--- ./Makefile.am.orig 2019-06-18 08:10:14.000000000 +0200
+++ ./Makefile.am 2019-09-28 17:04:41.424055000 +0200
@@ -122,7 +122,7 @@
include qpb/subdir.am
include fpm/subdir.am
include grpc/subdir.am
-include tools/subdir.am
+##include tools/subdir.am
include solaris/subdir.am
include bgpd/subdir.am