Version bump from upstream, bug fixes

(Portage version: 2.1.10.56/cvs/Linux x86_64)

3 files changed, 50 insertions, 3 deletions

diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index 3bac51d869a5..fd0cd7ce3882 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.68 2012/04/09 23:15:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.69 2012/04/18 16:42:16 darkside Exp $
+
+*munin-1.4.7 (18 Apr 2012)
+
+  18 Apr 2012; Jeremy Olexa <darkside@gentoo.org> -munin-1.4.6-r5.ebuild,
+  +munin-1.4.7.ebuild, +files/munin-1.4.7-munin-version-identifier.patch:
+  Version bump from upstream, bug fixes
 
 *munin-1.4.6-r5 (09 Apr 2012)
 
diff --git a/net-analyzer/munin/files/munin-1.4.7-munin-version-identifier.patch b/net-analyzer/munin/files/munin-1.4.7-munin-version-identifier.patch
new file mode 100644
index 000000000000..22c4d730aa28
--- /dev/null
+++ b/net-analyzer/munin/files/munin-1.4.7-munin-version-identifier.patch
@@ -0,0 +1,41 @@
+From 480f78e713b9e9a425ad425342afac70420a4043 Mon Sep 17 00:00:00 2001
+From: Jeremy Olexa <darkside@gentoo.org>
+Date: Wed, 18 Apr 2012 16:30:57 +0000
+Subject: [PATCH] Fix warnings from previous patch
+
+Use of uninitialized value $Munin::Common::Defaults::MUNIN_VERSION in
+sprintf at /etc/munin/plugins/nginx_status line 110.
+---
+ plugins/node.d/nginx_request.in |    2 ++
+ plugins/node.d/nginx_status.in  |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/node.d/nginx_request.in b/plugins/node.d/nginx_request.in
+index 402ce54..d3933e1 100644
+--- a/plugins/node.d/nginx_request.in
++++ b/plugins/node.d/nginx_request.in
+@@ -55,6 +55,8 @@ license.  Munin is GPLv2 licensed.
+ 
+ =cut
+ 
++use Munin::Plugin;
++
+ my $ret = undef;
+ 
+ if (! eval "require LWP::UserAgent;"){
+diff --git a/plugins/node.d/nginx_status.in b/plugins/node.d/nginx_status.in
+index 0d5d966..a427fc0 100644
+--- a/plugins/node.d/nginx_status.in
++++ b/plugins/node.d/nginx_status.in
+@@ -55,6 +55,8 @@ license.  Munin is GPLv2 licensed.
+ 
+ =cut
+ 
++use Munin::Plugin;
++
+ my $ret = undef;
+ 
+ if (! eval "require LWP::UserAgent;"){
+-- 
+1.7.3.4
+
diff --git a/net-analyzer/munin/munin-1.4.6-r5.ebuild b/net-analyzer/munin/munin-1.4.7.ebuild
index f884e73af183..117230a0b895 100644
--- a/net-analyzer/munin/munin-1.4.6-r5.ebuild
+++ b/net-analyzer/munin/munin-1.4.7.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-1.4.6-r5.ebuild,v 1.1 2012/04/09 23:15:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-1.4.7.ebuild,v 1.1 2012/04/18 16:42:16 darkside Exp $
 
 EAPI=2
 
@@ -65,7 +65,7 @@ src_prepare() {
 	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.*-munin-version-identifier.patch
 	epatch "${FILESDIR}"/${PN}-1.4.6-fix-asterisk-plugins.patch
 	epatch "${FILESDIR}"/${PN}-1.4.6-if_-hardened-v2.patch
 	epatch "${FILESDIR}"/${PN}-1.4.6-apc-multi.patch