Revision bump to add patches as reported upstream, bug 370131 by Diego Elio Pettenò & Christian Ruppert

(Portage version: 2.1.10.4/cvs/Linux i686)

4 files changed, 319 insertions, 2 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 281383432230..74d310605409 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.56 2011/07/18 21:42:23 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.57 2011/07/20 21:14:29 darkside Exp $
+
+*munin-1.4.6-r1 (20 Jul 2011)
+
+  20 Jul 2011; Jeremy Olexa <darkside@gentoo.org> -munin-1.4.6.ebuild,
+  +munin-1.4.6-r1.ebuild, +files/munin-1.4.6-apc-temp.patch,
+  +files/munin-1.4.6-munin-version-identifier.patch:
+  Revision bump to add patches as reported upstream, bug 370131 by Diego Elio
+  Pettenò & Christian Ruppert
 
 *munin-1.4.6 (18 Jul 2011)
 
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
new file mode 100644
index 000000000000..1eef93ec1ba8
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.4.6-apc-temp.patch
@@ -0,0 +1,48 @@
+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-munin-version-identifier.patch b/net-analyzer/munin/files/munin-1.4.6-munin-version-identifier.patch
new file mode 100644
index 000000000000..0a8137ca8e2d
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.4.6-munin-version-identifier.patch
@@ -0,0 +1,258 @@
+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/munin-1.4.6.ebuild b/net-analyzer/munin/munin-1.4.6-r1.ebuild
index 0c498f7cf4b1..969133531b25 100644
--- a/net-analyzer/munin/munin-1.4.6.ebuild
+++ b/net-analyzer/munin/munin-1.4.6-r1.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.6.ebuild,v 1.1 2011/07/18 21:42:23 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.6-r1.ebuild,v 1.1 2011/07/20 21:14:29 darkside Exp $
 
 EAPI=2
 
@@ -61,6 +61,9 @@ src_prepare() {
 	# 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
+
 	# 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.