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

updated frr7

Browse Source
This commit is contained in:
Oleg Borodin
2022-02-21 02:06:37 +02:00
parent 75202d7e6d
commit 9d861b4437
10 changed files with 202 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/frr7/Makefile
View File

@@ -4,13 +4,13 @@
PORTNAME= frr
CATEGORIES= net
PORTVERSION= 7.4
PORTVERSION= 7.5.1
DISTVERSIONPREFIX= frr-
USE_GITHUB= yes
GH_ACCOUNT= FRRouting
PKGNAMESUFFIX= ${PORTVERSION:R}
PKGNAMESUFFIX= ${PORTVERSION:R:R}
MAINTAINER= onborodin@gmail.com
COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 route software

6
net/frr7/distinfo
View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1602063858
SHA256 (FRRouting-frr-frr-7.4_GH0.tar.gz) = 3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a
SIZE (FRRouting-frr-frr-7.4_GH0.tar.gz) = 6074854
TIMESTAMP = 1645400947
SHA256 (FRRouting-frr-frr-7.5.1_GH0.tar.gz) = 030d4e66f577726dfea13bd3a9c669fd41d8fd89b25953a36b5b0966d406ff28
SIZE (FRRouting-frr-frr-7.5.1_GH0.tar.gz) = 6746148

11
net/frr7/files/_patch-x-configure
View File

@@ -1,11 +0,0 @@
--- ./configure.orig 2019-06-18 08:10:14.000000000 +0200
+++ ./configure 2019-09-27 21:00:58.976939000 +0200
@@ -19879,7 +19879,7 @@
if test "${with_vtysh_pager+set}" = set; then :
withval=$with_vtysh_pager; VTYSH_PAGER=$withval
else
- VTYSH_PAGER="more"
+ VTYSH_PAGER="cat"
fi
# Check whether --enable-vtysh was given.

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

@@ -1,16 +0,0 @@
--- 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
View File

@@ -1,20 +0,0 @@
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
View File

@@ -1,22 +0,0 @@
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");
}

15
net/frr7/files/patch-x-watchfrr-watchfrr.c
View File

@@ -1,15 +0,0 @@
--- ./watchfrr/watchfrr.c.orig 2019-06-18 08:10:14.000000000 +0200
+++ ./watchfrr/watchfrr.c 2019-09-28 17:12:46.141755000 +0200
@@ -53,9 +53,9 @@
#define DEFAULT_MIN_RESTART 60
#define DEFAULT_MAX_RESTART 600
-#define DEFAULT_RESTART_CMD WATCHFRR_SH_PATH " restart %s"
-#define DEFAULT_START_CMD WATCHFRR_SH_PATH " start %s"
-#define DEFAULT_STOP_CMD WATCHFRR_SH_PATH " stop %s"
+#define DEFAULT_RESTART_CMD WATCHFRR_SH_PATH " %s restart"
+#define DEFAULT_START_CMD WATCHFRR_SH_PATH " %s start"
+#define DEFAULT_STOP_CMD WATCHFRR_SH_PATH " %s stop"
#define PING_TOKEN "PING"

13
net/frr7/files/patch-x-zebra-zebra_mpls.c
View File

@@ -1,13 +0,0 @@
--- ./zebra/zebra_mpls.c.orig 2019-06-18 08:10:14.000000000 +0200
+++ ./zebra/zebra_mpls.c 2019-09-28 17:17:16.282278000 +0200
@@ -3071,8 +3071,8 @@
mpls_enabled = 0;
if (mpls_kernel_init() < 0) {
- flog_warn(EC_ZEBRA_MPLS_SUPPORT_DISABLED,
- "Disabling MPLS support (no kernel support)");
+// flog_warn(EC_ZEBRA_MPLS_SUPPORT_DISABLED,
+// "Disabling MPLS support (no kernel support)");
return;
}

68
net/frr7/files/patch-yang_frr-zebra.yang.patch Normal file
View File

@@ -0,0 +1,68 @@
From 7573cb86a259d3c9ef6eae9dd5d529f8080922cd Mon Sep 17 00:00:00 2001
From: Igor Ryzhov <iryzhov@nfware.com>
Date: Thu, 22 Apr 2021 12:48:19 +0300
Subject: [PATCH] yang: fix zebra module
Fixes: #8521
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---
yang/frr-zebra.yang | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git yang/frr-zebra.yang yang/frr-zebra.yang
index 2efc45c1464..6b4be659152 100644
--- yang/frr-zebra.yang
+++ yang/frr-zebra.yang
@@ -2184,8 +2184,8 @@ module frr-zebra {
+ "/frr-route-map:match-condition"
+ "/frr-route-map:condition-value" {
case ipv4-prefix-length {
- when "./condition = 'ipv4-prefix-length' or
- ./condition = 'ipv4-next-hop-prefix-length'";
+ when "./frr-route-map:condition = 'ipv4-prefix-length' or
+ ./frr-route-map:condition = 'ipv4-next-hop-prefix-length'";
leaf ipv4-prefix-length {
type uint8 {
range "0..32";
@@ -2193,7 +2193,7 @@ module frr-zebra {
}
}
case ipv6-prefix-length {
- when "./condition = 'ipv6-prefix-length'";
+ when "./frr-route-map:condition = 'ipv6-prefix-length'";
leaf ipv6-prefix-length {
type uint8 {
range "0..128";
@@ -2201,13 +2201,13 @@ module frr-zebra {
}
}
case source-protocol {
- when "./condition = 'source-protocol'";
+ when "./frr-route-map:condition = 'source-protocol'";
leaf source-protocol {
type frr-route-types:frr-route-types;
}
}
case source-instance {
- when "./condition = 'source-instance'";
+ when "./frr-route-map:condition = 'source-instance'";
leaf source-instance {
type uint8 {
range "0..255";
@@ -2222,14 +2222,14 @@ module frr-zebra {
+ "/frr-route-map:set-action"
+ "/frr-route-map:action-value" {
case source-v4 {
- when "./action = 'source'";
+ when "./frr-route-map:action = 'source'";
leaf source-v4 {
description "IPv4 address";
type inet:ipv4-address;
}
}
case source-v6 {
- when "./action = 'source'";
+ when "./frr-route-map:action = 'source'";
leaf source-v6 {
description "IPv6 address";
type inet:ipv6-address;

133
net/frr7/pkg-plist
View File

@@ -1,10 +1,136 @@
bin/vtysh
include/frr/agg_table.h
include/frr/atomlist.h
include/frr/bfd.h
include/frr/bitfield.h
include/frr/buffer.h
include/frr/checksum.h
include/frr/command_graph.h
include/frr/command_match.h
include/frr/command.h
include/frr/compiler.h
include/frr/csv.h
include/frr/db.h
include/frr/debug.h
include/frr/defaults.h
include/frr/distribute.h
include/frr/eigrpd/eigrp_dump.h
include/frr/eigrpd/eigrp_topology.h
include/frr/eigrpd/eigrpd.h
include/frr/ferr.h
include/frr/filter.h
include/frr/freebsd-queue.h
include/frr/frr_pthread.h
include/frr/frratomic.h
include/frr/frrcu.h
include/frr/frrlua.h
include/frr/frrstr.h
include/frr/getopt.h
include/frr/graph.h
include/frr/hash.h
include/frr/hook.h
include/frr/iana_afi.h
include/frr/id_alloc.h
include/frr/if_rmap.h
include/frr/if.h
include/frr/imsg.h
include/frr/ipaddr.h
include/frr/jhash.h
include/frr/json.h
include/frr/keychain.h
include/frr/lib_errors.h
include/frr/lib_vty.h
include/frr/libfrr.h
include/frr/libospf.h
include/frr/linklist.h
include/frr/log_vty.h
include/frr/log.h
include/frr/md5.h
include/frr/memory.h
include/frr/mlag.h
include/frr/module.h
include/frr/monotime.h
include/frr/mpls.h
include/frr/network.h
include/frr/nexthop_group_private.h
include/frr/nexthop_group.h
include/frr/nexthop.h
include/frr/northbound_cli.h
include/frr/northbound_db.h
include/frr/northbound.h
include/frr/ns.h
include/frr/openbsd-queue.h
include/frr/openbsd-tree.h
include/frr/ospfd/ospf_api.h
include/frr/ospfd/ospf_asbr.h
include/frr/ospfd/ospf_dump_api.h
include/frr/ospfd/ospf_dump.h
include/frr/ospfd/ospf_ism.h
include/frr/ospfd/ospf_lsa.h
include/frr/ospfd/ospf_lsdb.h
include/frr/ospfd/ospf_nsm.h
include/frr/ospfd/ospf_opaque.h
include/frr/ospfd/ospfd.h
include/frr/pbr.h
include/frr/plist.h
include/frr/prefix.h
include/frr/printfrr.h
include/frr/privs.h
include/frr/ptm_lib.h
include/frr/pullwr.h
include/frr/pw.h
include/frr/qobj.h
include/frr/queue.h
include/frr/resolver.h
include/frr/ringbuf.h
include/frr/route_types.h
include/frr/routemap.h
include/frr/routing_nb.h
include/frr/sbuf.h
include/frr/seqlock.h
include/frr/sha256.h
include/frr/sigevent.h
include/frr/skiplist.h
include/frr/smux.h
include/frr/sockopt.h
include/frr/sockunion.h
include/frr/spf_backoff.h
include/frr/srcdest_table.h
include/frr/srte.h
include/frr/srv6.h
include/frr/stream.h
include/frr/systemd.h
include/frr/table.h
include/frr/termtable.h
include/frr/thread.h
include/frr/typerb.h
include/frr/typesafe.h
include/frr/vector.h
include/frr/version.h
include/frr/vlan.h
include/frr/vrf_int.h
include/frr/vrf.h
include/frr/vty.h
include/frr/vxlan.h
include/frr/wheel.h
include/frr/workqueue.h
include/frr/yang_translator.h
include/frr/yang_wrappers.h
include/frr/yang.h
include/frr/zassert.h
include/frr/zclient.h
include/frr/zebra.h
include/frr/zlog_targets.h
include/frr/zlog.h
lib/frr/modules/bgpd_bmp.so
lib/frr/modules/bgpd_rpki.so
lib/frr/modules/zebra_fpm.so
lib/libfrr.a
lib/libfrr.so
lib/libfrr.so.0
lib/libfrrcares.a
lib/libfrrcares.so
lib/libfrrcares.so.0
sbin/babeld
sbin/bfdd
sbin/bgpd
@@ -39,13 +165,10 @@ share/examples/frr/zebra.conf.sample
share/yang/frr-bfdd.yang
share/yang/frr-eigrpd.yang
share/yang/frr-filter.yang
share/yang/frr-igmp.yang
share/yang/frr-interface.yang
share/yang/frr-isisd.yang
share/yang/frr-module-translator.yang
share/yang/frr-nexthop.yang
share/yang/frr-pim-rp.yang
share/yang/frr-pim.yang
share/yang/frr-ripd.yang
share/yang/frr-ripngd.yang
share/yang/frr-route-map.yang
@@ -57,8 +180,10 @@ share/yang/frr-vrf.yang
share/yang/frr-zebra.yang
share/yang/ietf-interfaces.yang
share/yang/ietf-routing-types.yang
@dir include/frr/eigrpd
@dir include/frr/ospfd
@dir include/frr
@dir lib/frr/modules
@dir lib/frr
@dir share/examples/frr
@dir share/examples
@dir share/yang