summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2011-03-22 08:37:04 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2011-03-22 08:37:04 +0000
commit604e42e103e9a7058e9b064f0ad39e80aa0463fb (patch)
treecaa7ebe0343163df7275a1ba6da88d2e267a5519 /net-analyzer/munin
parentNew Addition (diff)
downloadgentoo-2-604e42e103e9a7058e9b064f0ad39e80aa0463fb.tar.gz
gentoo-2-604e42e103e9a7058e9b064f0ad39e80aa0463fb.tar.bz2
gentoo-2-604e42e103e9a7058e9b064f0ad39e80aa0463fb.zip
Bug #359817: Fix accidently introduced echo from by debugging of pidfile code in init script.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/munin')
-rw-r--r--net-analyzer/munin/ChangeLog11
-rw-r--r--net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3 (renamed from net-analyzer/munin/files/munin-node_conf.d_1.4.5-r2)3
-rw-r--r--net-analyzer/munin/files/munin-node_init.d_1.4.5-r3 (renamed from net-analyzer/munin/files/munin-node_init.d_1.4.5-r2)2
-rw-r--r--net-analyzer/munin/munin-1.4.5-r3.ebuild (renamed from net-analyzer/munin/munin-1.4.5-r2.ebuild)2
4 files changed, 13 insertions, 5 deletions
diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index c5f32224d3c6..cd587af57a6f 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-analyzer/munin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.48 2011/03/16 06:29:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.49 2011/03/22 08:37:04 robbat2 Exp $
+
+*munin-1.4.5-r3 (22 Mar 2011)
+
+ 22 Mar 2011; Robin H. Johnson <robbat2@gentoo.org> -munin-1.4.5-r2.ebuild,
+ +munin-1.4.5-r3.ebuild, +files/munin-node_conf.d_1.4.5-r3,
+ +files/munin-node_init.d_1.4.5-r3, -files/munin-node_conf.d_1.4.5-r2,
+ -files/munin-node_init.d_1.4.5-r2:
+ Bug #359817: Fix accidently introduced echo from by debugging of pidfile code
+ in init script.
*munin-1.4.5-r2 (16 Mar 2011)
diff --git a/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r2 b/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3
index 648c8353a869..39df4369441c 100644
--- a/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r2
+++ b/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3
@@ -1,10 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r2,v 1.1 2011/03/16 06:29:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_conf.d_1.4.5-r3,v 1.1 2011/03/22 08:37:04 robbat2 Exp $
# Set to the nice level for daemon
NICE_LEVEL=1
PIDFILE=$(/usr/bin/awk '/^pid_file/{s=$2}END{print s}' /etc/munin/munin-node.conf)
-echo munin pid $PIDFILE
# vim: filetype=gentoo-conf-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_1.4.5-r2 b/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3
index 359470171fbf..d12c7763dd48 100644
--- a/net-analyzer/munin/files/munin-node_init.d_1.4.5-r2
+++ b/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_1.4.5-r2,v 1.1 2011/03/16 06:29:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_1.4.5-r3,v 1.1 2011/03/22 08:37:04 robbat2 Exp $
[ -z "${NAME}" ] && NAME="munin-node"
[ -z "${PIDFILE}" ] && PIDFILE=/var/run/munin/$NAME.pid
diff --git a/net-analyzer/munin/munin-1.4.5-r2.ebuild b/net-analyzer/munin/munin-1.4.5-r3.ebuild
index 91b69877beb6..9be65857f606 100644
--- a/net-analyzer/munin/munin-1.4.5-r2.ebuild
+++ b/net-analyzer/munin/munin-1.4.5-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.5-r2.ebuild,v 1.1 2011/03/16 06:29:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.5-r3.ebuild,v 1.1 2011/03/22 08:37:04 robbat2 Exp $
EAPI=2