Update to 4.0.

Removing restricted status because FreeBSD is a downstream distributor of
FRRouting and is compliant with the GPLv2 and thus has a valid license per
GPLv2 section 4.

9 files changed, 71 insertions, 36 deletions

diff --git a/LEGAL b/LEGAL
index b78945ce639f..2bcd53dc8a5a 100644
--- a/LEGAL
+++ b/LEGAL
@@ -251,5 +251,4 @@ btsync_*		net-p2p/btsync		Redistribution forbidden by license
 sas2ircu-*		sysutils/sas2ircu	May not be redistributed. Must accept license to download.
 snes9x-*		emulators/snes9x-gtk	Commercial users must seek permission from copyright holders.
 rainloop-1.*.zip	mail/rainloop		Redistribution in any form is prohibited
-frr-*			net/frr			possible GPL violation of Quagga project
 lha-114i.tar.gz		archivers/lha		Binary only redistribution is prohibited. Non-network redistribution such as CDROM requires prior notification to author. Commercial use whose main purpose is to provide the functions of this program is prohibited.
diff --git a/net/frr/Makefile b/net/frr/Makefile
index 59b8a9879140..9c6c6325545e 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	frr
-PORTVERSION=	3.0.3
+PORTVERSION=	4.0
 DISTVERSIONPREFIX=	frr-
 CATEGORIES=	net ipv6
 
@@ -11,25 +11,24 @@ COMMENT=	IP routing protocol suite including BGP, IS-IS, OSPF and RIP
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gawk:lang/gawk
+BUILD_DEPENDS=	gawk:lang/gawk \
+				python:lang/python
 LIB_DEPENDS=	libjson-c.so:devel/json-c
 
-RESTRICTED=	possible GPL violation of Quagga project
-
 CONFLICTS=	openbgpd openospfd zebra quagga-esr quagga
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	FRRouting
-
 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
-OPTIONS_DEFAULT=	VTYSH
+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
@@ -41,6 +40,7 @@ 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
@@ -60,6 +60,7 @@ CONFIGURE_ARGS=	--enable-user=frr \
 		--enable-vty-group=frrvty \
 		--sysconfdir=${ETCDIR} \
 		--localstatedir=/var/run/frr \
+		--disable-nhrpd \
 		--disable-pimd
 
 SHELLACCESS_CONFIGURE_ENABLE=	shell-access
@@ -67,6 +68,9 @@ 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
diff --git a/net/frr/distinfo b/net/frr/distinfo
index 25fd39638abc..e2d687c67061 100644
--- a/net/frr/distinfo
+++ b/net/frr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515855735
-SHA256 (FRRouting-frr-frr-3.0.3_GH0.tar.gz) = c850d6f7ae389e27acb1e808e01e561b0db7e0e35a902ca18ce53839c7906b7b
-SIZE (FRRouting-frr-frr-3.0.3_GH0.tar.gz) = 3168397
+TIMESTAMP = 1520970456
+SHA256 (FRRouting-frr-frr-4.0_GH0.tar.gz) = a9932ef116106d56b0e17aa569aa56a458acdd50e0d07c042fd5cc725bf742cc
+SIZE (FRRouting-frr-frr-4.0_GH0.tar.gz) = 3989206
diff --git a/net/frr/files/frr.in b/net/frr/files/frr.in
index 07c693d6f2c3..20dbdd3248e8 100644
--- a/net/frr/files/frr.in
+++ b/net/frr/files/frr.in
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: frr
-# REQUIRE: netif routing 
+# REQUIRE: netif routing
 # KEYWORD: nojailvnet shutdown
 
 # Add the following line to /etc/rc.conf to enable frr:
@@ -43,7 +43,7 @@ command_args="-d"
 load_rc_config $name
 : ${frr_enable:="NO"}
 : ${frr_flags:=""}
-: ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd"}
+: ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"}
 : ${frr_vtysh_boot:="NO"}
 : ${frr_wait_for:=""}
 : ${frr_wait_seconds:="90"}
