svn commit: r546828 - head/net/frr7

[Olivier Cochard]

Author: olivier
Date: Fri Aug 28 20:53:23 2020
New Revision: 546828
URL: https://svnweb.freebsd.org/changeset/ports/546828

Log:
  Remove no more used option TCPSOCKETS.
  Add a hint about safest way to run daemons.
  
  PR:		248953
  Submitted by:	eugen

Modified:
  head/net/frr7/Makefile
  head/net/frr7/pkg-message

Modified: head/net/frr7/Makefile
==============================================================================
--- head/net/frr7/Makefile	Fri Aug 28 20:48:05 2020	(r546827)
+++ head/net/frr7/Makefile	Fri Aug 28 20:53:23 2020	(r546828)
@@ -3,7 +3,7 @@
 PORTNAME=	frr
 PORTVERSION=	7.4
 DISTVERSIONPREFIX=	frr-
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 .if defined(PYTHONTOOLS)
 PKGNAMESUFFIX=	7-pythontool
@@ -62,7 +62,7 @@ PKGMESSAGE=	""
 INFO=		frr
 
 OPTIONS_DEFINE=		CONFIGROLLBACKS FPM DATACENTER LDPD PAM SHELLACCESS \
-			TCPSOCKETS VTYSH MANPAGES MULTIPATH TCMALLOC RPKI SNMP
+			VTYSH MANPAGES MULTIPATH TCMALLOC RPKI SNMP
 OPTIONS_DEFAULT=	VTYSH RPKI FPM MANPAGES
 OPTIONS_SUB=	yes
 
@@ -76,7 +76,6 @@ 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
@@ -117,7 +116,6 @@ SNMP_CONFIGURE_ENABLE=		snmp
 SNMP_CFLAGS=			"-std=gnu99"
 SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
 SNMP_USES=			ssl
-TCPSOCKETS_CONFIGURE_ENABLE=	tcp-zebra
 VTYSH_CONFIGURE_ENABLE=		vtysh
 
 USE_RC_SUBR=	frr watchfrr

Modified: head/net/frr7/pkg-message
==============================================================================
--- head/net/frr7/pkg-message	Fri Aug 28 20:48:05 2020	(r546827)
+++ head/net/frr7/pkg-message	Fri Aug 28 20:53:23 2020	(r546828)
@@ -1,6 +1,12 @@
 [
 { type: install
   message: <<EOM
+Beware that remote control of frr7 daemons over TCP sockets is enabled by
+default.
+Use daemon flags in /etc/rc.conf to disable it if unneeded, for example:
+zebra_flags="-P0"
+ospfd_flags="-P0"
+
 FRR's OSPF daemons tries to allocate big socket buffer, so generate warning
 messages like:
 "setsockopt_so_sendbuf: fd 6: SO_SNDBUF set to 1048576 (requested 8388608)"