svn commit: r473998 - in head/net: . frr3 frr4 frr5 frr5/files quagga
Olivier Cochard
olivier at FreeBSD.org
Fri Jul 6 07:36:11 UTC 2018
Author: olivier
Date: Fri Jul 6 07:36:07 2018
New Revision: 473998
URL: https://svnweb.freebsd.org/changeset/ports/473998
Log:
New port: net/frr5 (5.0.1).
PR: 229397
Reported by: pi
Sponsored by: Orange
Fix build with SNMP option.
PR: 228159
Reported by: pautina at kharkiv.net
Fix crash with gif/tun/gre interface.
PR: 228643
Reported by: mike at sentex.net
Added:
head/net/frr5/
- copied from r473993, head/net/frr4/
head/net/frr5/files/patch-zebra_ioctl.c (contents, props changed)
Deleted:
head/net/frr5/files/patch-lib_vty.h
Modified:
head/net/Makefile
head/net/frr3/Makefile
head/net/frr4/Makefile
head/net/frr5/Makefile
head/net/frr5/distinfo
head/net/frr5/files/patch-Makefile.am
head/net/frr5/files/patch-configure.ac
head/net/frr5/pkg-message
head/net/frr5/pkg-plist
head/net/quagga/Makefile
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Fri Jul 6 07:26:47 2018 (r473997)
+++ head/net/Makefile Fri Jul 6 07:36:07 2018 (r473998)
@@ -168,6 +168,7 @@
SUBDIR += freevrrpd
SUBDIR += frr3
SUBDIR += frr4
+ SUBDIR += frr5
SUBDIR += fspclient
SUBDIR += fspd
SUBDIR += fsplib
Modified: head/net/frr3/Makefile
==============================================================================
--- head/net/frr3/Makefile Fri Jul 6 07:26:47 2018 (r473997)
+++ head/net/frr3/Makefile Fri Jul 6 07:36:07 2018 (r473998)
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gawk:lang/gawk
LIB_DEPENDS= libjson-c.so:devel/json-c
-CONFLICTS= openbgpd openospfd zebra quagga frr4
+CONFLICTS= openbgpd openospfd zebra quagga frr4 frr5
USE_GITHUB= yes
GH_ACCOUNT= FRRouting
Modified: head/net/frr4/Makefile
==============================================================================
--- head/net/frr4/Makefile Fri Jul 6 07:26:47 2018 (r473997)
+++ head/net/frr4/Makefile Fri Jul 6 07:36:07 2018 (r473998)
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gawk:lang/gawk
LIB_DEPENDS= libjson-c.so:devel/json-c
-CONFLICTS= openbgpd openospfd zebra quagga frr3
+CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4
USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
makeinfo python:2.7,build readline
Modified: head/net/frr5/Makefile
==============================================================================
--- head/net/frr4/Makefile Fri Jul 6 06:27:47 2018 (r473993)
+++ head/net/frr5/Makefile Fri Jul 6 07:36:07 2018 (r473998)
@@ -1,11 +1,10 @@
# $FreeBSD$
PORTNAME= frr
-PORTVERSION= 4.0
+PORTVERSION= 5.0.1
DISTVERSIONPREFIX= frr-
-PORTREVISION= 1
CATEGORIES= net ipv6
-PKGNAMESUFFIX= 4
+PKGNAMESUFFIX= 5
MAINTAINER= olivier at FreeBSD.org
COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP
@@ -16,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gawk:lang/gawk
LIB_DEPENDS= libjson-c.so:devel/json-c
-CONFLICTS= openbgpd openospfd zebra quagga frr3
+CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4
USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
makeinfo python:2.7,build readline
@@ -29,14 +28,10 @@ GH_ACCOUNT= FRRouting
INFO= frr
-OPTIONS_DEFINE= FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MULTIPATH TCMALLOC RPKI
-OPTIONS_DEFAULT= VTYSH RPKI
+OPTIONS_DEFINE= FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MANPAGES \
+ MULTIPATH TCMALLOC RPKI SNMP
+OPTIONS_DEFAULT= VTYSH RPKI FPM MANPAGES
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
@@ -65,6 +60,8 @@ CONFIGURE_ARGS= --enable-user=frr \
--disable-nhrpd \
--disable-pimd
+MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx
+MANPAGES_CONFIGURE_OFF= --disable-doc
SHELLACCESS_CONFIGURE_ENABLE= shell-access
FPM_CONFIGURE_ENABLE= fpm
PAM_CONFIGURE_WITH= libpam
@@ -76,6 +73,7 @@ RPKI_LIB_DEPENDS= librtr.so:net-mgmt/rtrlib \
TCMALLOC_CONFIGURE_ENABLE= tcmalloc
TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools
SNMP_CONFIGURE_ENABLE= snmp
+SNMP_CFLAGS= "-std=gnu99"
SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra
VTYSH_CONFIGURE_ENABLE= vtysh
Modified: head/net/frr5/distinfo
==============================================================================
--- head/net/frr4/distinfo Fri Jul 6 06:27:47 2018 (r473993)
+++ head/net/frr5/distinfo Fri Jul 6 07:36:07 2018 (r473998)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520970456
-SHA256 (FRRouting-frr-frr-4.0_GH0.tar.gz) = a9932ef116106d56b0e17aa569aa56a458acdd50e0d07c042fd5cc725bf742cc
-SIZE (FRRouting-frr-frr-4.0_GH0.tar.gz) = 3989206
+TIMESTAMP = 1530788283
+SHA256 (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = b2d94960a248f953fef5ee34a95229ff6426ceac27f4d187179f0146275dbf14
+SIZE (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = 4360689
Modified: head/net/frr5/files/patch-Makefile.am
==============================================================================
--- head/net/frr4/files/patch-Makefile.am Fri Jul 6 06:27:47 2018 (r473993)
+++ head/net/frr5/files/patch-Makefile.am Fri Jul 6 07:36:07 2018 (r473998)
@@ -1,6 +1,6 @@
---- Makefile.am.orig 2018-03-13 22:21:12 UTC
+--- Makefile.am.orig 2018-06-08 01:39:07 UTC
+++ Makefile.am
-@@ -41,7 +41,7 @@ include zebra/subdir.am
+@@ -42,7 +42,7 @@ include zebra/subdir.am
include watchfrr/subdir.am
include qpb/subdir.am
include fpm/subdir.am
Modified: head/net/frr5/files/patch-configure.ac
==============================================================================
--- head/net/frr4/files/patch-configure.ac Fri Jul 6 06:27:47 2018 (r473993)
+++ head/net/frr5/files/patch-configure.ac Fri Jul 6 07:36:07 2018 (r473998)
@@ -1,6 +1,6 @@
---- configure.ac.orig 2018-03-14 05:56:44 UTC
+--- configure.ac.orig 2018-06-08 01:39:07 UTC
+++ configure.ac
-@@ -292,7 +292,7 @@ AC_ARG_WITH(pkg-git-version,
+@@ -322,7 +322,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]),
Added: head/net/frr5/files/patch-zebra_ioctl.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/frr5/files/patch-zebra_ioctl.c Fri Jul 6 07:36:07 2018 (r473998)
@@ -0,0 +1,20 @@
+--- zebra/ioctl.c.orig 2018-06-08 01:39:07 UTC
++++ zebra/ioctl.c
+@@ -430,10 +430,13 @@ void if_get_flags(struct interface *ifp)
+ strncpy(ifmr.ifm_name, ifp->name, IFNAMSIZ);
+
+ /* Seems not all interfaces implement this ioctl */
+- if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) < 0)
+- zlog_err("if_ioctl(SIOCGIFMEDIA) failed: %s",
+- safe_strerror(errno));
+- else if (ifmr.ifm_status & IFM_AVALID) /* Link state is valid */
++ if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
++ /* Ignore EINVAL to avoid being too verbose */
++ if (errno != EINVAL)
++ zlog_err("if_ioctl(SIOCGIFMEDIA) failed: %s",
++ safe_strerror(errno));
++ } else if (ifmr.ifm_status
++ & IFM_AVALID) /* Link state is valid */
+ {
+ if (ifmr.ifm_status & IFM_ACTIVE)
+ SET_FLAG(ifreq.ifr_flags, IFF_RUNNING);
Modified: head/net/frr5/pkg-message
==============================================================================
--- head/net/frr4/pkg-message Fri Jul 6 06:27:47 2018 (r473993)
+++ head/net/frr5/pkg-message Fri Jul 6 07:36:07 2018 (r473998)
@@ -4,5 +4,4 @@ messages like:
To prevent such message kern.ipc.maxsockbuf can be increased:
sysctl kern.ipc.maxsockbuf=16777216
-Error messages like "if_ioctl(SIOCGIFMEDIA) failed: Invalid argument" and
- crashs with tun,gre or gif interfaces are under investigation.
+Error message "ifam_read() doesn't read all socket data" is under investigation
Modified: head/net/frr5/pkg-plist
==============================================================================
--- head/net/frr4/pkg-plist Fri Jul 6 06:27:47 2018 (r473993)
+++ head/net/frr5/pkg-plist Fri Jul 6 07:36:07 2018 (r473998)
@@ -9,6 +9,7 @@ include/frr/command_graph.h
include/frr/command_match.h
include/frr/compiler.h
include/frr/csv.h
+include/frr/debug.h
include/frr/distribute.h
include/frr/eigrpd/eigrp_dump.h
include/frr/eigrpd/eigrp_topology.h
@@ -35,6 +36,7 @@ include/frr/libfrr.h
include/frr/libospf.h
include/frr/linklist.h
include/frr/log.h
+include/frr/logicalrouter.h
include/frr/md5.h
include/frr/memory.h
include/frr/memory_vty.h
@@ -43,6 +45,7 @@ include/frr/monotime.h
include/frr/mpls.h
include/frr/network.h
include/frr/nexthop.h
+include/frr/nexthop_group.h
include/frr/ns.h
include/frr/openbsd-queue.h
include/frr/openbsd-tree.h
@@ -57,6 +60,7 @@ 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/pbr.h
include/frr/plist.h
include/frr/pqueue.h
include/frr/prefix.h
@@ -102,26 +106,35 @@ lib/libfrrospfapiclient.a
lib/libfrrospfapiclient.so
lib/libfrrospfapiclient.so.0
lib/libfrrospfapiclient.so.0.0.0
+%%SNMP%%lib/frr/modules/bgpd_snmp.so
+%%SNMP%%lib/frr/modules/ospf6d_snmp.so
+%%SNMP%%lib/frr/modules/ospfd_snmp.so
+%%SNMP%%lib/frr/modules/ripd_snmp.so
+%%SNMP%%lib/frr/modules/zebra_snmp.so
%%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
+%%SNMP%%lib/libfrrsnmp.a
+%%SNMP%%lib/libfrrsnmp.so
+%%SNMP%%lib/libfrrsnmp.so.0
+%%SNMP%%lib/libfrrsnmp.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
+%%MANPAGES%%man/man1/frr.1.gz
+%%MANPAGES%%man/man8/eigrpd.8.gz
+%%MANPAGES%%man/man8/isisd.8.gz
+%%MANPAGES%%man/man8/watchfrr.8.gz
+%%MANPAGES%%%%VTYSH%%man/man1/vtysh.1.gz
+%%MANPAGES%%man/man8/bgpd.8.gz
+%%MANPAGES%%%%LDPD%%man/man8/ldpd.8.gz
+%%MANPAGES%%man/man8/ospf6d.8.gz
+%%MANPAGES%%man/man8/ospfclient.8.gz
+%%MANPAGES%%man/man8/ospfd.8.gz
+%%MANPAGES%%man/man8/pbrd.8.gz
+%%MANPAGES%%man/man8/ripd.8.gz
+%%MANPAGES%%man/man8/ripngd.8.gz
+%%MANPAGES%%man/man8/zebra.8.gz
sbin/babeld
sbin/bgpd
%%LDPD%%sbin/ldpd
@@ -129,6 +142,7 @@ sbin/eigrpd
sbin/ospf6d
sbin/ospfclient
sbin/ospfd
+sbin/pbrd
sbin/ripd
sbin/ripngd
sbin/zebra
@@ -144,6 +158,7 @@ sbin/watchfrr
%%LDPD%%%%ETCDIR%%/ldpd.conf.sample
%%ETCDIR%%/ospf6d.conf.sample
%%ETCDIR%%/ospfd.conf.sample
+%%ETCDIR%%/pbrd.conf.sample
%%ETCDIR%%/ripd.conf.sample
%%ETCDIR%%/ripngd.conf.sample
%%VTYSH%%%%ETCDIR%%/vtysh.conf.sample
Modified: head/net/quagga/Makefile
==============================================================================
--- head/net/quagga/Makefile Fri Jul 6 07:26:47 2018 (r473997)
+++ head/net/quagga/Makefile Fri Jul 6 07:36:07 2018 (r473998)
@@ -13,7 +13,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= gawk:lang/gawk
-CONFLICTS= frr3 frr4 openbgpd pimd zebra
+CONFLICTS= frr3 frr4 frr5 openbgpd pimd zebra
USES= compiler:c11 cpe gmake libtool makeinfo \
perl5 readline ssl
More information about the svn-ports-all
mailing list