Remove munin 1.4.6 (and related files); add missing dependency on List-Moreutils for the spooled node on 2.0.x.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

17 files changed, 18 insertions, 1429 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index b4381cd7ea4d..492a01919a14 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.127 2012/12/22 17:25:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.128 2012/12/23 11:40:58 flameeyes Exp $
+
+  23 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> -files/logrotate.d-munin,
+  -files/munin-1.3.3-crontab, -files/munin-1.4.4-Makefile.patch,
+  -files/munin-1.4.6-apc-multi.patch, -files/munin-1.4.6-apc-temp.patch,
+  -files/munin-1.4.6-fix-asterisk-plugins.patch,
+  -files/munin-1.4.6-if_-hardened-v2.patch,
+  -files/munin-1.4.6-if_-hardened.patch,
+  -files/munin-1.4.6-munin-version-identifier.patch, -files/munin-asyncd.init,
+  -files/munin-node_init.d_1.4.6-r2, -files/munin-node_init.d_2.0.2,
+  -files/munin-node_init.d_2.0.5, -munin-1.4.6-r4.ebuild, munin-2.0.8-r2.ebuild,
+  munin-2.0.9.ebuild:
+  Remove munin 1.4.6 (and related files); add missing dependency on List-
+  Moreutils for the spooled node on 2.0.x.
 
   22 Dec 2012; Agostino Sarubbo <ago@gentoo.org> munin-2.0.9.ebuild:
   Add ~ppc, wrt bug #446958
