Date: Mon, 15 Apr 2019 21:34:22 +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: r499060 - in head/net: . frr3 frr4 frr5 frr6 frr7 frr7/files Message-ID: <201904152134.x3FLYMmN006035@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Mon Apr 15 21:34:22 2019 New Revision: 499060 URL: https://svnweb.freebsd.org/changeset/ports/499060 Log: New port: net/frr7 (7.0) PR: 236508 Reported by: pautina@kharkiv.net Added: head/net/frr7/ - copied from r499026, head/net/frr6/ Deleted: head/net/frr7/files/patch-zebra_ioctl.c Modified: head/net/Makefile head/net/frr3/Makefile head/net/frr4/Makefile head/net/frr5/Makefile head/net/frr6/Makefile head/net/frr7/Makefile head/net/frr7/distinfo head/net/frr7/files/frr.in head/net/frr7/files/patch-Makefile.am head/net/frr7/files/patch-configure.ac head/net/frr7/files/watchfrr.in head/net/frr7/pkg-plist Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Mon Apr 15 21:16:14 2019 (r499059) +++ head/net/Makefile Mon Apr 15 21:34:22 2019 (r499060) @@ -171,6 +171,7 @@ SUBDIR += frr4 SUBDIR += frr5 SUBDIR += frr6 + SUBDIR += frr7 SUBDIR += fspclient SUBDIR += fspd SUBDIR += fsplib Modified: head/net/frr3/Makefile ============================================================================== --- head/net/frr3/Makefile Mon Apr 15 21:16:14 2019 (r499059) +++ head/net/frr3/Makefile Mon Apr 15 21:34:22 2019 (r499060) @@ -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 frr6 +CONFLICTS= openbgpd openospfd zebra quagga frr4 frr5 frr6 frr7 USE_GITHUB= yes GH_ACCOUNT= FRRouting Modified: head/net/frr4/Makefile ============================================================================== --- head/net/frr4/Makefile Mon Apr 15 21:16:14 2019 (r499059) +++ head/net/frr4/Makefile Mon Apr 15 21:34:22 2019 (r499060) @@ -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 frr5 frr6 +CONFLICTS= openbgpd openospfd zebra quagga frr3 frr5 frr6 frr7 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 Apr 15 21:16:14 2019 (r499059) +++ head/net/frr5/Makefile Mon Apr 15 21:34:22 2019 (r499060) @@ -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 frr6 +CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr6 frr7 USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ makeinfo python:2.7,build readline Modified: head/net/frr6/Makefile ============================================================================== --- head/net/frr6/Makefile Mon Apr 15 21:16:14 2019 (r499059) +++ head/net/frr6/Makefile Mon Apr 15 21:34:22 2019 (r499060) @@ -19,7 +19,7 @@ LIB_DEPENDS= libjson-c.so:devel/json-c USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ makeinfo python:2.7,build readline -CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr5 +CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr5 frr7 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip Modified: head/net/frr7/Makefile ============================================================================== --- head/net/frr6/Makefile Mon Apr 15 14:03:08 2019 (r499026) +++ head/net/frr7/Makefile Mon Apr 15 21:34:22 2019 (r499060) @@ -1,11 +1,10 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 6.0.2 +PORTVERSION= 7.0 DISTVERSIONPREFIX= frr- -PORTREVISION= 2 CATEGORIES= net ipv6 -PKGNAMESUFFIX= 6 +PKGNAMESUFFIX= 7 MAINTAINER= olivier@FreeBSD.org COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP @@ -14,13 +13,16 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk -LIB_DEPENDS= libjson-c.so:devel/json-c +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libyang.so:net/libyang USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ - makeinfo python:2.7,build readline + makeinfo python:3.6+,build readline -CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr5 +BINARY_ALIAS= python=${PYTHON_VERSION} +CONFLICTS= openbgpd openospfd zebra quagga frr3 frr4 frr5 frr6 + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes @@ -30,12 +32,14 @@ GH_ACCOUNT= FRRouting INFO= frr -OPTIONS_DEFINE= FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MANPAGES \ - MULTIPATH TCMALLOC RPKI SNMP +OPTIONS_DEFINE= CONFIGROLLBACKS FPM DATACENTER LDPD PAM SHELLACCESS \ + TCPSOCKETS VTYSH MANPAGES MULTIPATH TCMALLOC RPKI SNMP OPTIONS_DEFAULT= VTYSH RPKI FPM MANPAGES OPTIONS_SUB= yes +CONFIGROLLBACKS_DESC= Enable configuration rollback support FPM_DESC= Enable Forwarding Plane Manager support +DATACENTER_DESC= Use reduced BGP timers LDPD_DESC= Build ldpd MULTIPATH_DESC= Enable multipath function PAM_DESC= Use libpam for PAM support in vtysh @@ -56,30 +60,36 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-user=frr \ --enable-group=frr \ --enable-vty-group=frrvty \ + --disable-doc-html \ --sysconfdir=${ETCDIR} \ --localstatedir=/var/run/frr \ --disable-nhrpd \ --disable-pimd -MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} MANPAGES_CONFIGURE_OFF= --disable-doc +CONFIGROLLBACKS_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +CONFIGROLLBACKS_CONFIGURE_ENABLE= config-rollbacks +DATACENTER_CONFIGURE_ENABLE= datacenter SHELLACCESS_CONFIGURE_ENABLE= shell-access FPM_CONFIGURE_ENABLE= fpm PAM_CONFIGURE_WITH= libpam LDPD_CONFIGURE_ENABLE= ldpd MULTIPATH_CONFIGURE_ON= --enable-multipath=64 -RPKI_CONFIGURE_ENABLE= rpki +RPKI_CONFIGURE_ENABLE= rpki RPKI_LIB_DEPENDS= librtr.so:net-mgmt/rtrlib \ - libssh.so:security/libssh + libssh.so:security/libssh TCMALLOC_CONFIGURE_ENABLE= tcmalloc TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools SNMP_CONFIGURE_ENABLE= snmp -SNMP_CFLAGS= "-std=gnu99" +SNMP_CFLAGS= "-std=gnu99" SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp TCPSOCKETS_CONFIGURE_ENABLE= tcp-zebra VTYSH_CONFIGURE_ENABLE= vtysh USE_RC_SUBR= frr watchfrr + +SHEBANG_FILES= yang/embedmodel.py post-install: ${MKDIR} ${STAGEDIR}/var/run/frr Modified: head/net/frr7/distinfo ============================================================================== --- head/net/frr6/distinfo Mon Apr 15 14:03:08 2019 (r499026) +++ head/net/frr7/distinfo Mon Apr 15 21:34:22 2019 (r499060) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546953642 -SHA256 (FRRouting-frr-frr-6.0.2_GH0.tar.gz) = dde97d012b6068a1230c0c6a03b38015befae37f617b9ffbd17024c71a170d94 -SIZE (FRRouting-frr-frr-6.0.2_GH0.tar.gz) = 4476089 +TIMESTAMP = 1552596106 +SHA256 (FRRouting-frr-frr-7.0_GH0.tar.gz) = 15b62dc0c52531e4bcefa6b830e9b9b07d1d0f189c2110307dbc19d80b719354 +SIZE (FRRouting-frr-frr-7.0_GH0.tar.gz) = 5234123 Modified: head/net/frr7/files/frr.in ============================================================================== --- head/net/frr6/files/frr.in Mon Apr 15 14:03:08 2019 (r499026) +++ head/net/frr7/files/frr.in Mon Apr 15 21:34:22 2019 (r499060) @@ -12,12 +12,12 @@ # # You may also wish to use the following variables to fine-tune startup: # frr_flags="" -# frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld bfdd staticd" +# frr_daemons="zebra babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd" # frr_vtysh_boot="YES" # Per daemon tuning may be done with daemon_name_flags # zebra_flags="-P 0" # bgpd_flags="-nrP 0" and so on -# If you want to give the routing daemons a chance to catchup before +# If you want to give the routing deamons a chance to catchup before # continueing, set frr_wait_for to a "default" or certain prefix. # frr_wait_for="default" # Set the time limit for the wait. @@ -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 bfdd staticd"} +: ${frr_daemons:="zebra babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd"} : ${frr_vtysh_boot:="NO"} : ${frr_wait_for:=""} : ${frr_wait_seconds:="90"} Modified: head/net/frr7/files/patch-Makefile.am ============================================================================== --- head/net/frr6/files/patch-Makefile.am Mon Apr 15 14:03:08 2019 (r499026) +++ head/net/frr7/files/patch-Makefile.am Mon Apr 15 21:34:22 2019 (r499060) @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2019-01-08 14:24:52.207825000 +0100 -+++ Makefile.am 2019-01-08 14:25:02.214572000 +0100 -@@ -117,7 +117,7 @@ +--- Makefile.am.orig 2019-03-14 23:20:16 UTC ++++ Makefile.am +@@ -123,7 +123,7 @@ include zebra/subdir.am include watchfrr/subdir.am include qpb/subdir.am include fpm/subdir.am Modified: head/net/frr7/files/patch-configure.ac ============================================================================== --- head/net/frr6/files/patch-configure.ac Mon Apr 15 14:03:08 2019 (r499026) +++ head/net/frr7/files/patch-configure.ac Mon Apr 15 21:34:22 2019 (r499060) @@ -1,11 +1,11 @@ ---- configure.ac.orig 2018-10-08 12:32:57 UTC +--- configure.ac.orig 2019-02-28 23:32:04 UTC +++ configure.ac -@@ -338,7 +338,7 @@ AC_ARG_WITH(pkg-git-version, +@@ -391,7 +391,7 @@ AC_ARG_WITH([pkg-git-version], [ test "x$withval" != "xno" && with_pkg_git_version="yes" ]) - AC_ARG_WITH(vtysh_pager, + 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, + AC_ARG_ENABLE([vtysh], AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for FRR])) - AC_ARG_ENABLE(doc, + AC_ARG_ENABLE([doc], Modified: head/net/frr7/files/watchfrr.in ============================================================================== --- head/net/frr6/files/watchfrr.in Mon Apr 15 14:03:08 2019 (r499026) +++ head/net/frr7/files/watchfrr.in Mon Apr 15 21:34:22 2019 (r499060) @@ -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 bfdd staticd"} +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 babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd"} command=%%PREFIX%%/sbin/watchfrr pidfile=/var/run/frr/watchfrr.pid Modified: head/net/frr7/pkg-plist ============================================================================== --- head/net/frr6/pkg-plist Mon Apr 15 14:03:08 2019 (r499026) +++ head/net/frr7/pkg-plist Mon Apr 15 21:34:22 2019 (r499060) @@ -1,4 +1,8 @@ %%VTYSH%%bin/vtysh +include/frr/agg_table.h +include/frr/yang.h +include/frr/yang_translator.h +include/frr/yang_wrappers.h include/frr/bfd.h include/frr/bitfield.h include/frr/buffer.h @@ -8,6 +12,7 @@ include/frr/command_graph.h include/frr/command_match.h include/frr/compiler.h include/frr/csv.h +include/frr/db.h include/frr/debug.h include/frr/distribute.h include/frr/eigrpd/eigrp_dump.h @@ -25,6 +30,7 @@ include/frr/getopt.h include/frr/graph.h include/frr/hash.h include/frr/hook.h +include/frr/id_alloc.h include/frr/if.h include/frr/if_rmap.h include/frr/imsg.h @@ -38,6 +44,7 @@ include/frr/libospf.h include/frr/linklist.h include/frr/log.h include/frr/logicalrouter.h +include/frr/lua.h include/frr/md5.h include/frr/memory.h include/frr/memory_vty.h @@ -47,6 +54,9 @@ include/frr/mpls.h include/frr/network.h include/frr/nexthop.h include/frr/nexthop_group.h +include/frr/northbound.h +include/frr/northbound_cli.h +include/frr/northbound_db.h include/frr/ns.h include/frr/openbsd-queue.h include/frr/openbsd-tree.h @@ -139,6 +149,7 @@ sbin/bfdd sbin/bgpd %%LDPD%%sbin/ldpd sbin/eigrpd +sbin/fabricd sbin/ospf6d sbin/ospfd sbin/pbrd @@ -148,12 +159,20 @@ sbin/staticd sbin/zebra sbin/isisd sbin/watchfrr +share/yang/frr-interface.yang +share/yang/frr-isisd.yang +share/yang/frr-module-translator.yang +share/yang/frr-ripd.yang +share/yang/frr-ripngd.yang +share/yang/frr-route-types.yang +share/yang/frr-test-module.yang %%ETCDIR%%/babeld.conf.sample %%ETCDIR%%/bfdd.conf.sample %%ETCDIR%%/bgpd.conf.sample %%ETCDIR%%/bgpd.conf.sample2 %%ETCDIR%%/bgpd.conf.vnc.sample %%ETCDIR%%/eigrpd.conf.sample +%%ETCDIR%%/fabricd.conf.sample %%ETCDIR%%/isisd.conf.sample %%LDPD%%%%ETCDIR%%/ldpd.conf.sample %%ETCDIR%%/ospf6d.conf.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904152134.x3FLYMmN006035>