cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r467384 r467574

Browse Source 
Fix watchfrr RC script and build on 10.3

PR:		227415
Reported by:	pautina@kharkiv.net

Fix plist with FPM option

Reported by:	prj@rootwyrm.com

Approved by:	ports-secteam blanket
This commit is contained in:
Olivier Cochard 2018-04-29 11:41:07 +00:00
parent d6952ec099
commit fcef5f0e19
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q2/; revision=468620
4 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/frr/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= frr
PORTVERSION= 4.0
PORTREVISION= 1
DISTVERSIONPREFIX= frr-
CATEGORIES= net ipv6

48
net/frr/files/patch-lib_vty.h Normal file
View File

@ -0,0 +1,48 @@
--- lib/vty.h.orig 2018-03-12 00:53:37 UTC
+++ lib/vty.h
@@ -189,45 +189,6 @@ struct vty_arg {
/* Integrated configuration file. */
#define INTEGRATE_DEFAULT_CONFIG "frr.conf"
-#if CONFDATE > 20180401
-CPP_NOTICE("It's probably time to remove VTY_NEWLINE compatibility foo.")
-#endif
-
-/* for compatibility */
-#define VNL "\n" CPP_WARN("VNL has been replaced with \\n.")
-#define VTYNL "\n" CPP_WARN("VTYNL has been replaced with \\n.")
-#define VTY_NEWLINE "\n" CPP_WARN("VTY_NEWLINE has been replaced with \\n.")
-#define VTY_GET_INTEGER(desc, v, str) \
- { \
- (v) = strtoul((str), NULL, 10); \
- } \
- CPP_WARN("VTY_GET_INTEGER is no longer useful, use strtoul() or DEFPY.")
-#define VTY_GET_INTEGER_RANGE(desc, v, str, min, max) \
- { \
- (v) = strtoul((str), NULL, 10); \
- } \
- CPP_WARN( \
- "VTY_GET_INTEGER_RANGE is no longer useful, use strtoul() or DEFPY.")
-#define VTY_GET_ULONG(desc, v, str) \
- { \
- (v) = strtoul((str), NULL, 10); \
- } \
- CPP_WARN("VTY_GET_ULONG is no longer useful, use strtoul() or DEFPY.")
-#define VTY_GET_ULL(desc, v, str) \
- { \
- (v) = strtoull((str), NULL, 10); \
- } \
- CPP_WARN("VTY_GET_ULL is no longer useful, use strtoull() or DEFPY.")
-#define VTY_GET_IPV4_ADDRESS(desc, v, str) \
- inet_aton((str), &(v)) CPP_WARN( \
- "VTY_GET_IPV4_ADDRESS is no longer useful, use inet_aton() or DEFPY.")
-#define VTY_GET_IPV4_PREFIX(desc, v, str) \
- str2prefix_ipv4((str), &(v)) CPP_WARN( \
- "VTY_GET_IPV4_PREFIX is no longer useful, use str2prefix_ipv4() or DEFPY.")
-#define vty_outln(vty, str, ...) \
- vty_out(vty, str "\n", ##__VA_ARGS__) CPP_WARN( \
- "vty_outln is no longer useful, use vty_out(...\\n...)")
-
/* Default time out value */
#define VTY_TIMEOUT_DEFAULT 600

5
net/frr/files/watchfrr.in
View File

@ -12,6 +12,8 @@
#
# You may also wish to use the following variables to fine-tune startup:
# watchfrr_flags
# Example of flags usage:
# watchfrr_flags=" -d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"
. /etc/rc.subr
@ -23,8 +25,9 @@ load_rc_config $name
stop_postcmd="rm -f $pidfile"
watchfrr_enable=${watchfrr_enable:-"NO"}
watchfrr_flags=${watchfrr_flags:-"-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"}
command=%%PREFIX%%/sbin/watchfrr
pidfile=%%LOCALSTATE_DIR%%/watchfrr.pid
pidfile=/var/run/frr/watchfrr.pid
run_rc_command "$1"

5
net/frr/pkg-plist
View File

@ -102,6 +102,11 @@ lib/libfrrospfapiclient.a
lib/libfrrospfapiclient.so
lib/libfrrospfapiclient.so.0
lib/libfrrospfapiclient.so.0.0.0
%%FPM%%lib/frr/modules/zebra_fpm.so
%%FPM%%lib/libfrrfpm_pb.a
%%FPM%%lib/libfrrfpm_pb.so
%%FPM%%lib/libfrrfpm_pb.so.0
%%FPM%%lib/libfrrfpm_pb.so.0.0.0
%%RPKI%%lib/frr/modules/bgpd_rpki.so
man/man1/frr.1.gz
man/man8/eigrpd.8.gz