Index: head/net/frr/Makefile =================================================================== --- head/net/frr/Makefile (revision 467383) +++ head/net/frr/Makefile (revision 467384) @@ -1,86 +1,87 @@ # $FreeBSD$ PORTNAME= frr PORTVERSION= 4.0 +PORTREVISION= 1 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 MAINTAINER= olivier@FreeBSD.org COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk \ python:lang/python LIB_DEPENDS= libjson-c.so:devel/json-c CONFLICTS= openbgpd openospfd zebra quagga-esr quagga GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= autoreconf bison gmake pkgconfig libtool makeinfo readline USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= FRRouting INFO= frr OPTIONS_DEFINE= FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MULTIPATH TCMALLOC RPKI OPTIONS_DEFAULT= VTYSH RPKI OPTIONS_SUB= yes # SNMP option build failed # checksum.c:79:21: warning: implicit declaration of function 'typeof' is # invalid in C99 [-Wimplicit-function-declaration] # IRDP option needs something freebsd does not seem to have: # configure: error: 'IRDP requires in_pktinfo at the moment!' FPM_DESC= Enable Forwarding Plane Manager support LDPD_DESC= Build ldpd MULTIPATH_DESC= Enable multipath function PAM_DESC= Use libpam for PAM support in vtysh RPKI_DESC= Add BGP RPKI (RFC 6810) support SHELLACCESS_DESC= Allow users to access shell/telnet/ssh SNMP_DESC= SNMP support TCMALLOC_DESC= Use tcmalloc TCPSOCKETS_DESC= Use TCP/IP sockets for protocol daemons VTYSH_DESC= Build integrated vty shell USERS= frr GROUPS= frr frrvty CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip # PIM compile but didn't work on FreeBSD CONFIGURE_ARGS= --enable-user=frr \ --enable-group=frr \ --enable-vty-group=frrvty \ --sysconfdir=${ETCDIR} \ --localstatedir=/var/run/frr \ --disable-nhrpd \ --disable-pimd SHELLACCESS_CONFIGURE_ENABLE= shell-access FPM_CONFIGURE_ENABLE= fpm PAM_CONFIGURE_WITH= libpam LDPD_CONFIGURE_ENABLE= ldpd MULTIPATH_CONFIGURE_ON= --enable-multipath=64 RPKI_CONFIGURE_ENABLE= rpki RPKI_LIB_DEPENDS= librtr.so:net-mgmt/rtrlib \ libssh.so:security/libssh TCMALLOC_CONFIGURE_ENABLE= tcmalloc TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools SNMP_CONFIGURE_ENABLE= snmp SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra VTYSH_CONFIGURE_ENABLE= vtysh USE_RC_SUBR= frr watchfrr post-install: ${MKDIR} ${STAGEDIR}/var/run/frr .include Index: head/net/frr/files/patch-lib_vty.h =================================================================== --- head/net/frr/files/patch-lib_vty.h (nonexistent) +++ head/net/frr/files/patch-lib_vty.h (revision 467384) @@ -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 + Property changes on: head/net/frr/files/patch-lib_vty.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/frr/files/watchfrr.in =================================================================== --- head/net/frr/files/watchfrr.in (revision 467383) +++ head/net/frr/files/watchfrr.in (revision 467384) @@ -1,30 +1,33 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: watchfrr # REQUIRE: NETWORKING frr # KEYWORD: nojailvtnet shutdown # Add the following line to /etc/rc.conf to enable watchfrr: # watchfrr_enable="YES" # # 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 name=watchfrr rcvar=${name}_enable 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"