From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 17 03:50:18 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53E5F16A4E0 for ; Mon, 17 Jul 2006 03:50:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F59D43D53 for ; Mon, 17 Jul 2006 03:50:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6H3oGKn026981 for ; Mon, 17 Jul 2006 03:50:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6H3oGUJ026980; Mon, 17 Jul 2006 03:50:16 GMT (envelope-from gnats) Resent-Date: Mon, 17 Jul 2006 03:50:16 GMT Resent-Message-Id: <200607170350.k6H3oGUJ026980@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Boris Kovalenko Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D47316A4DA for ; Mon, 17 Jul 2006 03:42:01 +0000 (UTC) (envelope-from boris@ntmk.ru) Received: from mail.ntmk.ru (mail.ntmk.ru [217.114.241.6]) by mx1.FreeBSD.org (Postfix) with ESMTP id 564E143D70 for ; Mon, 17 Jul 2006 03:41:59 +0000 (GMT) (envelope-from boris@ntmk.ru) Received: from boris.nikom.ru ([10.1.16.195]) by mail.ntmk.ru with esmtp (Exim 4.62) (envelope-from ) id 1G2Jza-0005ox-5U for FreeBSD-gnats-submit@freebsd.org; Mon, 17 Jul 2006 09:41:58 +0600 Received: from root by boris.nikom.ru with local (Exim 4.62 (FreeBSD)) (envelope-from ) id 1G2Jza-000Fuh-2j for FreeBSD-gnats-submit@freebsd.org; Mon, 17 Jul 2006 09:41:58 +0600 Message-Id: Date: Mon, 17 Jul 2006 09:41:58 +0600 From: Boris Kovalenko To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/100421: [MAINTAINER UPDATE] net/quagga: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jul 2006 03:50:18 -0000 >Number: 100421 >Category: ports >Synopsis: [MAINTAINER UPDATE] net/quagga: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 17 03:50:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Boris Kovalenko >Release: FreeBSD 6.1-RELEASE i386 >Organization: JSC "TAGNet" >Environment: System: FreeBSD boris.nikom.ru 6.1-RELEASE FreeBSD 6.1-RELEASE #1: Wed May 10 10:43:32 YEKST 2006 >Description: [DESCRIBE CHANGES] Some enhacements to rc.d scripts. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- quagga-0.99.4_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/quagga/files/quagga.sh.in /usr/ports/net/quagga.new/files/quagga.sh.in --- /usr/ports/net/quagga/files/quagga.sh.in Tue May 30 08:54:23 2006 +++ /usr/ports/net/quagga.new/files/quagga.sh.in Mon Jul 17 09:38:39 2006 @@ -2,9 +2,7 @@ # # PROVIDE: quagga -# REQUIRE: netif routing mountcritlocal -# BEFORE: NETWORKING -# KEYWORD: shutdown +# REQUIRE: NETWORKING # # Add the following line to /etc/rc.conf to enable quagga: @@ -13,6 +11,10 @@ # You may also wish to use the following variables to fine-tune startup: #quagga_flags="-d" #quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd" +# Per daemon tuning may be done with daemon_name_flags +#zebra_flags="-dP 0" +#bgpd_flags="-dnrP 0" and so on +# # # If the quagga daemons require additional shared libraries to start, # use the following variable to run ldconfig(8) in advance: @@ -34,12 +36,13 @@ # set defaults -quagga_enable=${quagga_enable:-"NO"} -quagga_flags=${quagga_flags:-"-d"} -quagga_daemons=${quagga_daemons:-"zebra ripd ripngd ospfd ospf6d bgpd isisd"} -quagga_extralibs_path=${quagga_extralibs_path:-""} load_rc_config $name +: ${quagga_enable="NO"} +: ${quagga_flags="-d"} +: ${quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"} +: ${quagga_extralibs_path=""} + quagga_cmd=$1 case "$1" in @@ -72,5 +75,6 @@ if [ ${quagga_cmd} = "stop" -a -z $(check_process ${command}) ]; then continue fi + eval flags=\$\{${daemon}_flags:-\"${quagga_flags}\"\} run_rc_command "$1" done diff -ruN --exclude=CVS /usr/ports/net/quagga/files/watchquagga.sh.in /usr/ports/net/quagga.new/files/watchquagga.sh.in --- /usr/ports/net/quagga/files/watchquagga.sh.in Tue May 30 08:54:23 2006 +++ /usr/ports/net/quagga.new/files/watchquagga.sh.in Mon Jul 17 09:37:23 2006 @@ -2,9 +2,7 @@ # # PROVIDE: watchquagga -# REQUIRE: netif routing mountcritlocal quagga -# BEFORE: NETWORKING -# KEYWORD: shutdown +# REQUIRE: NETWORKING quagga # # Add the following line to /etc/rc.conf to enable quagga: @@ -30,9 +28,10 @@ # set defaults -watchquagga_enable=${watchquagga_enable:-"NO"} -watchquagga_flags=${watchquagga_flags:-""} load_rc_config $name + +: ${watchquagga_enable="NO"} +: ${watchquagga_flags=""} command=%%PREFIX%%/sbin/watchquagga pidfile=%%LOCALSTATE_DIR%%/watchquagga.pid --- quagga-0.99.4_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: