From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 6 15:30:03 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 71AC0B54 for ; Tue, 6 Nov 2012 15:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 403658FC14 for ; Tue, 6 Nov 2012 15:30:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qA6FU3bF026712 for ; Tue, 6 Nov 2012 15:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qA6FU3B0026711; Tue, 6 Nov 2012 15:30:03 GMT (envelope-from gnats) Resent-Date: Tue, 6 Nov 2012 15:30:03 GMT Resent-Message-Id: <201211061530.qA6FU3B0026711@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, Geoffroy Desvernay Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 040A184A; Tue, 6 Nov 2012 15:21:15 +0000 (UTC) (envelope-from root@dgeo.sysadm.ec-m.fr) Received: from meli.ec-m.fr (meli.ec-m.fr [147.94.19.138]) by mx1.freebsd.org (Postfix) with ESMTP id A8BDB8FC0A; Tue, 6 Nov 2012 15:21:14 +0000 (UTC) Received: from amavis3.serv.int (amavis3.serv.int [10.3.0.47]) by meli.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 9DE77278A15; Tue, 6 Nov 2012 16:12:18 +0100 (CET) Received: from meli.ec-m.fr ([10.3.0.12]) by amavis3.serv.int (amavis3.serv.int [10.3.0.47]) (amavisd-new, port 10024) with LMTP id wvAdSBHaIauR; Tue, 6 Nov 2012 16:12:06 +0100 (CET) Received: from dgeo.sysadm.ec-m.fr (dgeo.sysadm.ec-m.fr [147.94.19.169]) by meli.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 912D7278863; Tue, 6 Nov 2012 16:12:07 +0100 (CET) Received: by dgeo.sysadm.ec-m.fr (Postfix, from userid 0) id 3C4AD1CD1B; Tue, 6 Nov 2012 16:12:06 +0100 (CET) Message-Id: <20121106151206.3C4AD1CD1B@dgeo.sysadm.ec-m.fr> Date: Tue, 6 Nov 2012 16:12:06 +0100 (CET) From: Geoffroy Desvernay To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/173423: [PATCH] sysutils/munin-node: use correct munin-sched pidfile Cc: flo@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Nov 2012 15:30:03 -0000 >Number: 173423 >Category: ports >Synopsis: [PATCH] sysutils/munin-node: use correct munin-sched pidfile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Nov 06 15:30:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Geoffroy Desvernay >Release: FreeBSD 9.1-RC2 amd64 >Organization: Ecole Centrale de Marseille >Environment: System: FreeBSD dgeo.sysadm.ec-m.fr 9.1-RC2 FreeBSD 9.1-RC2 #0: Thu Oct 25 10:51:08 CEST 2012 >Description: use correct pidfile for munin-sched rc script: pidfile is exctacted from munin-node.conf by default, thus resulting in being munin-node's pidfile ! Port maintainer (flo@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix) >How-To-Repeat: >Fix: --- munin-node-2.0.7.patch begins here --- diff -ruN --exclude=CVS ../munin-node.orig/files/munin-sched.in ./files/munin-sched.in --- ../munin-node.orig/files/munin-sched.in 2012-09-14 00:00:33.000000000 +0200 +++ ./files/munin-sched.in 2012-11-06 16:04:26.000000000 +0100 @@ -21,7 +21,7 @@ [ -z "$munin_sched_config" ] && munin_sched_config="%%PREFIX%%/etc/munin/munin-node.conf" command="%%PREFIX%%/sbin/munin-sched" -pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_sched_config` +pidfile=`awk '$1 == "pid_file" { gsub("node","sched",$2); print $2; }' $munin_sched_config` load_rc_config $name run_rc_command "$1" --- munin-node-2.0.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: