svn commit: r549638 - in head/net/frr7: . files
Olivier Cochard
olivier at FreeBSD.org
Tue Sep 22 21:32:51 UTC 2020
Author: olivier
Date: Tue Sep 22 21:32:50 2020
New Revision: 549638
URL: https://svnweb.freebsd.org/changeset/ports/549638
Log:
Fixing bug in frr-reload and while here fix a typo in the package name suffix too.
Submitted by: Ben Hughes <bmhughes at bmhughes.co.uk>
Reported by: garga
Added:
head/net/frr7/files/patch-tools_frr-reload.py (contents, props changed)
head/net/frr7/files/patch-vtysh_vtysh.c (contents, props changed)
Modified:
head/net/frr7/Makefile
head/net/frr7/files/patch-Makefile.am
Modified: head/net/frr7/Makefile
==============================================================================
--- head/net/frr7/Makefile Tue Sep 22 21:31:06 2020 (r549637)
+++ head/net/frr7/Makefile Tue Sep 22 21:32:50 2020 (r549638)
@@ -3,10 +3,10 @@
PORTNAME= frr
PORTVERSION= 7.4
DISTVERSIONPREFIX= frr-
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
.if defined(PYTHONTOOLS)
-PKGNAMESUFFIX= 7-pythontool
+PKGNAMESUFFIX= 7-pythontools
.else
PKGNAMESUFFIX= 7
.endif
@@ -24,8 +24,10 @@ RUN_DEPENDS= frr-reload:net/frr7
USES= python:run shebangfix
post-patch:
- @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/tools/frr-reload.py
- @${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' ${WRKSRC}/tools/frr-reload.py
+ @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \
+ -e 's|/usr/bin|${PREFIX}/bin|g' \
+ -e 's|/usr/local/bin/tail|${TAIL}|g' \
+ ${WRKSRC}/tools/frr-reload.py
do-install:
${MKDIR} ${STAGEDIR}/${PREFIX}/lib/frr
@@ -123,9 +125,10 @@ USE_RC_SUBR= frr watchfrr
SHEBANG_FILES= yang/embedmodel.py
post-patch:
- @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/tools/frr-reload
- @${REINPLACE_CMD} -e 's|/usr/lib/|${PREFIX}/lib/|g' ${WRKSRC}/tools/frr-reload
- @${REINPLACE_CMD} -e 's|frr-pythontools|frr7-pythontools|g' ${WRKSRC}/tools/frr-reload
+ @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \
+ -e 's|/usr/lib/|${PREFIX}/lib/|g' \
+ -e 's|frr-pythontools|frr7-pythontools|g' \
+ ${WRKSRC}/tools/frr-reload
post-install:
${MKDIR} ${STAGEDIR}/var/run/frr
Modified: head/net/frr7/files/patch-Makefile.am
==============================================================================
--- head/net/frr7/files/patch-Makefile.am Tue Sep 22 21:31:06 2020 (r549637)
+++ head/net/frr7/files/patch-Makefile.am Tue Sep 22 21:32:50 2020 (r549638)
@@ -1,6 +1,6 @@
---- Makefile.am.orig 2019-08-02 12:14:29 UTC
+--- Makefile.am.orig 2020-06-30 11:08:57 UTC
+++ Makefile.am
-@@ -122,7 +122,6 @@ include watchfrr/subdir.am
+@@ -134,7 +134,6 @@ include watchfrr/subdir.am
include qpb/subdir.am
include fpm/subdir.am
include grpc/subdir.am
Added: head/net/frr7/files/patch-tools_frr-reload.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/frr7/files/patch-tools_frr-reload.py Tue Sep 22 21:32:50 2020 (r549638)
@@ -0,0 +1,20 @@
+From 1c23a0aaa1c5d20af50af75b070e93e1eff21222 Mon Sep 17 00:00:00 2001
+From: Paul Manley <paul.manley at 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 at 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 = []
+
Added: head/net/frr7/files/patch-vtysh_vtysh.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/frr7/files/patch-vtysh_vtysh.c Tue Sep 22 21:32:50 2020 (r549638)
@@ -0,0 +1,22 @@
+From b727c12aabf1afc2b6e33f8590c9786e349e4fcb Mon Sep 17 00:00:00 2001
+From: Paul Manley <paul.manley at 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 at 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");
+ }
More information about the svn-ports-head
mailing list