Date: Mon, 4 Jun 2018 05:12:03 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471530 - in head/net: . frr3 frr3/files frr4 Message-ID: <201806040512.w545C3BL067198@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Mon Jun 4 05:12:03 2018 New Revision: 471530 URL: https://svnweb.freebsd.org/changeset/ports/471530 Log: Due to stability problems with FRR 4.0, reintroduce previous FRR 3.0.3. Merge watchfrr RC script from frr4 that was improved and update frr4's conflicts port list. Sponsored by: Orange Added: head/net/frr3/ - copied from r465500, head/net/frr/ Modified: head/net/Makefile head/net/frr3/Makefile head/net/frr3/files/watchfrr.in (contents, props changed) head/net/frr4/Makefile Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Mon Jun 4 04:55:48 2018 (r471529) +++ head/net/Makefile Mon Jun 4 05:12:03 2018 (r471530) @@ -166,6 +166,7 @@ SUBDIR += freerdp1 SUBDIR += freeswitch SUBDIR += freevrrpd + SUBDIR += frr3 SUBDIR += frr4 SUBDIR += fspclient SUBDIR += fspd Modified: head/net/frr3/Makefile ============================================================================== --- head/net/frr/Makefile Sun Mar 25 07:23:23 2018 (r465500) +++ head/net/frr3/Makefile Mon Jun 4 05:12:03 2018 (r471530) @@ -4,6 +4,7 @@ PORTNAME= frr PORTVERSION= 3.0.3 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 +PKGNAMESUFFIX= 3 MAINTAINER= olivier@FreeBSD.org COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP @@ -14,9 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk LIB_DEPENDS= libjson-c.so:devel/json-c -RESTRICTED= possible GPL violation of Quagga project - -CONFLICTS= openbgpd openospfd zebra quagga-esr quagga +CONFLICTS= openbgpd openospfd zebra quagga frr4 USE_GITHUB= yes GH_ACCOUNT= FRRouting Modified: head/net/frr3/files/watchfrr.in ============================================================================== --- head/net/frr/files/watchfrr.in Sun Mar 25 07:23:23 2018 (r465500) +++ head/net/frr3/files/watchfrr.in Mon Jun 4 05:12:03 2018 (r471530) @@ -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"} command=%%PREFIX%%/sbin/watchfrr -pidfile=%%LOCALSTATE_DIR%%/watchfrr.pid +pidfile=/var/run/frr/watchfrr.pid run_rc_command "$1" Modified: head/net/frr4/Makefile ============================================================================== --- head/net/frr4/Makefile Mon Jun 4 04:55:48 2018 (r471529) +++ head/net/frr4/Makefile Mon Jun 4 05:12:03 2018 (r471530) @@ -17,7 +17,7 @@ BUILD_DEPENDS= gawk:lang/gawk \ python:lang/python LIB_DEPENDS= libjson-c.so:devel/json-c -CONFLICTS= openbgpd openospfd zebra quagga-esr quagga +CONFLICTS= openbgpd openospfd zebra quagga frr3 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806040512.w545C3BL067198>