Initial commit. Bug #76018. Final ebuild by Robin H. Johnson <robbat2@gentoo.org>, with signicent contributions by Allen Parker <infowolfe@gmail.com>.

(Portage version: 2.1.1_pre1-r5)

7 files changed, 460 insertions, 0 deletions

diff --git a/net-analyzer/munin/files/digest-munin-1.3.2 b/net-analyzer/munin/files/digest-munin-1.3.2
new file mode 100644
index 000000000000..3bc37b06a1a9
--- /dev/null
+++ b/net-analyzer/munin/files/digest-munin-1.3.2
@@ -0,0 +1,3 @@
+MD5 9eef4a53626cee0e088391c5deb8bd51 munin_1.3.2.tar.gz 309319
+RMD160 7bcc16d00ad28731041015ef240144ed0c4fdeb4 munin_1.3.2.tar.gz 309319
+SHA256 964887d3af5b5b1fadbabb4c887095820613ea06c768251d6a9c37fa35efcc40 munin_1.3.2.tar.gz 309319
diff --git a/net-analyzer/munin/files/munin-1.3.2-Makefile.patch b/net-analyzer/munin/files/munin-1.3.2-Makefile.patch
new file mode 100644
index 000000000000..2eec3a4f2e7b
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.2-Makefile.patch
@@ -0,0 +1,247 @@
+diff -Nuar --exclude '*~' munin-1.3.2.orig/Makefile munin-1.3.2/Makefile
+--- munin-1.3.2.orig/Makefile	2005-04-15 13:37:29.000000000 -0700
++++ munin-1.3.2/Makefile	2006-07-10 13:03:36.000000000 -0700
+@@ -17,64 +17,65 @@
+ 
+ install-main: build
+ 	$(CHECKUSER)
+-	mkdir -p $(CONFDIR)/templates
+-	mkdir -p $(LIBDIR)
+-	mkdir -p $(BINDIR)
+-	mkdir -p $(PERLLIB)
+-
+-	mkdir -p $(LOGDIR)
+-	mkdir -p $(STATEDIR)
+-	mkdir -p $(HTMLDIR)
+-	mkdir -p $(DBDIR)
+-	mkdir -p $(CGIDIR)
++	mkdir -p $(DESTDIR)$(CONFDIR)/templates
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	mkdir -p $(DESTDIR)$(BINDIR)
++	mkdir -p $(DESTDIR)$(PERLLIB)
++
++	mkdir -p $(DESTDIR)$(LOGDIR)
++	mkdir -p $(DESTDIR)$(STATEDIR)
++	mkdir -p $(DESTDIR)$(HTMLDIR)
++	mkdir -p $(DESTDIR)$(DBDIR)
++	mkdir -p $(DESTDIR)$(CGIDIR)
+ 
+-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
++	$(CHOWN) $(USER) $(DESTDIR)$(LOGDIR) $(DESTDIR)$(STATEDIR) $(DESTDIR)$(RUNDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR)
+ 
+ 	for p in build/server/*.tmpl; do    		              \
+-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
++		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
+ 	done
+-	$(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/
+-	$(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
+-	$(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
++	$(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/
++	$(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/
++	$(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/
+ 
+-	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
++	test -f "$(DESTDIR)$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/server/munin.conf $(DESTDIR)$(CONFDIR)/
+ 
+-	$(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
++	$(INSTALL) -m 0755 build/server/munin-cron $(DESTDIR)$(BINDIR)/
+ 
+-	$(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
+-	$(INSTALL) -m 0755 build/server/munin-graph $(LIBDIR)/
+-	$(INSTALL) -m 0755 build/server/munin-html $(LIBDIR)/
+-	$(INSTALL) -m 0755 build/server/munin-limits $(LIBDIR)/
+-	$(INSTALL) -m 0755 build/server/munin-cgi-graph $(CGIDIR)/
++	$(INSTALL) -m 0755 build/server/munin-update $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 build/server/munin-graph $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 build/server/munin-html $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 build/server/munin-limits $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 build/server/munin-cgi-graph $(DESTDIR)$(CGIDIR)/
+ 
+-	$(INSTALL) -m 0644 build/server/Munin.pm $(PERLLIB)/
++	$(INSTALL) -m 0644 build/server/Munin.pm $(DESTDIR)$(PERLLIB)/
+ 
+ install-node: build install-node-non-snmp install-node-snmp
+ 	echo Done.
+ 
+ install-node-snmp: build
+-	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(SBINDIR)/
++	mkdir -p $(DESTDIR)$(SBINDIR)
++	$(INSTALL) -m 0755 build/node/munin-node-configure-snmp $(DESTDIR)$(SBINDIR)/
+ 
+ install-node-non-snmp: build
+ 	$(CHECKGROUP)
+-	mkdir -p $(CONFDIR)/plugins
+-	mkdir -p $(CONFDIR)/plugin-conf.d
+-	mkdir -p $(LIBDIR)/plugins
+-	mkdir -p $(SBINDIR)
+-	mkdir -p $(PERLLIB)/Munin/Plugin
+-
+-	mkdir -p $(LOGDIR)
+-	mkdir -p $(STATEDIR)
+-	mkdir -p $(PLUGSTATE)
+-
+-	$(CHGRP) $(GROUP) $(PLUGSTATE)
+-	$(CHMOD) 775 $(PLUGSTATE)
+-	$(CHMOD) 755 $(CONFDIR)/plugin-conf.d
+-
+-	$(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
+-	$(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
+-	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
+-	$(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
++	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
++	mkdir -p $(DESTDIR)$(SBINDIR)
++	mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Plugin
++
++	mkdir -p $(DESTDIR)$(LOGDIR)
++	mkdir -p $(DESTDIR)$(STATEDIR)
++	mkdir -p $(DESTDIR)$(PLUGSTATE)
++
++	$(CHGRP) $(GROUP) $(DESTDIR)$(PLUGSTATE)
++	$(CHMOD) 775 $(DESTDIR)$(PLUGSTATE)
++	$(CHMOD) 755 $(DESTDIR)$(CONFDIR)/plugin-conf.d
++
++	$(INSTALL) -m 0755 build/node/munin-node $(DESTDIR)$(SBINDIR)/
++	$(INSTALL) -m 0755 build/node/munin-node-configure $(DESTDIR)$(SBINDIR)/
++	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
++	$(INSTALL) -m 0755 build/node/munin-run $(DESTDIR)$(SBINDIR)/
+ 	
+ install-node-plugins: build
+ 	for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do    		\
+@@ -82,41 +83,41 @@
+ 			family=`sed -n 's/^#%# family=\(.*\)$$/\1/p' $$p`;  		\
+ 			test "$$family" || family=contrib;                  		\
+ 			if echo $(INSTALL_PLUGINS) | grep $$family >/dev/null; then 	\
+-				test -f "$(LIBDIR)/plugins/`basename $$p`"		\
+-				|| $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/;    		\
++				test -f "$(DESTDIR)$(LIBDIR)/plugins/`basename $$p`"		\
++				|| $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;    		\
+ 			fi;                                                 		\
+ 		fi                                                          		\
+ 	done
+-	$(INSTALL) -m 0644 build/node/plugins.history $(LIBDIR)/plugins/
++	$(INSTALL) -m 0644 build/node/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
+ 
+ 	#TODO:
+ 	#configure plugins.
+ 
+ install-man: build-man
+-	mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
+-	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/
+-	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/
+-	$(INSTALL) -m 0644 build/doc/munin-node.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-run.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
++	mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
++	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/
++	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/
++	$(INSTALL) -m 0644 build/doc/munin-node.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-node-configure.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-node-configure-snmp.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-run.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/
+ 
+ install-doc: build-doc
+-	mkdir -p $(DOCDIR)
+-	$(INSTALL) -m 0644 build/doc/munin-doc.html $(DOCDIR)/
+-	$(INSTALL) -m 0644 build/doc/munin-doc.pdf $(DOCDIR)/
+-	$(INSTALL) -m 0644 build/doc/munin-doc.txt $(DOCDIR)/
+-	$(INSTALL) -m 0644 build/doc/munin-faq.html $(DOCDIR)/
+-	$(INSTALL) -m 0644 build/doc/munin-faq.pdf $(DOCDIR)/
+-	$(INSTALL) -m 0644 build/doc/munin-faq.txt $(DOCDIR)/
+-	$(INSTALL) -m 0644 README.* $(DOCDIR)/
+-	$(INSTALL) -m 0644 COPYING $(DOCDIR)/
+-	$(INSTALL) -m 0644 node/node.d/README $(DOCDIR)/README.plugins
++	mkdir -p $(DESTDIR)$(DOCDIR)
++	$(INSTALL) -m 0644 build/doc/munin-doc.html $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 build/doc/munin-doc.pdf $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 build/doc/munin-doc.txt $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 build/doc/munin-faq.html $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 build/doc/munin-faq.pdf $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 build/doc/munin-faq.txt $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 README.* $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 node/node.d/README $(DESTDIR)$(DOCDIR)/README.plugins
+ 
+ build: build-stamp
+ 
+diff -Nuar --exclude '*~' munin-1.3.2.orig/Makefile.config munin-1.3.2/Makefile.config
+--- munin-1.3.2.orig/Makefile.config	2005-04-15 13:29:18.000000000 -0700
++++ munin-1.3.2/Makefile.config	2006-07-10 13:04:07.000000000 -0700
+@@ -7,10 +7,10 @@
+ #
+ # the base of the Munin installation.
+ # 
+-PREFIX     = $(DESTDIR)/opt/munin
++PREFIX     = /usr
+ 
+ # Where Munin keeps its configurations (server.conf, client.conf, ++)
+-CONFDIR    = $(DESTDIR)/etc/opt/munin
++CONFDIR    = /etc/munin
+ 
+ # Server only - where to put munin-cron
+ BINDIR     = $(PREFIX)/bin
+@@ -19,31 +19,31 @@
+ SBINDIR    = $(PREFIX)/sbin
+ 
+ # Where to put text and html documentation
+-DOCDIR     = $(PREFIX)/doc
++DOCDIR     = $(PREFIX)/share/doc/munin-$(VERSION)
+ 
+ # Where to put man pages
+ MANDIR     = $(PREFIX)/man
+ 
+ # Where to put internal binaries and plugin repository
+-LIBDIR     = $(PREFIX)/lib
++LIBDIR     = $(PREFIX)/libexec/munin
+ 
+ # Server only - Output directory
+-HTMLDIR    = $(PREFIX)/var/www
+-CGIDIR     = $(HTMLDIR)/cgi
++HTMLDIR    = /var/www/localhost/htdocs/munin
++CGIDIR     = /var/www/localhost/cgi-bin
+ 
+ # Client only - Where to put RRD files and other intenal data
+-DBDIR      = $(DESTDIR)/var/opt/munin
++DBDIR      = /var/lib/munin
+ 
+ # Client only - Where plugins should put their states. Must be writable by
+ # group "munin", and should be preserved between reboots
+ PLUGSTATE  = $(DBDIR)/plugin-state
+ 
+ # Where Munin should place its logs.
+-LOGDIR     = $(DESTDIR)/var/log/munin
++LOGDIR     = /var/log/munin
+ 
+ # Location of PID files and other statefiles. On the server, must be
+ # writable by the user "munin".
+-STATEDIR   = $(DESTDIR)/var/run/munin
++STATEDIR   = /var/run/munin
+ 
+ # The perl interpreter to use
+ PERL       = $(shell which perl)
+@@ -52,10 +52,11 @@
+ PYTHON     = /usr/bin/env python
+ 
+ # Server only - Where to install the perl libraries
+-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
++PERLLIB    = $(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
+ 
+ # Client only - Install plugins for this architecture
+-OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
++# LANG=C is because some locales are a bit different in their alphabet (eg ee_EE).
++OSTYPE     = $(shell uname | LANG=C tr '[A-Z]' '[a-z]')
+ 
+ # How to figure out the hostname. (Only used in default configuration
+ # files)
diff --git a/net-analyzer/munin/files/munin-1.3.2-crontab b/net-analyzer/munin/files/munin-1.3.2-crontab
new file mode 100644
index 000000000000..804971a31a50
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.2-crontab
@@ -0,0 +1,16 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-1.3.2-crontab,v 1.1 2006/07/11 09:18:47 robbat2 Exp $
+# 
+# This runs the munin task every 5 minutes.
+*/5	* * * *		[ -x /usr/bin/munin-cron ] && /usr/bin/munin-cron
+
+# Alternatively, this route works differently
+# Update once a minute (for busy sites)
+#*/1 * * * *		[ -x /usr/libexec/munin/munin-update ] && /usr/libexec/munin/munin-update
+## Check for limit excess every 2 minutes
+#*/2 * * * *		[ -x /usr/libexec/munin/munin-limits ] && /usr/libexec/munin/munin-limits
+## Update graphs every 5 minutes
+#*/5 * * * *		[ -x /usr/libexec/munin/munin-graph  ] && nice /usr/libexec/munin/munin-graph --cron
+## Update HTML pages every 15 minutes
+#*/15 * * * *		[ -x /usr/libexec/munin/munin-html   ] && nice /usr/libexec/munin/munin-html
diff --git a/net-analyzer/munin/files/munin-1.3.2-plugin-cleanup.patch b/net-analyzer/munin/files/munin-1.3.2-plugin-cleanup.patch
new file mode 100644
index 000000000000..c22547adec94
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.2-plugin-cleanup.patch
@@ -0,0 +1,26 @@
+diff -Nuar --exclude '*~' munin-1.3.2.orig/node/node.d.linux/iostat_ios.in munin-1.3.2/node/node.d.linux/iostat_ios.in
+--- munin-1.3.2.orig/node/node.d.linux/iostat_ios.in	2005-04-15 13:29:18.000000000 -0700
++++ munin-1.3.2/node/node.d.linux/iostat_ios.in	2006-07-11 02:05:50.618754305 -0700
+@@ -53,12 +53,16 @@
+ 
+ sub filter {
+     my ($major, $minor, $tmpnam);
+-    return 0 if ($major ==   1); # RAM devices
+-    return 0 if ($major ==   9); # MD devices
+-    return 0 if ($major ==  58); # LVM devices
+-    return 0 if ($major == 254); # LVM2 devices
+-    return 0 if ($tmpnam =~ /part\d+$/);
+-    return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
++	if(defined($major)) {
++		return 0 if ($major ==   1); # RAM devices
++		return 0 if ($major ==   9); # MD devices
++		return 0 if ($major ==  58); # LVM devices
++		return 0 if ($major == 254); # LVM2 devices
++	}
++	if(defined($tmpnam)) {
++		return 0 if ($tmpnam =~ /part\d+$/);
++		return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
++	}
+ 
+     return 1;
+ }
diff --git a/net-analyzer/munin/files/munin-1.3.2-plugins.conf b/net-analyzer/munin/files/munin-1.3.2-plugins.conf
new file mode 100644
index 000000000000..977f8b49c3d5
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.2-plugins.conf
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-1.3.2-plugins.conf,v 1.1 2006/07/11 09:18:47 robbat2 Exp $
+#
+# This file contains configuration options for the plugins. Three
+# options are understood by munin-node itself:
+#
+# 	user <user>         # Set the user to run the plugin as
+# 	group <group>       # Set the group to run the plugin as
+# 	command <command>   # Run <command> instead of the plugin. %c
+# 	                      expands to what would normally be run.
+#   env.<variable>      # Sets <variable> in the plugin's environment, see the
+#                         individual plugins to find out which variables they
+#                         care about.
+#
+#
+
+[smart_*]
+user root
+group disk
+
+# Example for a 3ware 8000-series card, with 2 disks
+# use /dev/twe0 as the actual device
+# and replicate this entry for each drive, increasing the number in -d
+#[smart_3ware-0_twe0]
+#user root
+#group root
+#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,0
+#[smart_3ware-1_twe0]
+#user root
+#group root
+#env.smartargs -H -i -c -l error -l selftest -l selective -a -d 3ware,1
+
+[bind9*]
+user root
+
+[iostat*]
+user munin
+group munin
+
+[vlan*]
+user root
+
+[postfix*]
+user root
+env.logfile maillog
+
+[sendmail*]
+env.mspqueue /var/spool/clientmqueue
+
+[mysql*]
+#env.mysqlopts -u someuser
+
+[exim*]
+group mail
+
+[cps*]
+user root
+
+# More 3ware examples
+#[hddtemp_smartctl]
+#env.drives twe0_0 twe0_1 hda
+#env.type_twe0_0 3ware,0
+#env.type_twe0_1 3ware,1
diff --git a/net-analyzer/munin/files/munin-1.3.2-rrdtool-comments.patch b/net-analyzer/munin/files/munin-1.3.2-rrdtool-comments.patch
new file mode 100644
index 000000000000..100352b4354e
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.3.2-rrdtool-comments.patch
@@ -0,0 +1,78 @@
+diff -Nuar --exclude '*~' munin-1.3.2.orig/server/munin-graph.in munin-1.3.2/server/munin-graph.in
+--- munin-1.3.2.orig/server/munin-graph.in	2005-04-15 13:31:22.000000000 -0700
++++ munin-1.3.2/server/munin-graph.in	2006-07-10 21:41:42.000000000 -0700
+@@ -649,10 +649,10 @@
+ 	    elsif ($global_headers == 1)
+ 	    {
+ 		push (@rrd, "COMMENT:" . (" " x $max_field_len));
+-		push (@rrd, "COMMENT: Cur:");
+-		push (@rrd, "COMMENT:Min:");
+-		push (@rrd, "COMMENT:Avg:");
+-		push (@rrd, "COMMENT:Max:  \\j");
++		push (@rrd, "COMMENT: Cur\\:");
++		push (@rrd, "COMMENT:Min\\:");
++		push (@rrd, "COMMENT:Avg\\:");
++		push (@rrd, "COMMENT:Max\\:  \\j");
+ 		$global_headers++;
+ 	    }
+ 
+@@ -725,13 +725,13 @@
+ 	    }
+ 	    else
+ 	    {
+-		push (@rrd, "COMMENT: Cur:") unless $global_headers;
++		push (@rrd, "COMMENT: Cur\\:") unless $global_headers;
+ 		push (@rrd, "GPRINT:c$rrdname:LAST:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, "yes")?"%s":"") . "");
+-		push (@rrd, "COMMENT: Min:") unless $global_headers;
++		push (@rrd, "COMMENT: Min\\:") unless $global_headers;
+ 		push (@rrd, "GPRINT:i$rrdname:MIN:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
+-		push (@rrd, "COMMENT: Avg:") unless $global_headers;
++		push (@rrd, "COMMENT: Avg\\:") unless $global_headers;
+ 		push (@rrd, "GPRINT:g$rrdname:AVERAGE:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
+-		push (@rrd, "COMMENT: Max:") unless $global_headers;
++		push (@rrd, "COMMENT: Max\\:") unless $global_headers;
+ 		push (@rrd, "GPRINT:a$rrdname:MAX:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "\\j");
+ 		push (@{$total_pos{'min'}}, "i$rrdname");
+ 		push (@{$total_pos{'avg'}}, "g$rrdname");
+@@ -792,13 +792,13 @@
+ 	    
+ 	    push (@rrd, "CDEF:dpostotal=ipostotal,UN,ipostotal,UNKN,IF");
+ 	    push (@rrd, "LINE1:dpostotal#000000:" . $node->{client}->{$service}->{graph_total} . (" " x ($max_field_len - length ($node->{client}->{$service}->{graph_total}) + 1)));
+-	    push (@rrd, "COMMENT: Cur:") unless $global_headers;
++	    push (@rrd, "COMMENT: Cur\\:") unless $global_headers;
+ 	    push (@rrd, "GPRINT:gpostotal:LAST:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
+-	    push (@rrd, "COMMENT: Min:") unless $global_headers;
++	    push (@rrd, "COMMENT: Min\\:") unless $global_headers;
+ 	    push (@rrd, "GPRINT:ipostotal:MIN:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
+-	    push (@rrd, "COMMENT: Avg:") unless $global_headers;
++	    push (@rrd, "COMMENT: Avg\\:") unless $global_headers;
+ 	    push (@rrd, "GPRINT:gpostotal:AVERAGE:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "");
+-	    push (@rrd, "COMMENT: Max:") unless $global_headers;
++	    push (@rrd, "COMMENT: Max\\:") unless $global_headers;
+ 	    push (@rrd, "GPRINT:apostotal:MAX:%6.2lf" . (munin_get_bool_val ($node->{client}->{$service}->{graph_scale}, 1)?"%s":"") . "\\j");
+ 	}
+ 
+@@ -810,8 +810,10 @@
+ 	    # Do the header (title, vtitle, size, etc...)
+ 	    push @complete, @{&get_header ($node, $config, $domain, $name, $service, $time)};
+ 	    push @complete, @rrd;
+-
+-	    push (@complete, "COMMENT:Last update: " . localtime($lastupdate) .  "\\r");
++    
++	    my $commentstr = "Last update: " . localtime($lastupdate) .  "\\r";
++	    $commentstr =~ s/:/\\:/g;
++	    push (@complete, "COMMENT:".$commentstr);
+ 	    
+ 	    if (time - 300 < $lastupdate)
+ 	    {
+@@ -841,7 +843,9 @@
+ 			push @rrd_sum, "--end",(int($lastupdate/$resolutions{$time}))*$resolutions{$time};
+ 		}
+ 		push @rrd_sum, @rrd;
+-		push (@rrd_sum, "COMMENT:Last update: " . localtime($lastupdate) .  "\\r");
++		my $commentstr = ("Last update: " . localtime($lastupdate) .  "\\r");
++		$commentstr =~ s/:/\\:/g;
++		push (@rrd_sum, "COMMENT:".$commentstr);
+ 
+ 		my $labelled = 0;
+ 		my @defined = ();
diff --git a/net-analyzer/munin/files/munin-init.d b/net-analyzer/munin/files/munin-init.d
new file mode 100644
index 000000000000..ae6ae7a1216c
--- /dev/null
+++ b/net-analyzer/munin/files/munin-init.d
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-init.d,v 1.1 2006/07/11 09:18:47 robbat2 Exp $
+
+NAME="munin-node"
+PIDFILE=/var/run/munin/$NAME.pid
+
+depend() {
+	need net
+	after cron
+}
+
+start() {
+	ebegin "Starting $NAME"
+	start-stop-daemon --quiet --start --pidfile $PIDFILE --exec /usr/sbin/$NAME
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping $NAME"
+	start-stop-daemon --quiet --stop --pidfile $PIDFILE
+	eend $?
+}
+
+# vim: filetype=gentoo-init-d: