Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-analyzer/munin/ChangeLog10
-rw-r--r--net-analyzer/munin/Manifest6
-rw-r--r--net-analyzer/munin/files/munin-1.4.6-apc-temp.patch48
-rw-r--r--net-analyzer/munin/files/munin-1.4.6-munin-version-identifier.patch258
-rw-r--r--net-analyzer/munin/munin-1.4.6-r1.ebuild (renamed from net-analyzer/munin/munin-1.4.6.ebuild)5
5 files changed, 323 insertions, 4 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/Manifest b/net-analyzer/munin/Manifest
index cf2c8cc28fca..1f39cc582563 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -2,6 +2,8 @@ AUX logrotate.d-munin 386 RMD160 527eb49f80c70dfb6f3207df449147000f4e8a0f SHA1 8
AUX munin-1.3.2-plugins.conf 1623 RMD160 05aa9ba00e714c26d62bc06f6008714cb837f026 SHA1 979d416741dd0c6d79f00746570c67572d4390b5 SHA256 4fbd0d0f6ef37b055283dbd25f7e400a06dc0be6ede1bfd4f3f5c9b2f57b98a1
AUX munin-1.3.3-crontab 994 RMD160 ab7cc5acaeaf478413e1eb6d1dafe561d79448b0 SHA1 7a372182c407be60895a4817f9bb74f3a63fda49 SHA256 a5d9a160fc15d152a9cbdbf817a44c9c3450c60d61eeead647bf167fbe55fb89
AUX munin-1.4.4-Makefile.patch 2531 RMD160 f0a492267fd1078139a9f80997173cd1d4823e1b SHA1 6ef37d8a5df64be5e6aaa4fb5e526f48069aad0a SHA256 9f19d908b7097267b82b773d8644a775f76d16921e4efaf41e93835e53613bbc
+AUX munin-1.4.6-apc-temp.patch 1548 RMD160 884a9a0ec0cbc85a3ae7b9082a4c5915f5cac2af SHA1 d90bce289de037502f86ab6841d8a7b23f449140 SHA256 8b51c301cdd90f11e0d3fa5c16ae7bf4717bac2f6321765b6d37ecae4d9d6e27
+AUX munin-1.4.6-munin-version-identifier.patch 10903 RMD160 373e5a9f3c89a0642adc7aa8b6c8a8f7ff6fc585 SHA1 40615deac2ae75b2767e65f8c321c11ba1f97305 SHA256 a403e5f1ade8b8b3c917fd4a1b72eb1857d6d67c6c955c63a72f5876c5eb4dd4
AUX munin-node_conf.d_1.3.3-r1 315 RMD160 e33754bafcfb7b9a737ff282157e2201a9a5bbdd SHA1 fc247c9c369543e00faf28e8ce166814a1079e36 SHA256 4a895da9eba3e7ab4b3ce48c6dc9e29297a32ef5ec33be73581867afc4c5e961
AUX munin-node_conf.d_1.4.5-r3 398 RMD160 d2ec21e963a0cb8618866e282bfb1f3bfaab22a8 SHA1 fb184d277f01256234362268f323bdec64bf395b SHA256 1599bf39d048f8330403d14b43dbc839cb7dfe2e4bc7531f52b4af9d00afd6d0
AUX munin-node_init.d_1.3.3-r1 651 RMD160 80bb9d847eb14425fa5bd6092dfec0328f2f2626 SHA1 77dcab26eaf48e515e2f187b1a5324b507d19eae SHA256 04f1bfa5d97a451bb9aa3bb81caceb269411c55151c78dffeae1b8696fea937d
@@ -9,6 +11,6 @@ AUX munin-node_init.d_1.4.5-r3 773 RMD160 464252b8483cc897f2d5151214c2b77a7b5408
DIST munin-1.4.5.tar.gz 1231622 RMD160 883aa4baacfa5be1ec6a83737d5d241c40ad6912 SHA1 bd1e8ad1fe1cfade1de9c28f3ad69bf35ca495ca SHA256 4f8632713c5267e282b091cf7ef5163c5de321536e76dbaab2204aa23c957138
DIST munin-1.4.6.tar.gz 1238782 RMD160 c4e5129641fa279f8b2668c7cafbb9d2656fd895 SHA1 055bf7da181941ce965e57cab7fe9a71fe57779f SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6
EBUILD munin-1.4.5-r3.ebuild 4629 RMD160 1a65cd42f60a281a314a3d48b029e093c44804f0 SHA1 39c9e7b4f49d1df3bd6c58ca10e0897e9673074a SHA256 6f6198d9b815da6a1c587d65c1205eaa56d30c38fe8db508277ce190b3e469fc
-EBUILD munin-1.4.6.ebuild 4630 RMD160 217ffcc2fdedb18a1c6cfeb079d8e65b8d9cfe95 SHA1 2ae3c23f6b894611d59182dd3532fa55d577a38d SHA256 ea33aca0ffb81c779de239c3c80475f2d89dd20cd618dadd575738c8cbcfcac9
-MISC ChangeLog 10715 RMD160 07a8a93ff2e7de43862cb389041b35a97af3ab71 SHA1 fa0a88de19716ba017659a032cba4af161279568 SHA256 b545ac2aebcfaadb0f07c6f7fc77e2e0e305be1b9a7995e401f77182d4d5dc63
+EBUILD munin-1.4.6-r1.ebuild 4748 RMD160 5843e35187c031bc10b1dcc27c541b3b0981cd1f SHA1 a97e864355dc008d7be510dd913995a0d628721d SHA256 42546a6e14a2b64d0b134ff89308af20708dba4eaaaab5fc6042152ba0aab05c
+MISC ChangeLog 11041 RMD160 b33e675e5d44670029966a773be1da6a2297cd09 SHA1 4f0d11c8bcf81f129c060c7c811c7f9815e23225 SHA256 7a93f008f948ff207e139b7579a7a6da430eb9a6675a390ffe18492197624975
MISC metadata.xml 1059 RMD160 6742332701cfc8cc749b07a5e1aa691c0d25a206 SHA1 7d3c7c25085c83c3948c8b1a4c1c9eddc7460884 SHA256 1133fa77ad1d63df183790f76cfe19d5b4248b964ee07cc4e50a4bd11faa2c69
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.