svn commit: r482740 - in head/net: . frr3 frr4 frr5 frr6 frr6/files quagga
Olivier Cochard
olivier at FreeBSD.org
Mon Oct 22 09:06:33 UTC 2018
Author: olivier
Date: Mon Oct 22 09:06:29 2018
New Revision: 482740
URL: https://svnweb.freebsd.org/changeset/ports/482740
Log:
New port: net/frr6 (6.0)
PR: 232122
Reported by: pautina at kharkiv.net
Added:
head/net/frr6/
- copied from r482736, head/net/frr5/
Deleted:
head/net/frr6/files/patch-isisd_isis__circuit.c
Modified:
head/net/Makefile
head/net/frr3/Makefile
head/net/frr4/Makefile
head/net/frr5/Makefile
head/net/frr6/Makefile
head/net/frr6/distinfo
head/net/frr6/files/frr.in
head/net/frr6/files/patch-Makefile.am
head/net/frr6/files/patch-configure.ac
head/net/frr6/files/patch-zebra_ioctl.c
head/net/frr6/files/watchfrr.in
head/net/frr6/pkg-plist
head/net/quagga/Makefile
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Mon Oct 22 09:02:00 2018 (r482739)
+++ head/net/Makefile Mon Oct 22 09:06:29 2018 (r482740)
@@ -166,6 +166,7 @@
SUBDIR += frr3
SUBDIR += frr4
SUBDIR += frr5
+ SUBDIR += frr6
SUBDIR += fspclient
SUBDIR += fspd
SUBDIR += fsplib
Modified: head/net/frr3/Makefile
==============================================================================
--- head/net/frr3/Makefile Mon Oct 22 09:02:00 2018 (r482739)
+++ head/net/frr3/Makefile Mon Oct 22 09:06:29 2018 (r482740)
@@ -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 frr4 frr5
+CONFLICTS= openbgpd openospfd zebra quagga frr4 frr5 frr6
USE_GITHUB= yes
GH_ACCOUNT= FRRouting
Modified: head/net/frr4/Makefile
==============================================================================
--- head/net/frr4/Makefile Mon Oct 22 09:02:00 2018 (r482739)
+++ head/net/frr4/Makefile Mon Oct 22 09:06:29 2018 (r482740)
@@ -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 frr4
+CONFLICTS= openbgpd openospfd zebra quagga frr3 frr5 frr6
USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
makeinfo python:2.7,build readline
Modified: head/net/frr5/Makefile
==============================================================================
--- head/net/frr5/Makefile Mon Oct 22 09:02:00 2018 (r482739)
+++ head/net/frr5/Makefile Mon Oct 22 09:06:29 2018 (r482740)
@@ -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 frr4
+CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr6
USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
makeinfo python:2.7,build readline
Modified: head/net/frr6/Makefile
==============================================================================
--- head/net/frr5/Makefile Mon Oct 22 08:39:41 2018 (r482736)
+++ head/net/frr6/Makefile Mon Oct 22 09:06:29 2018 (r482740)
@@ -1,11 +1,10 @@
# $FreeBSD$
PORTNAME= frr
-PORTVERSION= 5.0.1
-PORTREVISION= 3
+PORTVERSION= 6.0
DISTVERSIONPREFIX= frr-
CATEGORIES= net ipv6
-PKGNAMESUFFIX= 5
+PKGNAMESUFFIX= 6
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 frr4
+CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr5
USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
makeinfo python:2.7,build readline
Modified: head/net/frr6/distinfo
==============================================================================
--- head/net/frr5/distinfo Mon Oct 22 08:39:41 2018 (r482736)
+++ head/net/frr6/distinfo Mon Oct 22 09:06:29 2018 (r482740)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530788283
-SHA256 (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = b2d94960a248f953fef5ee34a95229ff6426ceac27f4d187179f0146275dbf14
-SIZE (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = 4360689
+TIMESTAMP = 1539258252
+SHA256 (FRRouting-frr-frr-6.0_GH0.tar.gz) = 3835d87e2329c1c08d1b2657312c0ba0155d8f442c338d60f0ddb51090f2f182
+SIZE (FRRouting-frr-frr-6.0_GH0.tar.gz) = 4547807
Modified: head/net/frr6/files/frr.in
==============================================================================
--- head/net/frr5/files/frr.in Mon Oct 22 08:39:41 2018 (r482736)
+++ head/net/frr6/files/frr.in Mon Oct 22 09:06:29 2018 (r482740)
@@ -12,7 +12,7 @@
#
# You may also wish to use the following variables to fine-tune startup:
# frr_flags=""
-# frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"
+# frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld bfdd staticd"
# frr_vysh_boot="YES"
# Per daemon tuning may be done with daemon_name_flags
# zebra_flags="-P 0"
@@ -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 eigrpd babeld"}
+: ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld bfdd staticd"}
: ${frr_vtysh_boot:="NO"}
: ${frr_wait_for:=""}
: ${frr_wait_seconds:="90"}
Modified: head/net/frr6/files/patch-Makefile.am
==============================================================================
--- head/net/frr5/files/patch-Makefile.am Mon Oct 22 08:39:41 2018 (r482736)
+++ head/net/frr6/files/patch-Makefile.am Mon Oct 22 09:06:29 2018 (r482740)
@@ -1,6 +1,6 @@
---- Makefile.am.orig 2018-06-08 01:39:07 UTC
+--- Makefile.am.orig 2018-10-08 12:32:57 UTC
+++ Makefile.am
-@@ -42,7 +42,7 @@ include zebra/subdir.am
+@@ -40,7 +40,7 @@ include zebra/subdir.am
include watchfrr/subdir.am
include qpb/subdir.am
include fpm/subdir.am
Modified: head/net/frr6/files/patch-configure.ac
==============================================================================
--- head/net/frr5/files/patch-configure.ac Mon Oct 22 08:39:41 2018 (r482736)
+++ head/net/frr6/files/patch-configure.ac Mon Oct 22 09:06:29 2018 (r482740)
@@ -1,6 +1,6 @@
---- configure.ac.orig 2018-06-08 01:39:07 UTC
+--- configure.ac.orig 2018-10-08 12:32:57 UTC
+++ configure.ac
-@@ -322,7 +322,7 @@ AC_ARG_WITH(pkg-git-version,
+@@ -338,7 +338,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]),
Modified: head/net/frr6/files/patch-zebra_ioctl.c
==============================================================================
--- head/net/frr5/files/patch-zebra_ioctl.c Mon Oct 22 08:39:41 2018 (r482736)
+++ head/net/frr6/files/patch-zebra_ioctl.c Mon Oct 22 09:06:29 2018 (r482740)
@@ -1,20 +1,13 @@
---- zebra/ioctl.c.orig 2018-06-08 01:39:07 UTC
+--- zebra/ioctl.c.orig 2018-10-22 05:34:13 UTC
+++ zebra/ioctl.c
-@@ -430,10 +430,13 @@ void if_get_flags(struct interface *ifp)
- strncpy(ifmr.ifm_name, ifp->name, IFNAMSIZ);
+@@ -415,7 +415,9 @@ void if_get_flags(struct interface *ifp)
/* 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) {
+ if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) < 0)
+- flog_err_sys(LIB_ERR_SYSTEM_CALL,
+ /* 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);
++ flog_err_sys(LIB_ERR_SYSTEM_CALL,
+ "if_ioctl(SIOCGIFMEDIA) failed: %s",
+ safe_strerror(errno));
+ else if (ifmr.ifm_status & IFM_AVALID) /* Link state is valid */
Modified: head/net/frr6/files/watchfrr.in
==============================================================================
--- head/net/frr5/files/watchfrr.in Mon Oct 22 08:39:41 2018 (r482736)
+++ head/net/frr6/files/watchfrr.in Mon Oct 22 09:06:29 2018 (r482740)
@@ -13,7 +13,7 @@
# 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"
+# 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 bfdd staticd"
. /etc/rc.subr
@@ -25,7 +25,7 @@ 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"}
+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 bfdd staticd"}
command=%%PREFIX%%/sbin/watchfrr
pidfile=/var/run/frr/watchfrr.pid
Modified: head/net/frr6/pkg-plist
==============================================================================
--- head/net/frr5/pkg-plist Mon Oct 22 08:39:41 2018 (r482736)
+++ head/net/frr6/pkg-plist Mon Oct 22 09:06:29 2018 (r482740)
@@ -21,6 +21,7 @@ include/frr/filter.h
include/frr/freebsd-queue.h
include/frr/frr_pthread.h
include/frr/frratomic.h
+include/frr/frrstr.h
include/frr/getopt.h
include/frr/graph.h
include/frr/hash.h
@@ -32,6 +33,7 @@ include/frr/ipaddr.h
include/frr/jhash.h
include/frr/json.h
include/frr/keychain.h
+include/frr/lib_errors.h
include/frr/libfrr.h
include/frr/libospf.h
include/frr/linklist.h
@@ -77,7 +79,6 @@ 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
@@ -122,8 +123,10 @@ lib/libfrrospfapiclient.so.0.0.0
%%SNMP%%lib/libfrrsnmp.so.0.0.0
%%RPKI%%lib/frr/modules/bgpd_rpki.so
%%MANPAGES%%man/man1/frr.1.gz
+%%MANPAGES%%man/man8/bfdd.8.gz
%%MANPAGES%%man/man8/eigrpd.8.gz
%%MANPAGES%%man/man8/isisd.8.gz
+%%MANPAGES%%man/man8/staticd.8.gz
%%MANPAGES%%man/man8/watchfrr.8.gz
%%MANPAGES%%%%VTYSH%%man/man1/vtysh.1.gz
%%MANPAGES%%man/man8/bgpd.8.gz
@@ -136,6 +139,7 @@ lib/libfrrospfapiclient.so.0.0.0
%%MANPAGES%%man/man8/ripngd.8.gz
%%MANPAGES%%man/man8/zebra.8.gz
sbin/babeld
+sbin/bfdd
sbin/bgpd
%%LDPD%%sbin/ldpd
sbin/eigrpd
@@ -145,11 +149,13 @@ sbin/ospfd
sbin/pbrd
sbin/ripd
sbin/ripngd
+sbin/staticd
sbin/zebra
sbin/isisd
sbin/rfptest
sbin/watchfrr
%%ETCDIR%%/babeld.conf.sample
+%%ETCDIR%%/bfdd.conf.sample
%%ETCDIR%%/bgpd.conf.sample
%%ETCDIR%%/bgpd.conf.sample2
%%ETCDIR%%/bgpd.conf.vnc.sample
@@ -161,6 +167,7 @@ sbin/watchfrr
%%ETCDIR%%/pbrd.conf.sample
%%ETCDIR%%/ripd.conf.sample
%%ETCDIR%%/ripngd.conf.sample
+%%ETCDIR%%/staticd.conf.sample
%%VTYSH%%%%ETCDIR%%/vtysh.conf.sample
%%ETCDIR%%/zebra.conf.sample
@dir(frr,frr,750) /var/run/frr
Modified: head/net/quagga/Makefile
==============================================================================
--- head/net/quagga/Makefile Mon Oct 22 09:02:00 2018 (r482739)
+++ head/net/quagga/Makefile Mon Oct 22 09:06:29 2018 (r482740)
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gawk:lang/gawk
-CONFLICTS= frr3 frr4 frr5 openbgpd pimd zebra
+CONFLICTS= frr3 frr4 frr5 frr6 openbgpd pimd zebra
USES= compiler:c11 cpe gmake libtool makeinfo \
perl5 readline ssl
More information about the svn-ports-all
mailing list