From root@dgeo.sysadm.ec-m.fr  Tue Nov  6 15:21:15 2012
Return-Path: <root@dgeo.sysadm.ec-m.fr>
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 <dgeo@centrale-marseille.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc: flo@FreeBSD.org
Subject: [PATCH] sysutils/munin-node: use correct munin-sched pidfile
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         173423
>Category:       ports
>Synopsis:       [PATCH] sysutils/munin-node: use correct munin-sched pidfile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    flo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 06 15:30:01 UTC 2012
>Closed-Date:    Thu Dec 06 14:34:21 UTC 2012
>Last-Modified:  Thu Dec 06 14:34:21 UTC 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->flo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Nov 6 15:30:11 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173423 
State-Changed-From-To: open->closed 
State-Changed-By: flo 
State-Changed-When: Thu Dec 6 14:34:20 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173423 
>Unformatted:
