From nobody Thu Oct 05 14:32:55 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S1Ytv4rdLz4wrn6; Thu, 5 Oct 2023 14:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S1Ytv4ZDVz4QZf; Thu, 5 Oct 2023 14:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696516375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41SWUP++ouMTJ7H/9oV1Y9hquLpG+QRhdSy25hWaMco=; b=HZgCzxqIWdUj2ubGV30n2LlEdzj3QgIlS+qUnbW688fZ0pChx12EPbAuGTM9OoLByfoGfe jV/AGVexK8V9IJrlORX85xTkg6SKmL8Aj/8A3Dtbz33PXTOdv2O7OkHh+KTEET73qsDRp0 vw/mIsEC47lE3vw51h4DTCcZLzt1L4vsvHtW3XVaRFF1t1UCz0rYboAfCyVKn7Z4TxxVHV esOIIOm4LlmoiZqQhSt9rLFkVX9ifVLplzKTuAb9jM6oJrKRY3Onn5lnVbAaiwejomdg3X aHXij0fy8tG8QA12jA2RQR07X8t/iQ6juY0Q5quPVDHiVq5gRvSvhG6elosxkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696516375; a=rsa-sha256; cv=none; b=gILQpMfvCc19FDTn61tHe4ONkHQUVaiXjar/8bKI/hRNo2w5f/Z+wGf3OGmxR9BwCLGAYc V7xVddse4lqt5NZhxPSkavWSMEV2quV5FPOqBXf0s/v7bE/Q6RSUA6fVlflIW/iukfjBhy rzYwynpAX/G6G6BnlfT8mH5iKwEt/n0ZTnX1Rqi8RBd6d6pHlGekUDxZIyp/q9uOSYJfWi HoB0emXNyVazT80vgtokDeTeRMhN397QQrxeWwPSMBJAq0cAT69jJTb6yRjScngz54RRdk zsnHLFjQ36GaXA7BA7YFhPctpg+JviEFH98eVGnpVrFNLvPYyBJZftFwzKfbXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696516375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41SWUP++ouMTJ7H/9oV1Y9hquLpG+QRhdSy25hWaMco=; b=Pf1VzMPBpMLKuE7Mid31Sd6ib8xiCFK9UMAw9mSAkHt/ALC+dY0ICEuFi0Gg6CNQ2wbYzr 4Yxus8zi0AptfaXeHiYUmPqWLsagk5NBwpQ3JZjYFwkBLh8s7f8EgSAg+xo7sirHu8ZDDL E/XLV/uFd5dSAc02xqvD7I9QC6IYzHT4J8U9L7TxtZurs8HoDjMl0Gc9kGHgCKgbqrjQBY ko8/lEvB6bGMq6BK6Cig1AQk7o1iPrEV+XPPbDz40Yu1Pjz8nE0ZYEJRvxOtL/8BkeXDXi nU8BgBqapDLJzmOypi2MQ0e4OSlgUxjtrWXBv68+QlPZ1065+drMCD4lc6M7gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S1Ytv3gLJz1NVs; Thu, 5 Oct 2023 14:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395EWtP2010446; Thu, 5 Oct 2023 14:32:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395EWt7Q010443; Thu, 5 Oct 2023 14:32:55 GMT (envelope-from git) Date: Thu, 5 Oct 2023 14:32:55 GMT Message-Id: <202310051432.395EWt7Q010443@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 85653ba572f9 - main - net/frr7: Removing branch 7 from the tree List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85653ba572f92b33042be8cd20d047d753c0a4fc Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=85653ba572f92b33042be8cd20d047d753c0a4fc commit 85653ba572f92b33042be8cd20d047d753c0a4fc Author: Olivier Cochard AuthorDate: 2023-10-05 13:53:22 +0000 Commit: Olivier Cochard CommitDate: 2023-10-05 14:31:37 +0000 net/frr7: Removing branch 7 from the tree With the introduction of frr 9.x, it is no longer necessary to keep frr 7.x. Event: Oslo Hackathon at Modirum --- MOVED | 1 + net/Makefile | 2 - net/frr7-pythontools/Makefile | 7 - net/frr7-pythontools/pkg-plist | 1 - net/frr7/Makefile | 140 ---------------- net/frr7/distinfo | 3 - net/frr7/files/frr.in | 165 ------------------- net/frr7/files/patch-Makefile.am | 10 -- net/frr7/files/patch-yang_frr-zebra.yang.patch | 68 -------- net/frr7/files/watchfrr.in | 30 ---- net/frr7/pkg-descr | 3 - net/frr7/pkg-message | 19 --- net/frr7/pkg-plist | 216 ------------------------- net/frr8/Makefile | 2 +- net/frr9/Makefile | 2 +- 15 files changed, 3 insertions(+), 666 deletions(-) diff --git a/MOVED b/MOVED index 99321fcb0a09..d922265c9442 100644 --- a/MOVED +++ b/MOVED @@ -7930,3 +7930,4 @@ sysutils/nfs-over-tls||2023-10-01|Has expired: All supported releases of FreeBSD x11/antimicro|x11/antimicrox|2023-10-01|Has expired: Replaced by x11/antimicrox upstream no longer maintained security/krb5-appl||2023-10-01|Has expired: Desupported by upstream, uses old ciphers sysutils/mstflint-lite|sysutils/mstflint|2023-10-05|Parent port is now lite by default +net/frr7|net/frr8|2023-10-05|Keeping only the 2 last major branches in port tree diff --git a/net/Makefile b/net/Makefile index 3ac14a0bed21..52620f17f8fe 100644 --- a/net/Makefile +++ b/net/Makefile @@ -172,8 +172,6 @@ SUBDIR += freeswitch SUBDIR += freevrrpd SUBDIR += frp - SUBDIR += frr7 - SUBDIR += frr7-pythontools SUBDIR += frr8 SUBDIR += frr8-pythontools SUBDIR += frr9 diff --git a/net/frr7-pythontools/Makefile b/net/frr7-pythontools/Makefile deleted file mode 100644 index 3ada2c6294da..000000000000 --- a/net/frr7-pythontools/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -COMMENT= Provide configuration reload functionality for FRR - -PYTHONTOOLS= yes - -MASTERDIR= ${.CURDIR}/../frr7 - -.include "${MASTERDIR}/Makefile" diff --git a/net/frr7-pythontools/pkg-plist b/net/frr7-pythontools/pkg-plist deleted file mode 100644 index 1fe06eaa6b78..000000000000 --- a/net/frr7-pythontools/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/frr/frr-reload.py diff --git a/net/frr7/Makefile b/net/frr7/Makefile deleted file mode 100644 index c1b58b6f1acb..000000000000 --- a/net/frr7/Makefile +++ /dev/null @@ -1,140 +0,0 @@ -PORTNAME= frr -PORTVERSION= 7.5.1 -DISTVERSIONPREFIX= frr- -PORTREVISION= 4 -CATEGORIES= net -.if defined(PYTHONTOOLS) -PKGNAMESUFFIX= 7-pythontools -.else -PKGNAMESUFFIX= 7 -.endif - -MAINTAINER= olivier@FreeBSD.org - -COMMENT?= IP routing protocol suite including BGP, IS-IS, OSPF and RIP -WWW= https://frrouting.org/ - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -.if defined(PYTHONTOOLS) -RUN_DEPENDS= frr-reload:net/frr7 - -USES= python:run shebangfix - -post-patch: - @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ - -e 's|/usr/bin|${PREFIX}/bin|g' \ - -e 's|/usr/local/bin/tail|${TAIL}|g' \ - ${WRKSRC}/tools/frr-reload.py - -do-install: - ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/frr - ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload.py ${STAGEDIR}/${PREFIX}/lib/frr/ -.else - -BUILD_DEPENDS= gawk:lang/gawk - -LIB_DEPENDS= libjson-c.so:devel/json-c \ - libyang.so:net/libyang \ - libpcre.so:devel/pcre \ - libcares.so:dns/c-ares - -USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \ - makeinfo python:build readline shebangfix - -BINARY_ALIAS= python=${PYTHON_VERSION} - -CONFLICTS= openbgpd openospfd zebra quagga - -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_LDCONFIG= yes -.endif - -USE_GITHUB= yes -GH_ACCOUNT= FRRouting - -.if defined(PYTHONTOOLS) -NO_BUILD= yes -NO_ARCH= yes - -SHEBANG_FILES= tools/frr-reload.py -PLIST= ${.CURDIR}/pkg-plist -PKGMESSAGE= "" -.else -INFO= frr - -OPTIONS_DEFINE= CONFIGROLLBACKS FPM DATACENTER LDPD PAM SHELLACCESS \ - 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 -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 -VTYSH_DESC= Build integrated vty shell - -USERS= frr -GROUPS= frr frrvty - -CPPFLAGS+= -I${LOCALBASE}/include -Wno-error -LDFLAGS+= -L${LOCALBASE}/lib - -# PIM compile but didn't work on FreeBSD -CONFIGURE_ARGS= --enable-user=frr \ - --enable-group=frr \ - --enable-vty-group=frrvty \ - --disable-doc-html \ - --sysconfdir=${ETCDIR} \ - --localstatedir=/var/run/frr \ - --disable-backtrace \ - --disable-nhrpd \ - --disable-pimd \ - --disable-vrrpd \ - --with-vtysh-pager=cat - -MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1: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_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 -SNMP_CFLAGS= "-std=gnu99" -SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp -SNMP_USES= ssl -VTYSH_CONFIGURE_ENABLE= vtysh - -USE_RC_SUBR= frr watchfrr - -SHEBANG_FILES= yang/embedmodel.py - -post-patch: - @${REINPLACE_CMD} -e 's|/etc/frr|${ETCDIR}|g' \ - -e 's|/usr/lib/|${PREFIX}/lib/|g' \ - -e 's|frr-pythontools|frr7-pythontools|g' \ - ${WRKSRC}/tools/frr-reload - -post-install: - ${MKDIR} ${STAGEDIR}/var/run/frr - ${INSTALL_SCRIPT} ${WRKSRC}/tools/frr-reload ${STAGEDIR}${PREFIX}/sbin -.endif - -.include diff --git a/net/frr7/distinfo b/net/frr7/distinfo deleted file mode 100644 index ce85d17cddfe..000000000000 --- a/net/frr7/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1615188530 -SHA256 (FRRouting-frr-frr-7.5.1_GH0.tar.gz) = 030d4e66f577726dfea13bd3a9c669fd41d8fd89b25953a36b5b0966d406ff28 -SIZE (FRRouting-frr-frr-7.5.1_GH0.tar.gz) = 6746148 diff --git a/net/frr7/files/frr.in b/net/frr7/files/frr.in deleted file mode 100644 index 38404a92715a..000000000000 --- a/net/frr7/files/frr.in +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/sh - -# PROVIDE: frr dynamicrouting -# REQUIRE: netif routing -# KEYWORD: nojailvnet shutdown - -# Add the following line to /etc/rc.conf to enable frr: -# frr_enable="YES" -# -# You may also wish to use the following variables to fine-tune startup: -# Enable Integrated configuration mode (using the single configuration file -# frr.conf in place of one file for each dameon) -# frr_vtysh_boot="YES" -# Selecting limited set of daemons to run -# frr_daemons="zebra babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd" -# Global tuning -# frr_flags="" -# 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 -# continuing, set frr_wait_for to a "default" or certain prefix. -# frr_wait_for="default" -# Set the time limit for the wait. -# frr_wait_seconds="90" -# -# If the frr daemons require additional shared libraries to start, -# use the following variable to run ldconfig(8) in advance: -# frr_extralibs_path="/usr/local/lib ..." -# -# This RC script was adapted from the net/quagga port - -. /etc/rc.subr - -name=frr -rcvar=${name}_enable - -start_postcmd=start_postcmd -stop_postcmd="rm -f $pidfile" -configtest_cmd=check_config -extra_commands=configtest -command_args="-d" - -load_rc_config $name -: ${frr_enable:="NO"} -: ${frr_flags:=""} -: ${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"} - -check_config() -{ - echo "Checking $daemon.conf" - # pimd doesn't support -C - if [ "$daemon" = "pimd" ]; then - echo "Ignored" - else - $command $daemon_flags -C - result=$? - if [ "$result" -eq "0" ]; then - echo "OK" - else - echo "FAILED" - exit - fi - fi -} - -start_postcmd() -{ - local waited_for - waited_for=0 - # Wait only when last daemon has started. - if [ "${frr_daemons}" = "${frr_daemons% ${name}}" ]; then - return; - fi - if [ -n "${frr_wait_for}" ]; then - echo Waiting for ${frr_wait_for} route... - while [ ${waited_for} -lt ${frr_wait_seconds} ]; do - /sbin/route -n get ${frr_wait_for} >/dev/null 2>&1 && break; - waited_for=$((waited_for+1)) - sleep 1; - done - [ ${waited_for} -lt ${frr_wait_seconds} ] || echo Giving up... - fi -} - -do_cmd() -{ - local ret - ret=0 - frr_cmd=$1 - if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then - echo "Checking intergrated config..." - daemon="vtysh" - daemon_flags="" - command=%%PREFIX%%/bin/${daemon} - check_config - fi - for daemon in ${frr_daemons}; do - command=%%PREFIX%%/sbin/${daemon} - pidfile=/var/run/frr/${daemon}.pid - if ! checkyesno frr_vtysh_boot; then - required_files=%%ETCDIR%%/${daemon}.conf - if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then - check_config - fi - if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then - continue - fi - fi - if [ ${frr_cmd} = "stop" ] && [ -z "$(check_process ${command})" ]; then - continue - fi - eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\} - name=${daemon} - _rc_restart_done=false - run_rc_command "$1" || ret=1 - done - if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then - echo "Booting for integrated-vtysh-config..." - %%PREFIX%%/bin/vtysh -b - fi - return ${ret} -} - -frr_cmd=$1 - -case "$1" in - force*) - frr_cmd=${frr_cmd#force} - ;; - fast*) - frr_cmd=${frr_cmd#fast} - ;; -esac -shift - -if [ $# -ge 1 -a "$1" != "all" ]; then - frr_daemons="$*" -fi - -case "${frr_cmd}" in - start|quietstart) - if [ -n "${frr_extralibs_path}" ]; then - /sbin/ldconfig -m ${frr_extralibs_path} - fi - # Why should I need to add this check ? - checkyesno frr_enable && do_cmd "start" - ;; - stop) - frr_daemons=$(reverse_list ${frr_daemons}) - do_cmd "stop" - ;; - restart) - frr_daemons=$(reverse_list ${frr_daemons}) - do_cmd "stop" - frr_daemons=$(reverse_list ${frr_daemons}) - checkyesno frr_enable && do_cmd "start" - ;; - *) - do_cmd "${frr_cmd}" - ;; -esac diff --git a/net/frr7/files/patch-Makefile.am b/net/frr7/files/patch-Makefile.am deleted file mode 100644 index 25b0a94b4980..000000000000 --- a/net/frr7/files/patch-Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.am.orig 2020-06-30 11:08:57 UTC -+++ Makefile.am -@@ -134,7 +134,6 @@ include watchfrr/subdir.am - include qpb/subdir.am - include fpm/subdir.am - include grpc/subdir.am --include tools/subdir.am - include solaris/subdir.am - - include bgpd/subdir.am diff --git a/net/frr7/files/patch-yang_frr-zebra.yang.patch b/net/frr7/files/patch-yang_frr-zebra.yang.patch deleted file mode 100644 index 7ee309e0570b..000000000000 --- a/net/frr7/files/patch-yang_frr-zebra.yang.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 7573cb86a259d3c9ef6eae9dd5d529f8080922cd Mon Sep 17 00:00:00 2001 -From: Igor Ryzhov -Date: Thu, 22 Apr 2021 12:48:19 +0300 -Subject: [PATCH] yang: fix zebra module - -Fixes: #8521 -Signed-off-by: Igor Ryzhov ---- - yang/frr-zebra.yang | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git yang/frr-zebra.yang yang/frr-zebra.yang -index 2efc45c1464..6b4be659152 100644 ---- yang/frr-zebra.yang -+++ yang/frr-zebra.yang -@@ -2184,8 +2184,8 @@ module frr-zebra { - + "/frr-route-map:match-condition" - + "/frr-route-map:condition-value" { - case ipv4-prefix-length { -- when "./condition = 'ipv4-prefix-length' or -- ./condition = 'ipv4-next-hop-prefix-length'"; -+ when "./frr-route-map:condition = 'ipv4-prefix-length' or -+ ./frr-route-map:condition = 'ipv4-next-hop-prefix-length'"; - leaf ipv4-prefix-length { - type uint8 { - range "0..32"; -@@ -2193,7 +2193,7 @@ module frr-zebra { - } - } - case ipv6-prefix-length { -- when "./condition = 'ipv6-prefix-length'"; -+ when "./frr-route-map:condition = 'ipv6-prefix-length'"; - leaf ipv6-prefix-length { - type uint8 { - range "0..128"; -@@ -2201,13 +2201,13 @@ module frr-zebra { - } - } - case source-protocol { -- when "./condition = 'source-protocol'"; -+ when "./frr-route-map:condition = 'source-protocol'"; - leaf source-protocol { - type frr-route-types:frr-route-types; - } - } - case source-instance { -- when "./condition = 'source-instance'"; -+ when "./frr-route-map:condition = 'source-instance'"; - leaf source-instance { - type uint8 { - range "0..255"; -@@ -2222,14 +2222,14 @@ module frr-zebra { - + "/frr-route-map:set-action" - + "/frr-route-map:action-value" { - case source-v4 { -- when "./action = 'source'"; -+ when "./frr-route-map:action = 'source'"; - leaf source-v4 { - description "IPv4 address"; - type inet:ipv4-address; - } - } - case source-v6 { -- when "./action = 'source'"; -+ when "./frr-route-map:action = 'source'"; - leaf source-v6 { - description "IPv6 address"; - type inet:ipv6-address; diff --git a/net/frr7/files/watchfrr.in b/net/frr7/files/watchfrr.in deleted file mode 100644 index f3a36434e7f6..000000000000 --- a/net/frr7/files/watchfrr.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# PROVIDE: watchfrr -# REQUIRE: NETWORKING frr -# KEYWORD: nojailvtnet shutdown - -# Add the following line to /etc/rc.conf to enable watchfrr: -# watchfrr_enable="YES" -# -# 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 bfdd staticd" - -. /etc/rc.subr - -name=watchfrr -rcvar=${name}_enable - -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 babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd"} - -command=%%PREFIX%%/sbin/watchfrr -pidfile=/var/run/frr/watchfrr.pid - -run_rc_command "$1" diff --git a/net/frr7/pkg-descr b/net/frr7/pkg-descr deleted file mode 100644 index 1e9960661fb1..000000000000 --- a/net/frr7/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -FRRouting (FRR) is an IP routing protocol suite for Linux and Unix platforms -which includes protocol daemons for BGP, IS-IS, OSPF and RIP. FRR has its roots -in the Quagga project. diff --git a/net/frr7/pkg-message b/net/frr7/pkg-message deleted file mode 100644 index 243a734fdf17..000000000000 --- a/net/frr7/pkg-message +++ /dev/null @@ -1,19 +0,0 @@ -[ -{ type: install - message: <