From nobody Tue Jan 7 12:37:44 2025 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 4YS9Yj12d9z5kVh1; Tue, 07 Jan 2025 12:37:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YS9Yj06Dkz45tj; Tue, 7 Jan 2025 12:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736253465; 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=34Ovm3Kki+h3hbMLXqSSBlDF8RAyjDviJYPCdqmEswY=; b=XBxsj+BrYmXRfVGKCIhyByTW1s3yt2iR5I3KCIO4shlsbntNCSRiarZ/TgOVyaMYV9LQ72 uX4toqfacVW9t6KJbGRTQjFgO869yXrjrXJeu9QO1Ut4A6BercC8I8LGrY9mXWS+eXfEs+ AOJK8Hxq/oTgvCr9bvDbqOy+g2fJ2Q27utEb9b+Uw41Wk0f8s88JR/9GQA23Qj7fjWvSKN Qan4r+G9K+LxwaAbeD1tI7MbQTfgk35keWerUCnq/ZxNcKmhhj/9F5GV4J1ZulsP0scMS/ v5o+8qL2nQR1l0v7TDKltKnsZGQqY/KROPWNKVDX8ApV0RtqPAEI/gSEm3fpSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736253465; 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=34Ovm3Kki+h3hbMLXqSSBlDF8RAyjDviJYPCdqmEswY=; b=X400jTSWmthN44rB9KjpoDFDWXRDJRIC8+wwDqQ9UVX0HI6oJkVYEZMkN1HLbQ+/GfLYLW OYxmD1Ju62rS2aZZF5HlWAkr5+VlM7qfT8tUTAskJm49HUiia7trKE5FHg+fwwXu00RC1+ PYbW95GSnfcdb7870mQBCgwEcU9PDdcIvA9epSqL1P93NoQ6Bu8JjX93URe5hKz+IHocPz UVIX2e2Qb3Ik+92fXy+QzJ0Av7EoHpZiI3dCBzAQSFSHcmftPncEVy8y7X4YHWwg9pTk4H dY+EolXrP5pJI+8NdsGtfHPE/i52vMUtDuFKdZVimPOzgEFfDM+iqK3jfeywoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736253465; a=rsa-sha256; cv=none; b=sT9bHhAYUR77eHG+6bBsxXhb/32P6OuzjVqJHTIufY4kpaAG2n51kmiOM63B1o1oo+2yKo hbE3lEXt3IUtL/1+2U/U4M1jc336zJvAfL+hQ1BtehFhlzyCYRogOVYlZKB9K9hvBPlKzw 2/g7hjR3+3fcTbXQP+4btBoRTtyW82o5PMOCkVw+CUHKc+ARDtbxoUhnkkRUqNvsqXziSD NHRHQEfjaMLjRq4tDwYTxTgIseBV/npi/i1v/nf4YSWQTJ3OSd2jbnjFO4xCQQJxMgNwi7 ycoUYmUjeJl1rT9fLfhin07NeXx48BuKiaZNtHAiP1qLE16GvO2XFnEVLoPBPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YS9Yh6dl0z194b; Tue, 07 Jan 2025 12:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 507CbiH7091667; Tue, 7 Jan 2025 12:37:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 507CbiZM091664; Tue, 7 Jan 2025 12:37:44 GMT (envelope-from git) Date: Tue, 7 Jan 2025 12:37:44 GMT Message-Id: <202501071237.507CbiZM091664@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: e187310c4e2f - main - net/frr8: Update to 8.5.7 and backport the RC script from net/frr10 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: e187310c4e2f0916403e3b7d44fc926450335813 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=e187310c4e2f0916403e3b7d44fc926450335813 commit e187310c4e2f0916403e3b7d44fc926450335813 Author: Olivier Cochard AuthorDate: 2025-01-07 12:34:30 +0000 Commit: Olivier Cochard CommitDate: 2025-01-07 12:34:30 +0000 net/frr8: Update to 8.5.7 and backport the RC script from net/frr10 Sponsored by: Netflix --- net/frr8/Makefile | 3 +- net/frr8/distinfo | 6 +- net/frr8/files/frr.in | 234 +++++++++++++++++++++++++++++++++----------------- 3 files changed, 159 insertions(+), 84 deletions(-) diff --git a/net/frr8/Makefile b/net/frr8/Makefile index c26f3994931c..31489d751c72 100644 --- a/net/frr8/Makefile +++ b/net/frr8/Makefile @@ -1,7 +1,6 @@ PORTNAME= frr -PORTVERSION= 8.5.6 +PORTVERSION= 8.5.7 DISTVERSIONPREFIX= frr- -PORTREVISION= 1 CATEGORIES= net .if defined(PYTHONTOOLS) PKGNAMESUFFIX= 8-pythontools diff --git a/net/frr8/distinfo b/net/frr8/distinfo index 1e3e1cc52f91..88e9e7fe240a 100644 --- a/net/frr8/distinfo +++ b/net/frr8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727185675 -SHA256 (FRRouting-frr-frr-8.5.6_GH0.tar.gz) = 5f3a32e66efdf2628548165d10327688847443c342788b31c4ea98368cfacbf8 -SIZE (FRRouting-frr-frr-8.5.6_GH0.tar.gz) = 10081875 +TIMESTAMP = 1736250092 +SHA256 (FRRouting-frr-frr-8.5.7_GH0.tar.gz) = 0981830040fb115aa0e3f2da4e6ba344c7752151cbcaecb2364b726c122ab934 +SIZE (FRRouting-frr-frr-8.5.7_GH0.tar.gz) = 10082850 diff --git a/net/frr8/files/frr.in b/net/frr8/files/frr.in index 222e56234729..fde3fe805f64 100644 --- a/net/frr8/files/frr.in +++ b/net/frr8/files/frr.in @@ -6,16 +6,38 @@ # Add the following line to /etc/rc.conf to enable frr: # frr_enable="YES" -# + +# FRR's daemon management concept: +# - watchfrr is used to manage (start/monitor/restart) all frr deamons; +# - vtysh used to daemons boot startup configuration; +# There are a minimum of 3 daemons running: watchfrr, zebra + +# Startup details with watchfrr enabled (default): +# 1. "service frr start" calls "service frr start watchfrr" +# 2. watchfrr once started calls "service frr restart all" +# 3. "restart all" need to loop the list of $frr_daemons to start each +# of then +# 4. vtysh -b is executed to load boot startup configuration + +# Startup detail with watchfrr disabled (deprecated mode): +# 1. "service frr start" call "service frr start all" and need to loop $frr_daemons + +# To select a limited set of daemons to run, use the frr_daemons. +# Order matters: keep zebra first +# Example to start only staticd and bgpd: +# frr_daemons="zebra staticd bgpd" + # 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" +# To disable integrated configuration mode, to use one configuration file per +# daemons. +# This mode is deprecated and not compatible with watchfrr +# frr_vtysh_boot="NO" +# watchfrr_enable="NO" + # Global tuning -# frr_flags="" -# Per daemon tuning may be done with daemon_name_flags +# frr_flags="--limit-fds 100000" (restricting fds for each daemons) +# frr_default_profile="datacenter" (default: traditional) +# 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 @@ -28,7 +50,10 @@ # 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 +# This RC script was adapted from: +# - FRR's tools/frrinit.sh.in (starting watchfrr) +# - FRR's tools/frrcommon.sh.in (starting frr daemons) +# - FRR's tools/etc/frr/daemons (default daemon flags) . /etc/rc.subr @@ -36,39 +61,33 @@ 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_flags:="--limit-fds 100000"} +: ${watchfrr_enable:="YES"} : ${frr_daemons:="zebra babeld bfdd bgpd eigrpd fabricd isisd ospfd ospf6d ripd ripngd staticd"} -: ${frr_vtysh_boot:="NO"} +: ${watchfrr_flags:="-r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30"} +: ${frr_default_profile:="traditional"} +: ${frr_vtysh_boot:="YES"} : ${frr_wait_for:=""} : ${frr_wait_seconds:="90"} +# Default daemons'flag restrict binding vty's to localhost +: ${zebra_flags:="-A 127.0.0.1"} +: ${babeld_flags:="-A 127.0.0.1"} +: ${bgpd_flags:="-A 127.0.0.1"} +: ${eigrpd_flags:="-A 127.0.0.1"} +: ${fabricd_flags:="-A 127.0.0.1"} +: ${isisd_flags:="-A 127.0.0.1"} +: ${ospfd_flags:="-A 127.0.0.1"} +: ${ospf6d_flags:="-A ::1"} +: ${ripd_flags:="-A 127.0.0.1"} +: ${ripngd_flags:="-A ::1"} +: ${staticd_flags:="-A 127.0.0.1"} +frr_flags="${frr_flags} -F ${frr_default_profile}" -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() -{ +start_postcmd() { local waited_for waited_for=0 # Wait only when last daemon has started. @@ -86,50 +105,61 @@ start_postcmd() fi } -do_cmd() -{ +do_cmd() { + # Entering here, global var dmn contains the daemon name + # $1 the daemon name (must be uniq and cannot be all) local ret + local cmd + local dmn 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} - if ! [ -f %%ETCDIR%%/vtysh.conf ]; then - touch %%ETCDIR%%/vtysh.conf + dmn=$1 + if [ -n "${dmn}" ] && [ "${dmn}" != "all" ]; then + command=%%PREFIX%%/sbin/${dmn} + pidfile=/var/run/frr/${dmn}.pid + eval flags=\$\{${dmn}_flags:-\"\"\} + flags="${flags} ${frr_flags}" + if [ "${dmn}" = "watchfrr" ]; then + # watchfrr is expecting all daemon names as flags + flags="${flags} ${watchfrr_daemons}" fi - check_config + name=${dmn} + _rc_restart_done=false + stop_postcmd="rm -f $pidfile" + run_rc_command "${frr_cmd}" || ret=1 + else + echo "Bug in do_cmd(): called without argument or with all" + ret=1 fi + return ${ret} +} + +vtysh_b () { + local ret + ret=0 + if checkyesno frr_vtysh_boot; then + %%PREFIX%%/bin/vtysh -b || ret=1 + fi + return ${ret} +} + +loop_do_cmd() { + local ret + local daemon + ret=0 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 + do_cmd ${daemon} || 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 + if ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then + vtysh_b || ret=1 fi return ${ret} } frr_cmd=$1 +# remove unsuported extra command +# Example: "service frr fast start" is replaced by "service frr start" + case "$1" in force*) frr_cmd=${frr_cmd#force} @@ -140,29 +170,75 @@ case "$1" in esac shift -if [ $# -ge 1 -a "$1" != "all" ]; then - frr_daemons="$*" +# If daemon specified, replace the full list by its name +# or with watchfrr if not disabled +# Example: extract "bgpd" from a "service frr start bgpd" +if [ $# -ge 1 ]; then + if [ "$1" != "all" ]; then + frr_daemons=$1 + fi +else + if checkyesno watchfrr_enable; then + watchfrr_daemons=${frr_daemons} + frr_daemons=watchfrr + fi fi case "${frr_cmd}" in start|quietstart) - if [ -n "${frr_extralibs_path}" ]; then - /sbin/ldconfig -m ${frr_extralibs_path} + if checkyesno frr_enable; then + if [ -n "${frr_extralibs_path}" ]; then + /sbin/ldconfig -m ${frr_extralibs_path} + fi + if [ -x %%PREFIX%%/etc/rc.d/watchfrr ]; then + echo "WARNING: Old rc.d/watchfrr detected, this file must be deleted" + fi + if checkyesno frr_vtysh_boot; then + echo "Checking intergrated config..." + if ! [ -f %%ETCDIR%%/vtysh.conf ]; then + mkdir -p %%ETCDIR%% + echo "service integrated-vtysh-config" > %%ETCDIR%%/vtysh.conf + fi + if ! [ -f %%ETCDIR%%/frr.conf ]; then + echo "log syslog informational" > %%ETCDIR%%/frr.conf + fi + chown -R frr:frr %%ETCDIR%% + fi + loop_do_cmd 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" + if checkyesno frr_enable; then + # watchfrr do not stop all daemons, so need to stop it first + # then continuing with all others daemons + if [ "${frr_daemons}" = "watchfrr" ]; then + loop_do_cmd + frr_daemons=${watchfrr_daemons} + fi + frr_daemons=$(reverse_list ${frr_daemons}) + loop_do_cmd + fi ;; restart) - frr_daemons=$(reverse_list ${frr_daemons}) - do_cmd "stop" - frr_daemons=$(reverse_list ${frr_daemons}) - checkyesno frr_enable && do_cmd "start" + if checkyesno frr_enable; then + # watchfrr calls "service frr restart all" at startup + # to start all services + frr_daemons=$(reverse_list ${frr_daemons}) + frr_cmd=stop + loop_do_cmd + frr_daemons=$(reverse_list ${frr_daemons}) + frr_cmd=start + loop_do_cmd + fi + ;; + reload) + if ! [ -x %%PREFIX%%/sbin/frr-reload.py ]; then + echo "Please install frr-pythontools package. Required for reload" + exit 0 + fi + %%PREFIX%%/sbin/frr-reload.py --reload --confdir %%ETCDIR%% --rundir /var/run/frr %%ETCDIR%%/frr.conf ;; *) - do_cmd "${frr_cmd}" + loop_do_cmd ;; esac