diff --git a/net-analyzer/munin/files/logrotate.d-munin b/net-analyzer/munin/files/logrotate.d-munin
deleted file mode 100644
index c1a8816ca25e..000000000000
--- a/net-analyzer/munin/files/logrotate.d-munin
+++ /dev/null
@@ -1,21 +0,0 @@
-/var/log/munin/munin-node.log {
-	daily
-	missingok
-	rotate 7
-	compress
-	copytruncate
-	notifempty
-	create 640 root root
-	postrotate
-		/etc/init.d/munin-node restart 1>/dev/null || true
-	endscript
-}
-
-/var/log/munin/munin-update.log /var/log/munin/munin-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log {
-	daily
-	missingok
-	rotate 7
-	compress
-	notifempty
-	nocreate
-}
diff --git a/net-analyzer/munin/files/munin-1.3.3-crontab b/net-analyzer/munin/files/munin-1.3.3-crontab
deleted file mode 100644
index 37d7a2fca1f8..000000000000
--- a/net-analyzer/munin/files/munin-1.3.3-crontab
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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.3-crontab,v 1.1 2007/02/25 11:00:28 robbat2 Exp $
-
-# Force the shell to bash
-SHELL=/bin/bash
-# Mail reports to root@, not munin@
-MAILTO=root
- 
-# 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.4.4-Makefile.patch b/net-analyzer/munin/files/munin-1.4.4-Makefile.patch
deleted file mode 100644
index b95efbaac6a0..000000000000
--- a/net-analyzer/munin/files/munin-1.4.4-Makefile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- munin-1.4.3/Makefile.config.org	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/Makefile.config	2010-01-18 19:34:37.000000000 +0100
-@@ -17,10 +17,10 @@
- #
- # the base of the Munin installation.
- # 
--PREFIX     = $(DESTDIR)/opt/munin
-+PREFIX     = $(DESTDIR)/usr
- 
- # Where Munin keeps its configurations (server.conf, client.conf, ++)
--CONFDIR    = $(DESTDIR)/etc/opt/munin
-+CONFDIR    = $(DESTDIR)/etc/munin
- 
- # Server only - where to put munin-cron
- BINDIR     = $(PREFIX)/bin
-@@ -29,37 +29,37 @@
- 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
-+MANDIR     = $(PREFIX)/share/man
- 
- # Where to put internal binaries and plugin repository
--LIBDIR     = $(PREFIX)/lib
-+LIBDIR     = $(PREFIX)/libexec/munin
- 
- # Server only - Output directory
--HTMLDIR    = $(PREFIX)/www/docs
--CGIDIR     = $(PREFIX)/www/cgi
-+HTMLDIR    = $(DESTDIR)/var/www/localhost/htdocs/munin
-+CGIDIR     = $(DESTDIR)/var/www/localhost/cgi-bin
- 
- # Server only - spool directory for data gathered from nodes by
- # munin-gather - experimental.  Place on ramdisk to make munin
- # scale better.  On many versions of Linux as well as on Solaris
- # /tmp will be a ramdisk.
- 
--SSPOOLDIR  = $(PREFIX)/spool
-+SSPOOLDIR  = $(DESTDIR)/var/run/munin/spool
- 
- # Suggested directory name for a pulic ramdisk based tmp directory.
- # SSPOOLDIR := /tmp/muninspool
- 
- # Client only - Where to put RRD files and other intenal data
--DBDIR      = $(DESTDIR)/var/opt/munin
-+DBDIR      = $(DESTDIR)/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     = $(PREFIX)/log/munin
-+LOGDIR     = $(DESTDIR)/var/log/munin
- 
- # Location of PID files and other statefiles. On the server, must be
- # writable by the user "munin".
-@@ -98,11 +98,11 @@
- BASH       := /bin/bash
- 
- # Server only - Where to install the perl libraries
--PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
-+PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
- PERLLIB    = $(DESTDIR)$(PERLSITELIB)
- 
- # Client only - Install plugins for this architecture
--OSTYPE     := $(shell uname | tr '[A-Z]' '[a-z]')
-+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.4.6-apc-multi.patch b/net-analyzer/munin/files/munin-1.4.6-apc-multi.patch
deleted file mode 100644
index 042d79518f75..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-apc-multi.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 1563eb6b72781fecd58495c358b1fc877c904043 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Mon, 22 Aug 2011 15:06:11 +0200
-Subject: [PATCH] apc_nis: support rewriting host and port in configuration
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It is possible for APCUPSD to manage multiple UPSes on the same box, and to
-export its information to external systems as well.
-
-Since each UPS needs its own NIS host/port pair to be accessible, allow the
-user to access non-default hosts and ports. This also allows to monitor
-remote UPSes with Munin.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- plugins/node.d/apc_nis.in |   38 +++++++++++++++++++++++---------------
- 1 files changed, 23 insertions(+), 15 deletions(-)
-
-diff --git a/plugins/node.d/apc_nis.in b/plugins/node.d/apc_nis.in
-index 6c06459..9adf96d 100644
---- a/plugins/node.d/apc_nis.in
-+++ b/plugins/node.d/apc_nis.in
-@@ -5,17 +5,25 @@
- 
- apc_nis - Plugin to monitor APC UPS via the nis port of apcupsd
- 
--=cut
-+=head1 CONFIGURATION
-+
-+The following configuration parameters are used by this plugin
-+
-+ [apc_nis]
-+  env.host     - hostname to connect to
-+  env.port     - port number to connect to
-+
-+=head2 DEFAULT CONFIGURATION
-+
-+ [apc_nis]
-+  env.host 127.0.0.1
-+  env.port 3551
- 
--# 
--#
--# Parameters:
--#
--#   config   (required)
--#
--# Magic markers (optional - used by munin-config and some installation
--# scripts):
--#%# family=contrib
-+=head1 MAGIC MARKERS
-+
-+ #%# family=contrib
-+
-+=cut
- 
- use IO::Socket;
- use strict;
-@@ -25,8 +33,11 @@ if($ARGV[0] and $ARGV[0] eq "autoconfig") {
- 	exit 0;
- }
- 
-+my $host = exists $ENV{'host'} ? $ENV{'host'} : "127.0.0.1";
-+my $port = exists $ENV{'port'} ? $ENV{'port'} : "3551";
-+
- if($ARGV[0] and $ARGV[0] eq "config") {
--	print "graph_title apcupsd\n";
-+	print "graph_title apcupsd $host:$port\n";
- 	print "graph_args -l 0 --base 1000\n";
- 	print "graph_vlabel A bit of all (Volt, time, %)\n";
- 	print "battery_volt.label batt volt (V)\n";
-@@ -50,11 +61,8 @@ if($ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $server = "localhost";
--my $port = "3551";
--
- my $sock = new IO::Socket::INET (
--	PeerAddr => $server,
-+	PeerAddr => $host,
- 	PeerPort => $port,
- 	Proto => 'tcp'
- 	);
--- 
-1.7.6
-
diff --git a/net-analyzer/munin/files/munin-1.4.6-apc-temp.patch b/net-analyzer/munin/files/munin-1.4.6-apc-temp.patch
deleted file mode 100644
index 1eef93ec1ba8..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-apc-temp.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e86ab027ab37bfb541e4d20dadcaac64e8ab3a7e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Mon, 4 Apr 2011 16:23:52 +0200
-Subject: [PATCH 1/2] apc_nis plugin: add UPS's internal temperature to the
- graph.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some APC UPS, such as the SmartUPS series, provide the internal
-temperature of the system, which is then exposed by apcupsd.
-
-This is pretty important because overheating UPSs simply shut off without
-warning.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
-Upstream: http://munin-monitoring.org/ticket/1057
----
- plugins/node.d/apc_nis.in |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/node.d/apc_nis.in b/plugins/node.d/apc_nis.in
-index 63ec390..6c06459 100644
---- a/plugins/node.d/apc_nis.in
-+++ b/plugins/node.d/apc_nis.in
-@@ -44,6 +44,9 @@ if($ARGV[0] and $ARGV[0] eq "config") {
- 	print "time_left.label time left (min)\n";
- 	print "time_left.type GAUGE\n";
- 	print "time_left.max 200\n";
-+        print "temperature.label internal temperature (celsius)\n";
-+        print "temperature.type GAUGE\n";
-+        print "temperature.max 100\n";
-     exit 0;
- }
- 
-@@ -81,6 +84,9 @@ do {
- 	} elsif($line =~ /\WTIMELEFT /) {
- 		$line =~ s/.* (\d+.\d+).*/$1/;
- 		print "time_left.value $line\n";
-+	} elsif($line =~ /\WITEMP /) {
-+		$line =~ s/.* (\d+.\d+).*/$1/;
-+		print "temperature.value $line\n";
- 	}
- } while(!($line =~ /END APC/));
- 
--- 
-1.7.5.3
-
diff --git a/net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch b/net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch
deleted file mode 100644
index 1a503cf40279..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-fix-asterisk-plugins.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 5a1fdd0cbea24bf6775072866cbd5aa7e9b0458b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Fri, 12 Aug 2011 20:39:52 +0200
-Subject: [PATCH] Fix Asterisk plugins.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some of the commands have been renamed in 1.6 and 1.8 series (which are the
-only versions that are still security-supported and that should be in use),
-so use the new syntax without requiring the admin to set up command
-aliases.
-
-Also make sure to exhaust the read buffer of the socket before terminating
-the plugin's execution, otherwise the asterisk logs will be full of "Broken
-Pipe" error messages, each time a plugin is executed.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
----
- plugins/node.d/asterisk_channels.in      |    5 ++++-
- plugins/node.d/asterisk_channelstypes.in |    5 ++++-
- plugins/node.d/asterisk_codecs.in        |    3 +++
- plugins/node.d/asterisk_meetme.in        |    5 ++++-
- plugins/node.d/asterisk_meetmeusers.in   |    5 ++++-
- plugins/node.d/asterisk_sipchannels.in   |    3 +++
- plugins/node.d/asterisk_sippeers.in      |    3 +++
- plugins/node.d/asterisk_voicemail.in     |    5 ++++-
- 8 files changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/node.d/asterisk_channels.in b/plugins/node.d/asterisk_channels.in
-index b4e9860..35de2a2 100644
---- a/plugins/node.d/asterisk_channels.in
-+++ b/plugins/node.d/asterisk_channels.in
-@@ -104,7 +104,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: show channels");
-+$pop->print("Command: core show channels");
- $pop->print("");
- my $result;
- while (($line = $pop->getline) and ($line !~ /END COMMAND/o))
-@@ -117,6 +117,9 @@ my $nb = (split ' ',$result)[0];
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- print "channels.value $nb\n";
- 
- # vim:syntax=perl
-diff --git a/plugins/node.d/asterisk_channelstypes.in b/plugins/node.d/asterisk_channelstypes.in
-index 06ab280..a23007b 100644
---- a/plugins/node.d/asterisk_channelstypes.in
-+++ b/plugins/node.d/asterisk_channelstypes.in
-@@ -120,7 +120,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: show channels");
-+$pop->print("Command: core show channels");
- $pop->print("");
- 
- #Response: Follows
-@@ -157,6 +157,9 @@ while (($line = $pop->getline) and ($line !~ /active channels/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- $i = 0;
- foreach my $channel (@CHANNELS) {
-     print "$channel.value $results[$i]\n";
-diff --git a/plugins/node.d/asterisk_codecs.in b/plugins/node.d/asterisk_codecs.in
-index 434d4e6..93bd87a 100644
---- a/plugins/node.d/asterisk_codecs.in
-+++ b/plugins/node.d/asterisk_codecs.in
-@@ -217,6 +217,9 @@ while (($line = $pop->getline) and ($line !~ /active IAX channel/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- $i = 0;
- foreach my $codec (@CODECS) {
-     print "$codec.value $results[$i]\n";
-diff --git a/plugins/node.d/asterisk_meetme.in b/plugins/node.d/asterisk_meetme.in
-index 72ce10d..091f384 100644
---- a/plugins/node.d/asterisk_meetme.in
-+++ b/plugins/node.d/asterisk_meetme.in
-@@ -104,7 +104,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: meetme");
-+$pop->print("Command: meetme list");
- $pop->print("");
- 
- 
-@@ -129,6 +129,9 @@ while (($line = $pop->getline) and ($line !~ /Total number|No active MeetMe/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- print "confs.value $confs\n";
- 
- # vim:syntax=perl
-diff --git a/plugins/node.d/asterisk_meetmeusers.in b/plugins/node.d/asterisk_meetmeusers.in
-index 1a0c565..0d6a169 100644
---- a/plugins/node.d/asterisk_meetmeusers.in
-+++ b/plugins/node.d/asterisk_meetmeusers.in
-@@ -106,7 +106,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: meetme");
-+$pop->print("Command: meetme list");
- $pop->print("");
- 
- my $nb = 0;
-@@ -125,6 +125,9 @@ while (($line = $pop->getline) and ($line !~ /END COMMAND/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- print "users.value $nb\n";
- 
- # vim:syntax=perl
-diff --git a/plugins/node.d/asterisk_sipchannels.in b/plugins/node.d/asterisk_sipchannels.in
-index a4750c3..9309575 100644
---- a/plugins/node.d/asterisk_sipchannels.in
-+++ b/plugins/node.d/asterisk_sipchannels.in
-@@ -176,6 +176,9 @@ while (($line = $pop->getline) and ($line !~ /active SIP channel/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- $i = 0;
- foreach my $codec (@CODECS) {
-     print "$codec.value $results[$i]\n";
-diff --git a/plugins/node.d/asterisk_sippeers.in b/plugins/node.d/asterisk_sippeers.in
-index 138ef2c..395881f 100644
---- a/plugins/node.d/asterisk_sippeers.in
-+++ b/plugins/node.d/asterisk_sippeers.in
-@@ -152,6 +152,9 @@ while (($line = $pop->getline) and ($line !~ /END COMMAND/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- #print "peers.value $peers\n";
- print "mon.value $monitor_online\n";
- print "moff.value $monitor_offline\n";
-diff --git a/plugins/node.d/asterisk_voicemail.in b/plugins/node.d/asterisk_voicemail.in
-index 7fa76a0..f8bae21 100644
---- a/plugins/node.d/asterisk_voicemail.in
-+++ b/plugins/node.d/asterisk_voicemail.in
-@@ -109,7 +109,7 @@ $pop->print("");
- 
- ## Request status of messages.
- $pop->print("Action: command");
--$pop->print("Command: show voicemail users");
-+$pop->print("Command: voicemail show users");
- $pop->print("");
- 
- #Context    Mbox  User                      Zone       NewMsg
-@@ -133,5 +133,8 @@ while (($line = $pop->getline)  and ($line !~ /--END/o))
- $pop->print("Action: logoff");
- $pop->print("");
- 
-+## Exhaust buffer before closing (to avoid polluting Asterisk's logs)
-+while ($line = $pop->getline) {}
-+
- print "messages.value $results\n";
- # vim:syntax=perl
--- 
-1.7.6
-
diff --git a/net-analyzer/munin/files/munin-1.4.6-if_-hardened-v2.patch b/net-analyzer/munin/files/munin-1.4.6-if_-hardened-v2.patch
deleted file mode 100644
index bb72afb8bd84..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-if_-hardened-v2.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff --git a/plugins/node.d.linux/if_.in b/plugins/node.d.linux/if_.in
-index da0fc31..63a5dfd 100755
---- a/plugins/node.d.linux/if_.in
-+++ b/plugins/node.d.linux/if_.in
-@@ -43,7 +43,9 @@ monitored with this plugin.
- 
- =head1 AUTHOR
- 
--Unknown author
-+Original author unknown
-+
-+Copyright (C) 2011 Diego Elio Petteno' <flameeyes@flameeyes.eu>
- 
- =head1 LICENSE
- 
-@@ -64,86 +66,71 @@ Unknown license
- 
- INTERFACE=${0##*if_}
- 
--findspeed () {
--
--    # Who whould have thought it's so much work to determine the
--    # maximum speed of a network interface.  Buckle up!
--
--    IWLIST="$(type -p iwlist)"
--
--    WIRELESS=0
-+# Who whould have thought it's so much work to determine the
-+# maximum speed of a network interface.  Buckle up!
-+findspeed_mbps() {
-     # Do not use interface name to guess technology.  Many many
-     # wifi drivers use "eth*" names.
--    case $IWLIST in
--
--	'')
--            # Used to use iwconfig to look for "no wireless
--            # extentions" message - but this seemed un-needed.  If we
--            # don't have iwlist we can't find out if # the interface
--            # is wireless
--            :;;
--	*)  IWO="$($IWLIST $INTERFACE rate 2>&1)"
--            case $IWO in
--                *no*) :;;
--	        *) WIRELESS=1;;
--	    esac
--	    ;;
--    esac
--
--    SPEED=U
--    # Find speed in Mbps. - or not
--    case $WIRELESS:$IWLIST in
--	0:*)
--	    ETHTOOL="$(type -p ethtool)"
--	    if [ -x "$ETHTOOL" ]; then
--		SPEED="$($ETHTOOL $INTERFACE 2>&1 |
--                         awk '/Speed:/ { gsub(/[^0-9]*/,"",$2); print $2; }')"
--		case $SPEED in
--		    [0-9]*) :;; # OK
--		    *)      SPEED=U;; # Could be "unknown"
--		esac
--	    else
--		INSTALL="ethtool"
-+    IWLIST="$(type -p iwlist)"
-+    if [ -x "$IWLIST" ]; then
-+	SPEED=$($IWLIST $INTERFACE rate 2>&1 |
-+	    awk 'BEGIN { RATE=U }
-+                       { if ($2 == "Mb/s") RATE=$1; }
-+                 END   { print RATE; }')
-+
-+        if [ "$SPEED" != "U" ]; then
-+            echo $SPEED
-+            return
-+        fi
-+    fi
-+
-+    # sysfs can report the speed if the driver supports it (but it
-+    # doesn't work as well for wireless cards, thus why we check for
-+    # iwlist first)
-+    if [ -r /sys/class/net/$INTERFACE/speed ]; then
-+	    SPEED="$(cat /sys/class/net/$INTERFACE/speed 2>/dev/null)"
-+	    if [ -n "$SPEED" ]; then
-+		echo $SPEED
-+		return
- 	    fi
--	    ;;
--	1:/*)
--	    # Current bit rate is not very interesting, it varies too often
--	    SPEED=$(echo "$IWO" |
--		    awk 'BEGIN { RATE=U }
--                               { if ($2 == "Mb/s") RATE=$1; } 
--                         END   { print RATE; }')
--
--	    ;;
--	*)
--	    # Wireless interface, cannot find iwlist
--	    INSTALL="wireless-tools"
--	    ;;
--    esac
-+    fi
-+
-+    ETHTOOL="$(type -p ethtool)"
-+    if [ -x "$ETHTOOL" ]; then
-+	SPEED="$($ETHTOOL $INTERFACE 2>&1 |
-+                 awk '/Speed:/ { gsub(/[^0-9]*/,"",$2); print $2; }')"
-+
-+        if [ $SPEED = [0-9]* ]; then
-+	    echo $SPEED
-+            return
-+	fi
-+    fi
- 
-     MIITOOL="$(type -p mii-tool)"
--    case $SPEED:$MIITOOL in
--	U:/*)
--	    SPEED="$($MIITOOL $INTERFACE 2>&1)"
--	    case $SPEED in
--		*1000base*) SPEED=1000;; # as if...
--		*100base*)  SPEED=100;;
--		*10base*)   SPEED=10;;
--		*)          SPEED=U;;
--	    esac
--	    ;;
--    esac
--
--    # sysfs can report the speed if the driver supports it
--    SYSFS="$(cat /sys/class/net/$INTERFACE/speed 2>/dev/null)"
--    # If it can't, it fails on I/O, so we check cat's return value
--    if [ $? -eq 0 -a "$SPEED" = "U" -a -n "$SYSFS" ]; then
--        SPEED="$SYSFS"
-+    if [ -x $MIITOOL ]; then
-+	case $($MIITOOL $INTERFACE 2>&1) in
-+	    *1000base*) echo 1000; return ;;
-+	    *100base*)  echo 100; return ;;
-+	    *10base*)   echo 10; return ;;
-+	esac
-     fi
- 
--    case $SPEED in
--	U) echo "up.info Traffic of the $INTERFACE interface. Unable to determine interface speed.  Please install ethtool, wireless-tools (or mii-tool), whatever is appropriate for the interface."
--	   return;;
--    esac
-+    echo U
-+}
-+
-+findspeed() {
-+    SPEED=$(findspeed_mbps)
-+
-+    if [ -z $SPEED -o $SPEED = "U" ]; then
-+        printf "up.info Traffic of the %s interface. Unable to determine interface speed." $INTERFACE
-+        if [ $EUID -ne 0 ]; then
-+                echo " Please run the plugin as root."
-+        else
-+                echo " Please install ethtool, wireless-tools, mii-tool or whatever is appropriate for the interface."
-+        fi
-+
-+        return
-+    fi
- 
-     BPS=$(( $SPEED * 1000 * 1000 ))
- 
-@@ -207,11 +194,15 @@ case $1 in
- esac
- 
- # Escape dots in the interface name (eg. vlans) before using it as a regex
--awk -v interface="$INTERFACE" \
--    'BEGIN { gsub(/\./, "\\.", interface) } \
--    $1 ~ "^" interface ":" {
--        split($0, a, /: */); $0 = a[2]; \
--        print "down.value " $1 "\nup.value " $9 \
--    }' \
--    /proc/net/dev
--
-+if [ -r /sys/class/net/$INTERFACE/statistics/rx_bytes ]; then
-+    echo "down.value $(cat /sys/class/net/$INTERFACE/statistics/rx_bytes)"
-+    echo "up.value $(cat /sys/class/net/$INTERFACE/statistics/tx_bytes)"
-+else
-+    awk -v interface="$INTERFACE" \
-+        'BEGIN { gsub(/\./, "\\.", interface) } \
-+        $1 ~ "^" interface ":" {
-+            split($0, a, /: */); $0 = a[2]; \
-+            print "down.value " $1 "\nup.value " $9 \
-+        }' \
-+        /proc/net/dev
-+fi
-diff --git a/plugins/node.d.linux/if_err_.in b/plugins/node.d.linux/if_err_.in
-index 331866d..2e35909 100755
---- a/plugins/node.d.linux/if_err_.in
-+++ b/plugins/node.d.linux/if_err_.in
-@@ -93,10 +93,15 @@ if [ "$1" = "config" ]; then
- fi;
- 
- # Escape dots in the interface name (eg. vlans) before using it as a regex
--awk -v interface="$INTERFACE" \
--    'BEGIN { gsub(/\./, "\\.", interface) } \
--    $1 ~ "^" interface ":" {
--        split($0, a, /: */); $0 = a[2]; \
--        print "rcvd.value " $3 "\ntrans.value " $11 \
--    }' \
--    /proc/net/dev
-+if [ -r /sys/class/net/$INTERFACE/statistics/rx_bytes ]; then
-+    echo "rcvd.value $(cat /sys/class/net/$INTERFACE/statistics/rx_errors)"
-+    echo "trans.value $(cat /sys/class/net/$INTERFACE/statistics/tx_errors)"
-+else
-+    awk -v interface="$INTERFACE" \
-+        'BEGIN { gsub(/\./, "\\.", interface) } \
-+        $1 ~ "^" interface ":" {
-+            split($0, a, /: */); $0 = a[2]; \
-+            print "rcvd.value " $3 "\ntrans.value " $11 \
-+        }' \
-+        /proc/net/dev
-+fi
diff --git a/net-analyzer/munin/files/munin-1.4.6-if_-hardened.patch b/net-analyzer/munin/files/munin-1.4.6-if_-hardened.patch
deleted file mode 100644
index 03c4ece263a2..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-if_-hardened.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff --git a/plugins/node.d.linux/if_.in b/plugins/node.d.linux/if_.in
-index da0fc31..63a5dfd 100755
---- a/plugins/node.d.linux/if_.in
-+++ b/plugins/node.d.linux/if_.in
-@@ -43,7 +43,9 @@ monitored with this plugin.
- 
- =head1 AUTHOR
- 
--Unknown author
-+Original author unknown
-+
-+Copyright (C) 2011 Diego Elio Petteno' <flameeyes@flameeyes.eu>
- 
- =head1 LICENSE
- 
-@@ -64,86 +66,71 @@ Unknown license
- 
- INTERFACE=${0##*if_}
- 
--findspeed () {
--
--    # Who whould have thought it's so much work to determine the
--    # maximum speed of a network interface.  Buckle up!
--
--    IWLIST="$(type -p iwlist)"
--
--    WIRELESS=0
-+# Who whould have thought it's so much work to determine the
-+# maximum speed of a network interface.  Buckle up!
-+findspeed_mbps() {
-     # Do not use interface name to guess technology.  Many many
-     # wifi drivers use "eth*" names.
--    case $IWLIST in
--
--	'')
--            # Used to use iwconfig to look for "no wireless
--            # extentions" message - but this seemed un-needed.  If we
--            # don't have iwlist we can't find out if # the interface
--            # is wireless
--            :;;
--	*)  IWO="$($IWLIST $INTERFACE rate 2>&1)"
--            case $IWO in
--                *no*) :;;
--	        *) WIRELESS=1;;
--	    esac
--	    ;;
--    esac
--
--    SPEED=U
--    # Find speed in Mbps. - or not
--    case $WIRELESS:$IWLIST in
--	0:*)
--	    ETHTOOL="$(type -p ethtool)"
--	    if [ -x "$ETHTOOL" ]; then
--		SPEED="$($ETHTOOL $INTERFACE 2>&1 |
--                         awk '/Speed:/ { gsub(/[^0-9]*/,"",$2); print $2; }')"
--		case $SPEED in
--		    [0-9]*) :;; # OK
--		    *)      SPEED=U;; # Could be "unknown"
--		esac
--	    else
--		INSTALL="ethtool"
-+    IWLIST="$(type -p iwlist)"
-+    if [ -x "$IWLIST" ]; then
-+	SPEED=$($IWLIST $INTERFACE rate 2>&1 |
-+	    awk 'BEGIN { RATE=U }
-+                       { if ($2 == "Mb/s") RATE=$1; }
-+                 END   { print RATE; }')
-+
-+        if [ "$SPEED" != "U" ]; then
-+            echo $SPEED
-+            return
-+        fi
-+    fi
-+
-+    # sysfs can report the speed if the driver supports it (but it
-+    # doesn't work as well for wireless cards, thus why we check for
-+    # iwlist first)
-+    if [ -r /sys/class/net/$INTERFACE/speed ]; then
-+	    SPEED="$(cat /sys/class/net/$INTERFACE/speed 2>/dev/null)"
-+	    if [ -n "$SPEED" ]; then
-+		echo $SPEED
-+		return
- 	    fi
--	    ;;
--	1:/*)
--	    # Current bit rate is not very interesting, it varies too often
--	    SPEED=$(echo "$IWO" |
--		    awk 'BEGIN { RATE=U }
--                               { if ($2 == "Mb/s") RATE=$1; } 
--                         END   { print RATE; }')
--
--	    ;;
--	*)
--	    # Wireless interface, cannot find iwlist
--	    INSTALL="wireless-tools"
--	    ;;
--    esac
-+    fi
-+
-+    ETHTOOL="$(type -p ethtool)"
-+    if [ -x "$ETHTOOL" ]; then
-+	SPEED="$($ETHTOOL $INTERFACE 2>&1 |
-+                 awk '/Speed:/ { gsub(/[^0-9]*/,"",$2); print $2; }')"
-+
-+        if [ $SPEED = [0-9]* ]; then
-+	    echo $SPEED
-+            return
-+	fi
-+    fi
- 
-     MIITOOL="$(type -p mii-tool)"
--    case $SPEED:$MIITOOL in
--	U:/*)
--	    SPEED="$($MIITOOL $INTERFACE 2>&1)"
--	    case $SPEED in
--		*1000base*) SPEED=1000;; # as if...
--		*100base*)  SPEED=100;;
--		*10base*)   SPEED=10;;
--		*)          SPEED=U;;
--	    esac
--	    ;;
--    esac
--
--    # sysfs can report the speed if the driver supports it
--    SYSFS="$(cat /sys/class/net/$INTERFACE/speed 2>/dev/null)"
--    # If it can't, it fails on I/O, so we check cat's return value
--    if [ $? -eq 0 -a "$SPEED" = "U" -a -n "$SYSFS" ]; then
--        SPEED="$SYSFS"
-+    if [ -x $MIITOOL ]; then
-+	case $($MIITOOL $INTERFACE 2>&1) in
-+	    *1000base*) echo 1000; return ;;
-+	    *100base*)  echo 100; return ;;
-+	    *10base*)   echo 10; return ;;
-+	esac
-     fi
- 
--    case $SPEED in
--	U) echo "up.info Traffic of the $INTERFACE interface. Unable to determine interface speed.  Please install ethtool, wireless-tools (or mii-tool), whatever is appropriate for the interface."
--	   return;;
--    esac
-+    echo U
-+}
-+
-+findspeed() {
-+    SPEED=$(findspeed_mbps)
-+
-+    if [ -z $SPEED -o $SPEED = "U" ]; then
-+        printf "up.info Traffic of the %s interface. Unable to determine interface speed." $INTERFACE
-+        if [ $EUID -ne 0 ]; then
-+                echo " Please run the plugin as root."
-+        else
-+                echo " Please install ethtool, wireless-tools, mii-tool or whatever is appropriate for the interface."
-+        fi
-+
-+        return
-+    fi
- 
-     BPS=$(( $SPEED * 1000 * 1000 ))
- 
-@@ -207,11 +194,15 @@ case $1 in
- esac
- 
- # Escape dots in the interface name (eg. vlans) before using it as a regex
--awk -v interface="$INTERFACE" \
--    'BEGIN { gsub(/\./, "\\.", interface) } \
--    $1 ~ "^" interface ":" {
--        split($0, a, /: */); $0 = a[2]; \
--        print "down.value " $1 "\nup.value " $9 \
--    }' \
--    /proc/net/dev
--
-+if [ -r /sys/class/net/$INTERFACE/statistics/rx_bytes ]; then
-+    echo "down.value $(cat /sys/class/net/$INTERFACE/statistics/rx_bytes)"
-+    echo "up.value $(cat /sys/class/net/$INTERFACE/statistics/tx_bytes)"
-+else
-+    awk -v interface="$INTERFACE" \
-+        'BEGIN { gsub(/\./, "\\.", interface) } \
-+        $1 ~ "^" interface ":" {
-+            split($0, a, /: */); $0 = a[2]; \
-+            print "down.value " $1 "\nup.value " $9 \
-+        }' \
-+        /proc/net/dev
-+fi
-diff --git a/plugins/node.d.linux/if_err_.in b/plugins/node.d.linux/if_err_.in
-index 331866d..2e35909 100755
---- a/plugins/node.d.linux/if_err_.in
-+++ b/plugins/node.d.linux/if_err_.in
-@@ -93,10 +93,15 @@ if [ "$1" = "config" ]; then
- fi;
- 
- # Escape dots in the interface name (eg. vlans) before using it as a regex
--awk -v interface="$INTERFACE" \
--    'BEGIN { gsub(/\./, "\\.", interface) } \
--    $1 ~ "^" interface ":" {
--        split($0, a, /: */); $0 = a[2]; \
--        print "rcvd.value " $3 "\ntrans.value " $11 \
--    }' \
--    /proc/net/dev
-+if [ -r /sys/class/net/$INTERFACE/statistics/rx_bytes ]; then
-+    echo "down.value $(cat /sys/class/net/$INTERFACE/statistics/rx_errors)"
-+    echo "up.value $(cat /sys/class/net/$INTERFACE/statistics/tx_errors)"
-+else
-+    awk -v interface="$INTERFACE" \
-+        'BEGIN { gsub(/\./, "\\.", interface) } \
-+        $1 ~ "^" interface ":" {
-+            split($0, a, /: */); $0 = a[2]; \
-+            print "rcvd.value " $3 "\ntrans.value " $11 \
-+        }' \
-+        /proc/net/dev
-+fi
diff --git a/net-analyzer/munin/files/munin-1.4.6-munin-version-identifier.patch b/net-analyzer/munin/files/munin-1.4.6-munin-version-identifier.patch
deleted file mode 100644
index 0a8137ca8e2d..000000000000
--- a/net-analyzer/munin/files/munin-1.4.6-munin-version-identifier.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-From cb3a59fb3249a2f3aa5433b6590f71563e6cba29 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Fri, 1 Apr 2011 17:52:33 +0200
-Subject: [PATCH 2/2] Use "munin/$version (libwww-perl/$version)" instead of
- just "libwww-perl/$version"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
-Upstream: http://munin-monitoring.org/ticket/1109
----
- plugins/node.d/apache_accesses.in  |    6 ++++--
- plugins/node.d/apache_processes.in |    6 ++++--
- plugins/node.d/apache_volume.in    |    6 ++++--
- plugins/node.d/haproxy_.in         |    3 ++-
- plugins/node.d/nginx_request.in    |    6 ++++--
- plugins/node.d/nginx_status.in     |    6 ++++--
- plugins/node.d/tomcat_access.in    |    6 ++++--
- plugins/node.d/tomcat_jvm.in       |    6 ++++--
- plugins/node.d/tomcat_threads.in   |    6 ++++--
- plugins/node.d/tomcat_volume.in    |    6 ++++--
- 10 files changed, 38 insertions(+), 19 deletions(-)
-
-diff --git a/plugins/node.d/apache_accesses.in b/plugins/node.d/apache_accesses.in
-index 233e941..dff2b54 100755
---- a/plugins/node.d/apache_accesses.in
-+++ b/plugins/node.d/apache_accesses.in
-@@ -98,7 +98,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
- 		exit 0;
- 	}
- 
--	my $ua = LWP::UserAgent->new(timeout => 30);
-+	my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- 	foreach my $port (@PORTS) {
- 		my $url = sprintf $URL, $port;
-@@ -144,7 +145,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
- 	exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- foreach my $port (@PORTS) {
- 	my $url = sprintf $URL, $port;
-diff --git a/plugins/node.d/apache_processes.in b/plugins/node.d/apache_processes.in
-index 45310e4..00fe2ce 100755
---- a/plugins/node.d/apache_processes.in
-+++ b/plugins/node.d/apache_processes.in
-@@ -103,7 +103,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
- 		print "no ($ret)\n";
- 		exit 0;
- 	}
--	my $ua = LWP::UserAgent->new(timeout => 30);
-+	my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
-         foreach my $port (@PORTS) {
-                 my $url = sprintf $URL, $port;
-@@ -170,7 +171,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
- 
- foreach my $port (@PORTS)
- {
--    my $ua = LWP::UserAgent->new(timeout => 30);
-+    my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $url = sprintf $URL, $port;
-     my $response = $ua->request(HTTP::Request->new('GET',$url));
-     if ($response->content =~ /^Busy(?:Servers|Workers):\s+(.+)$/im) {
-diff --git a/plugins/node.d/apache_volume.in b/plugins/node.d/apache_volume.in
-index b81c9bf..f26f574 100755
---- a/plugins/node.d/apache_volume.in
-+++ b/plugins/node.d/apache_volume.in
-@@ -98,7 +98,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
- 		exit 0;
- 	}
- 	
--	my $ua = LWP::UserAgent->new(timeout => 30);
-+	my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- 	foreach my $port (@PORTS) {
- 		my $url = sprintf $URL, $port;
-@@ -143,7 +144,8 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
- 	exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- foreach my $port (@PORTS) {
- 	my $url = sprintf $URL, $port;
-diff --git a/plugins/node.d/haproxy_.in b/plugins/node.d/haproxy_.in
-index 74ec2a0..82847d6 100755
---- a/plugins/node.d/haproxy_.in
-+++ b/plugins/node.d/haproxy_.in
-@@ -60,7 +60,8 @@ if (! eval "require LWP::UserAgent;")
- 
- my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://localhost/haproxy-status;csv;norefresh";
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- my $url = $URL;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
-diff --git a/plugins/node.d/nginx_request.in b/plugins/node.d/nginx_request.in
-index d8bb8ee..f43ee7f 100644
---- a/plugins/node.d/nginx_request.in
-+++ b/plugins/node.d/nginx_request.in
-@@ -73,7 +73,8 @@ if ( exists $ARGV[0] and $ARGV[0] eq "autoconf" )
- 		exit 0;
- 	}
- 	
--	my $ua = LWP::UserAgent->new(timeout => 30);
-+	my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $response = $ua->request(HTTP::Request->new('GET',$URL));
- 
- 	unless ($response->is_success and $response->content =~ /server/im)
-@@ -103,7 +104,8 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" )
- 	exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- my $response = $ua->request(HTTP::Request->new('GET',$URL));
- 
-diff --git a/plugins/node.d/nginx_status.in b/plugins/node.d/nginx_status.in
-index c61eae2..735f815 100644
---- a/plugins/node.d/nginx_status.in
-+++ b/plugins/node.d/nginx_status.in
-@@ -69,7 +69,8 @@ if ( exists $ARGV[0] and $ARGV[0] eq "autoconf" ) {
- 	exit 0;
-     }
- 
--    my $ua = LWP::UserAgent->new(timeout => 30);
-+    my $ua = LWP::UserAgent->new(timeout => 30,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $response = $ua->request(HTTP::Request->new('GET',$URL));
- 
-     unless ($response->is_success and $response->content =~ /server/im) {
-@@ -106,7 +107,8 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" ) {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => 30);
-+my $ua = LWP::UserAgent->new(timeout => 30,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- 
- my $response = $ua->request(HTTP::Request->new('GET',$URL));
- 
-diff --git a/plugins/node.d/tomcat_access.in b/plugins/node.d/tomcat_access.in
-index d226ea7..cf5ad12 100755
---- a/plugins/node.d/tomcat_access.in
-+++ b/plugins/node.d/tomcat_access.in
-@@ -76,7 +76,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "autoconf") {
- 	print "no ($ret)\n";
- 	exit 0;
-     }
--    my $au = LWP::UserAgent->new(timeout => $TIMEOUT);
-+    my $au = LWP::UserAgent->new(timeout => $TIMEOUT,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $repsonse = $au->request(HTTP::Request->new('GET',$url));
-     if($repsonse->is_success and $repsonse->content =~ /<status>.*<\/status>/im) {
- 	print "yes\n";
-@@ -99,7 +100,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => $TIMEOUT);
-+my $ua = LWP::UserAgent->new(timeout => $TIMEOUT,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- my $xs = new XML::Simple;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
- my %options = ( KeyAttr => { connector => 'name' }, ForceArray => 1 );
-diff --git a/plugins/node.d/tomcat_jvm.in b/plugins/node.d/tomcat_jvm.in
-index 2407603..c8b9a47 100755
---- a/plugins/node.d/tomcat_jvm.in
-+++ b/plugins/node.d/tomcat_jvm.in
-@@ -88,7 +88,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "autoconf") {
- 	print "no ($ret)\n";
- 	exit 0;
-     }
--    my $au = LWP::UserAgent->new(timeout => $TIMEOUT);
-+    my $au = LWP::UserAgent->new(timeout => $TIMEOUT,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $repsonse = $au->request(HTTP::Request->new('GET',$url));
-     if($repsonse->is_success and $repsonse->content =~ /<status>.*<\/status>/im) {
- 	print "yes\n";
-@@ -114,7 +115,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => $TIMEOUT);
-+my $ua = LWP::UserAgent->new(timeout => $TIMEOUT,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- my $xs = new XML::Simple;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
- my $xml = $xs->XMLin($response->content);
-diff --git a/plugins/node.d/tomcat_threads.in b/plugins/node.d/tomcat_threads.in
-index 2aba651..8ae2540 100755
---- a/plugins/node.d/tomcat_threads.in
-+++ b/plugins/node.d/tomcat_threads.in
-@@ -75,7 +75,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "autoconf") {
- 	print "no ($ret)\n";
- 	exit 0;
-     }
--    my $au = LWP::UserAgent->new(timeout => $TIMEOUT);
-+    my $au = LWP::UserAgent->new(timeout => $TIMEOUT,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $repsonse = $au->request(HTTP::Request->new('GET',$url));
-     if($repsonse->is_success and $repsonse->content =~ /<status>.*<\/status>/im) {
- 	print "yes\n";
-@@ -100,7 +101,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => $TIMEOUT);
-+my $ua = LWP::UserAgent->new(timeout => $TIMEOUT,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- my $xs = new XML::Simple;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
- my %options = ( KeyAttr => { connector => 'name' }, ForceArray => 1 );
-diff --git a/plugins/node.d/tomcat_volume.in b/plugins/node.d/tomcat_volume.in
-index f32b874..33caf74 100755
---- a/plugins/node.d/tomcat_volume.in
-+++ b/plugins/node.d/tomcat_volume.in
-@@ -96,7 +96,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "autoconf") {
- 	print "no ($ret)\n";
- 	exit 0;
-     }
--    my $au = LWP::UserAgent->new(timeout => $TIMEOUT);
-+    my $au = LWP::UserAgent->new(timeout => $TIMEOUT,
-+			agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
-     my $repsonse = $au->request(HTTP::Request->new('GET',$url));
-     if($repsonse->is_success and $repsonse->content =~ /<status>.*<\/status>/im) {
- 	print "yes\n";
-@@ -119,7 +120,8 @@ if(exists $ARGV[0] and $ARGV[0] eq "config") {
-     exit 0;
- }
- 
--my $ua = LWP::UserAgent->new(timeout => $TIMEOUT);
-+my $ua = LWP::UserAgent->new(timeout => $TIMEOUT,
-+		agent => sprintf("munin/%s (libwww-perl/%s)", $Munin::Common::Defaults::MUNIN_VERSION, $LWP::VERSION));
- my $xs = new XML::Simple;
- my $response = $ua->request(HTTP::Request->new('GET',$url));
- my %options = ( KeyAttr => { connector => 'name' }, ForceArray => 1 );
--- 
-1.7.5.3
-
diff --git a/net-analyzer/munin/files/munin-asyncd.init b/net-analyzer/munin/files/munin-asyncd.init
deleted file mode 100644
index e438fd3e0838..000000000000
--- a/net-analyzer/munin/files/munin-asyncd.init
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-asyncd.init,v 1.1 2012/08/06 14:53:31 flameeyes Exp $
-
-depend() {
-	need munin-node
-	before cron
-}
-
-start() {
-	checkpath -d -o munin:munin -m 0700 /var/spool/munin
-
-	ebegin "Starting Munin node"
-	start-stop-daemon --start --background \
-	    --pidfile /var/run/munin-asyncd.pid --make-pidfile \
-	    --exec /usr/libexec/munin/munin-asyncd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Munin node"
-	start-stop-daemon --stop --pidfile /var/run/munin-asyncd.pid
-	eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_1.4.6-r2 b/net-analyzer/munin/files/munin-node_init.d_1.4.6-r2
deleted file mode 100644
index 409570d441ba..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_1.4.6-r2
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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.6-r2,v 1.1 2011/08/17 15:45:54 darkside Exp $
-
-get_munin_config() {
-	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
-}
-
-: ${NAME:="munin-node"}
-: ${CFGFILE:=/etc/munin/munin-node.conf}
-: ${PIDFILE:=$(get_munin_config pid_file)}
-: ${NICE_LEVEL:=0}
-
-depend() {
-	config "$CFGFILE"
-
-	need net
-	before cron
-
-	[ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \
-		use logger
-}
-
-start() {
-	local piddir=$(dirname ${PIDFILE})
-	[ -d ${piddir} ] || mkdir -p ${piddir}
-
-	ebegin "Starting $NAME"
-	start-stop-daemon --nicelevel $NICE_LEVEL --start --pidfile $PIDFILE --exec /usr/sbin/$NAME -- \
-		--config "$CFGFILE"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $NAME"
-	start-stop-daemon --stop --pidfile $PIDFILE
-	eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.2 b/net-analyzer/munin/files/munin-node_init.d_2.0.2
deleted file mode 100644
index 035ea31819ee..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_2.0.2
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 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_2.0.2,v 1.1 2012/07/16 16:15:11 flameeyes Exp $
-
-get_munin_config() {
-	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
-}
-
-: ${CFGFILE:=/etc/munin/munin-node.conf}
-: ${PIDFILE:=$(get_munin_config pid_file)}
-: ${NICE_LEVEL:=0}
-
-depend() {
-	config "$CFGFILE"
-
-	need net
-	before cron
-
-	[ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \
-		use logger
-}
-
-start() {
-	checkpath -d -o munin:munin -m 0700 $(dirname ${PIDFILE})
-
-	ebegin "Starting Munin node"
-	start-stop-daemon --start \
-	    --nicelevel $NICE_LEVEL \
-	    --pidfile $PIDFILE \
-	    --exec /usr/sbin/munin-node -- --config "$CFGFILE"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Munin node"
-	start-stop-daemon --stop --pidfile $PIDFILE
-	eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.5 b/net-analyzer/munin/files/munin-node_init.d_2.0.5
deleted file mode 100644
index 2dc6c516de01..000000000000
--- a/net-analyzer/munin/files/munin-node_init.d_2.0.5
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 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_2.0.5,v 1.6 2012/10/04 17:18:27 flameeyes Exp $
-
-get_munin_config() {
-	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
-}
-
-: ${CFGFILE:=/etc/munin/munin-node.conf}
-
-command=/usr/sbin/munin-node
-command_args="--config ${CFGFILE}"
-pidfile=$(get_munin_config pid_file)
-start_stop_daemon_args="--nicelevel ${NICE_LEVEL:-0}"
-extra_started_commands="reload"
-
-depend() {
-	config "$CFGFILE"
-
-	need net
-	before cron
-
-	[ "$(get_munin_config log_file)" == "Sys::Syslog" ] && \
-		use logger
-}
-
-start_pre() {
-    checkpath -d $(dirname ${pidfile})
-}
-
-reload() {
-    ebegin "Reloading ${SERVICE}"
-    kill -HUP `cat ${pidfile}`
-    eend $?
-}
-
-# vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/munin-1.4.6-r4.ebuild b/net-analyzer/munin/munin-1.4.6-r4.ebuild
deleted file mode 100644
index 8816413e58a9..000000000000
--- a/net-analyzer/munin/munin-1.4.6-r4.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.6-r4.ebuild,v 1.5 2012/06/12 02:29:18 zmedico Exp $
-
-EAPI=2
-
-inherit eutils user
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/munin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE="asterisk doc irc java memcached minimal mysql postgres ssl"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-DEPEND_COM="dev-lang/perl
-			sys-process/procps
-			asterisk? ( dev-perl/Net-Telnet )
-			irc? ( dev-perl/Net-IRC )
-			java? ( >=virtual/jdk-1.5 )
-			mysql? ( virtual/mysql
-					 dev-perl/Cache-Cache
-					 dev-perl/DBD-mysql )
-			ssl? ( dev-perl/Net-SSLeay )
-			postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
-			memcached? ( dev-perl/Cache-Memcached )
-			dev-perl/DateManip
-			dev-perl/Net-CIDR
-			dev-perl/Net-Netmask
-			dev-perl/Net-SNMP
-			dev-perl/libwww-perl
-			dev-perl/net-server
-			dev-perl/DBI
-			virtual/perl-Digest-MD5
-			virtual/perl-Getopt-Long
-			virtual/perl-MIME-Base64
-			virtual/perl-Storable
-			virtual/perl-Text-Balanced
-			virtual/perl-Time-HiRes
-			!minimal? ( dev-perl/HTML-Template
-						net-analyzer/rrdtool[perl]
-						dev-perl/Log-Log4perl )"
-			# Sybase isn't supported in Gentoo
-			#munin-sybase? (	 dev-perl/DBD-Sybase )
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	virtual/perl-Module-Build"
-RDEPEND="${DEPEND_COM}
-		!minimal? ( virtual/cron )"
-
-pkg_setup() {
-	enewgroup munin
-	enewuser munin 177 -1 /var/lib/munin munin
-}
-
-src_prepare() {
-	# upstream needs a lot of DESTDIR loving
-	# and Gentoo location support
-	epatch "${FILESDIR}"/${PN}-1.4.4-Makefile.patch
-
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-temp.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-munin-version-identifier.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-fix-asterisk-plugins.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-if_-hardened.patch
-	epatch "${FILESDIR}"/${PN}-1.4.6-apc-multi.patch
-
-	# Don't build java plugins if not requested via USE.
-	if ! use java; then
-		# sed is needed so the java plugins aren't automagically built.
-		sed -i -e 's: build-plugins-java : :' \
-			-e 's: install-plugins-java : :' Makefile || die
-	fi
-
-	# Bug 304447, fix for gentoo PS location
-	sed -i -e 's,/usr/bin/ps,/bin/ps,g' \
-		"${S}"/plugins/node.d/ifx_concurrent_sessions_.in || die
-
-	# bug 367785, cleanup make output by disabling HP-UX cruft
-	sed -i -e "/plugins\/\*\.adv/d" Makefile || die
-}
-
-src_compile() {
-	emake -j 1 build build-man || die "build/build-man failed"
-	if use doc; then
-		emake -j 1 build-doc || die "build-doc failed"
-	fi
-
-	#Ensure TLS is disabled if built without SSL
-	if ! use ssl; then
-		echo "tls disabled" >> ${S}/build/node/munin-node.conf \
-			|| die "Fixing munin-node.conf Failed!"
-		echo "tls disabled" >> ${S}/build/master/munin.conf \
-			|| die "Fixing munin.conf Failed!"
-	fi
-
-}
-
-src_install() {
-	local dirs
-	dirs="/var/log/munin/ /var/lib/munin/"
-	dirs="${dirs} /var/lib/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/plugin-state/"
-	dirs="${dirs} /var/run/munin/spool/"
-	dirs="${dirs} /etc/munin/plugin-conf.d/"
-	dirs="${dirs} /etc/munin/munin-conf.d/"
-	dirs="${dirs} /etc/munin/plugins/"
-	keepdir ${dirs}
-
-	if use minimal; then
-		emake -j 1 DESTDIR="${D}" install-common-prime install-node-prime \
-			install-plugins-prime || die "install failed"
-	else
-		emake -j 1 DESTDIR="${D}" install || die "install failed"
-	fi
-	fowners munin:munin ${dirs} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node || die
-
-	# make sure we've got everything in the correct directory
-	insinto /var/lib/munin
-	newins "${FILESDIR}"/${PN}-1.3.3-crontab crontab || die
-	newinitd "${FILESDIR}"/munin-node_init.d_1.4.6-r2 munin-node || die
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node || die
-	dodoc README ChangeLog INSTALL logo.eps logo.svg build/resources/apache* \
-		|| die
-
-	# bug 254968
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/logrotate.d-munin munin || die
-}
-
-pkg_config() {
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /var/lib/munin/crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-	# dcron is very fussy about syntax
-	# the following is the only form that works in BOTH dcron and vixie-cron
-	crontab - -u munin </var/lib/munin/crontab
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node via /etc/init.d/munin-node."
-	if ! use minimal; then
-		elog "To have munin's cronjob automatically configured for you if this is"
-		elog "your munin master installation, please:"
-		elog "emerge --config net-analyzer/munin"
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.8-r2.ebuild b/net-analyzer/munin/munin-2.0.8-r2.ebuild
index 8ad2df2564a9..f6feef59efe2 100644
--- a/net-analyzer/munin/munin-2.0.8-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.8-r2.ebuild,v 1.6 2012/12/22 15:18:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.8-r2.ebuild,v 1.7 2012/12/23 11:40:58 flameeyes Exp $
 
 EAPI=4
 
@@ -51,6 +51,7 @@ DEPEND_COM="dev-lang/perl[berkdb]
 			dev-perl/DBI
 			dev-perl/DateManip
 			dev-perl/File-Copy-Recursive
+			dev-perl/List-MoreUtils
 			dev-perl/Log-Log4perl
 			dev-perl/Net-CIDR
 			dev-perl/Net-Netmask
diff --git a/net-analyzer/munin/munin-2.0.9.ebuild b/net-analyzer/munin/munin-2.0.9.ebuild
index 7b5d4538f556..9000a9b00fb0 100644
--- a/net-analyzer/munin/munin-2.0.9.ebuild
+++ b/net-analyzer/munin/munin-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.9.ebuild,v 1.2 2012/12/22 17:25:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.9.ebuild,v 1.3 2012/12/23 11:40:58 flameeyes Exp $
 
 EAPI=5
 
@@ -48,6 +48,7 @@ DEPEND_COM="dev-lang/perl[berkdb]
 			dev-perl/DBI
 			dev-perl/DateManip
 			dev-perl/File-Copy-Recursive
+			dev-perl/List-MoreUtils
 			dev-perl/Log-Log4perl
 			dev-perl/Net-CIDR
 			dev-perl/Net-Netmask