Index: branches/2018Q2/net/frr/Makefile =================================================================== --- branches/2018Q2/net/frr/Makefile (revision 468619) +++ branches/2018Q2/net/frr/Makefile (revision 468620) @@ -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: branches/2018Q2/net/frr/files/patch-lib_vty.h =================================================================== --- branches/2018Q2/net/frr/files/patch-lib_vty.h (nonexistent) +++ branches/2018Q2/net/frr/files/patch-lib_vty.h (revision 468620) @@ -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: branches/2018Q2/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: branches/2018Q2/net/frr/files/watchfrr.in =================================================================== --- branches/2018Q2/net/frr/files/watchfrr.in (revision 468619) +++ branches/2018Q2/net/frr/files/watchfrr.in (revision 468620) @@ -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" Index: branches/2018Q2/net/frr/pkg-plist =================================================================== --- branches/2018Q2/net/frr/pkg-plist (revision 468619) +++ branches/2018Q2/net/frr/pkg-plist (revision 468620) @@ -1,146 +1,151 @@ bin/bgp_btoa %%VTYSH%%bin/vtysh include/frr/bfd.h include/frr/bitfield.h include/frr/buffer.h include/frr/checksum.h include/frr/command.h include/frr/command_graph.h include/frr/command_match.h include/frr/compiler.h include/frr/csv.h include/frr/distribute.h include/frr/eigrpd/eigrp_dump.h include/frr/eigrpd/eigrp_topology.h include/frr/eigrpd/eigrpd.h include/frr/event_counter.h include/frr/ferr.h include/frr/fifo.h include/frr/filter.h include/frr/freebsd-queue.h include/frr/frr_pthread.h include/frr/frratomic.h include/frr/getopt.h include/frr/graph.h include/frr/hash.h include/frr/hook.h include/frr/if.h include/frr/if_rmap.h include/frr/imsg.h include/frr/ipaddr.h include/frr/jhash.h include/frr/json.h include/frr/keychain.h include/frr/libfrr.h include/frr/libospf.h include/frr/linklist.h include/frr/log.h include/frr/md5.h include/frr/memory.h include/frr/memory_vty.h include/frr/module.h include/frr/monotime.h include/frr/mpls.h include/frr/network.h include/frr/nexthop.h include/frr/ns.h include/frr/openbsd-queue.h include/frr/openbsd-tree.h include/frr/ospfapi/ospf_apiclient.h include/frr/ospfd/ospf_api.h include/frr/ospfd/ospf_asbr.h include/frr/ospfd/ospf_dump.h include/frr/ospfd/ospf_dump_api.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/plist.h include/frr/pqueue.h include/frr/prefix.h include/frr/privs.h include/frr/ptm_lib.h include/frr/pw.h include/frr/queue.h include/frr/qobj.h include/frr/ringbuf.h include/frr/route_types.h include/frr/routemap.h include/frr/sbuf.h include/frr/sha256.h include/frr/sigevent.h include/frr/spf_backoff.h include/frr/skiplist.h include/frr/smux.h include/frr/sockopt.h include/frr/sockunion.h include/frr/srcdest_table.h include/frr/stream.h include/frr/systemd.h include/frr/table.h include/frr/termtable.h include/frr/thread.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/zassert.h include/frr/zclient.h include/frr/zebra.h lib/libfrr.a lib/libfrr.so lib/libfrr.so.0 lib/libfrr.so.0.0.0 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 man/man8/frr-args.8.gz man/man8/isisd.8.gz man/man8/watchfrr.8.gz %%VTYSH%%man/man1/vtysh.1.gz man/man8/bgpd.8.gz %%LDPD%%man/man8/ldpd.8.gz man/man8/ospf6d.8.gz man/man8/ospfclient.8.gz man/man8/ospfd.8.gz man/man8/ripd.8.gz man/man8/ripngd.8.gz man/man8/zebra.8.gz sbin/babeld sbin/bgpd %%LDPD%%sbin/ldpd sbin/eigrpd sbin/ospf6d sbin/ospfclient sbin/ospfd sbin/ripd sbin/ripngd sbin/zebra sbin/isisd sbin/rfptest sbin/watchfrr %%ETCDIR%%/babeld.conf.sample %%ETCDIR%%/bgpd.conf.sample %%ETCDIR%%/bgpd.conf.sample2 %%ETCDIR%%/bgpd.conf.vnc.sample %%ETCDIR%%/eigrpd.conf.sample %%ETCDIR%%/isisd.conf.sample %%LDPD%%%%ETCDIR%%/ldpd.conf.sample %%ETCDIR%%/ospf6d.conf.sample %%ETCDIR%%/ospfd.conf.sample %%ETCDIR%%/ripd.conf.sample %%ETCDIR%%/ripngd.conf.sample %%VTYSH%%%%ETCDIR%%/vtysh.conf.sample %%ETCDIR%%/zebra.conf.sample @dir(frr,frr,750) /var/run/frr Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 468619) +++ branches/2018Q2 (revision 468620) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r467384,467574