diff --git a/net/frr/files/patch-Makefile.am b/net/frr/files/patch-Makefile.am
index 662021f2f894..8efb340367b4 100644
--- a/net/frr/files/patch-Makefile.am
+++ b/net/frr/files/patch-Makefile.am
@@ -1,11 +1,11 @@
---- Makefile.am.orig	2017-03-08 14:59:07 UTC
+--- Makefile.am.orig	2018-03-13 22:21:12 UTC
 +++ Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
- 	 @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
-          @ISISD@ @PIMD@ @NHRPD@ \
- 	 @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
--         redhat @SOLARIS@ tests tools cumulus snapcraft
-+         redhat @SOLARIS@ tests cumulus snapcraft
+@@ -41,7 +41,7 @@ include zebra/subdir.am
+ include watchfrr/subdir.am
+ include qpb/subdir.am
+ include fpm/subdir.am
+-include tools/subdir.am
++#include tools/subdir.am
  
- DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \
- 	  isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \
+ include ripd/subdir.am
+ include ripngd/subdir.am
diff --git a/net/frr/files/patch-configure.ac b/net/frr/files/patch-configure.ac
new file mode 100644
index 000000000000..6b59462eead0
--- /dev/null
+++ b/net/frr/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2018-03-14 05:56:44 UTC
++++ configure.ac
+@@ -292,7 +292,7 @@ AC_ARG_WITH(pkg-git-version,
+ 	[ test "x$withval" != "xno" && with_pkg_git_version="yes" ])
+ AC_ARG_WITH(vtysh_pager,
+ 	AS_HELP_STRING([--with-vtysh-pager=PAGER], [control what pager is compiled in as default]),
+-	VTYSH_PAGER=$withval, VTYSH_PAGER="more")
++	VTYSH_PAGER=$withval, VTYSH_PAGER="cat")
+ AC_ARG_ENABLE(vtysh,
+   AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for FRR]))
+ AC_ARG_ENABLE(doc,
diff --git a/net/frr/files/patch-vtysh_vtysh.c b/net/frr/files/patch-vtysh_vtysh.c
deleted file mode 100644
index 66fe60cde778..000000000000
--- a/net/frr/files/patch-vtysh_vtysh.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- vtysh/vtysh.c.orig	2017-08-09 12:56:09.000000000 +0200
-+++ vtysh/vtysh.c	2017-08-22 22:04:36.068181000 +0200
-@@ -249,7 +249,7 @@
- 	if (pager_defined)
- 		vtysh_pager_name = strdup(pager_defined);
- 	else
--		vtysh_pager_name = strdup("more");
-+		vtysh_pager_name = strdup("cat");
- }
- 
- /* Command execution over the vty interface. */
diff --git a/net/frr/pkg-message b/net/frr/pkg-message
new file mode 100644
index 000000000000..b9c5d5f65e1a
--- /dev/null
+++ b/net/frr/pkg-message
@@ -0,0 +1,8 @@
+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)"
+To prevent such message kern.ipc.maxsockbuf can be increased:
+sysctl kern.ipc.maxsockbuf=16777216
+
+Error messages like "if_ioctl(SIOCGIFMEDIA) failed: Invalid argument" are
+under investigation but seems harmless.
diff --git a/net/frr/pkg-plist b/net/frr/pkg-plist
index 34c29856fcb2..e315da56bbcc 100644
--- a/net/frr/pkg-plist
+++ b/net/frr/pkg-plist
@@ -5,12 +5,21 @@ 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
@@ -18,6 +27,7 @@ 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
@@ -53,9 +63,13 @@ 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
@@ -66,11 +80,15 @@ 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
@@ -84,7 +102,10 @@ lib/libfrrospfapiclient.a
 lib/libfrrospfapiclient.so
 lib/libfrrospfapiclient.so.0
 lib/libfrrospfapiclient.so.0.0.0
+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
@@ -96,8 +117,10 @@ 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
@@ -106,11 +129,12 @@ sbin/ripngd
 sbin/zebra
 sbin/isisd
 sbin/rfptest
-sbin/ssd
 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