[munin/el6/master] Add patch for uppercase nodes (fixes 673263)

Kevin Fenzi kevin at fedoraproject.org
Wed Feb 9 02:37:10 UTC 2011


commit faf01a13389d52609f5e31e0e7411bb04c6c9888
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Tue Feb 8 19:36:34 2011 -0700

    Add patch for uppercase nodes (fixes 673263)

 munin-1.4.5-uppercase.patch |   21 +++++++++++++++++++++
 munin.spec                  |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/munin-1.4.5-uppercase.patch b/munin-1.4.5-uppercase.patch
new file mode 100644
index 0000000..3dcd53d
--- /dev/null
+++ b/munin-1.4.5-uppercase.patch
@@ -0,0 +1,21 @@
+diff -Nur munin-1.4.5.orig/node/lib/Munin/Node/Server.pm munin-1.4.5/node/lib/Munin/Node/Server.pm
+--- munin-1.4.5.orig/node/lib/Munin/Node/Server.pm	2010-05-22 16:54:31.000000000 -0600
++++ munin-1.4.5/node/lib/Munin/Node/Server.pm	2011-02-07 15:15:51.527998974 -0700
+@@ -171,7 +171,7 @@
+ 
+     logger ("DEBUG: Running command \"$_\".") if $config->{DEBUG};
+     if (/^list\s*([0-9a-zA-Z\.\-]+)?/i) {
+-        _list_services($session, $1);
++        _list_services($session, lc($1));
+     }
+     elsif (/^cap\s?(.*)/i) {
+         _negotiate_session_capabilities($session, $1);
+@@ -309,7 +309,7 @@
+ sub _list_services {
+     my ($session, $node) = @_;
+ 
+-    $node ||= $config->{fqdn};
++    $node ||= lc($config->{fqdn});
+ 
+     if (exists $nodes{$node}) {
+         my @services = @{$nodes{$node}};
diff --git a/munin.spec b/munin.spec
index eb97ea4..1fa4145 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.4.5
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -12,6 +12,7 @@ Source0: http://downloads.sourceforge.net/sourceforge/munin/%{name}-%{version}.t
 
 Patch1: munin-1.4.0-config.patch
 Patch2: munin-1.4.2-fontfix.patch
+Patch3: munin-1.4.5-uppercase.patch
 
 Source1: munin-1.2.4-sendmail-config
 Source2: munin-1.2.5-hddtemp_smartctl-config
@@ -130,6 +131,7 @@ java-plugins for munin-node.
 %if 0%{?rhel} == 5
 %patch2 -p0
 %endif
+%patch3 -p1
 
 %build
 %if 0%{?rhel} == 5 || 0%{?fedora} > 6
@@ -299,6 +301,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Feb 08 2011 Kevin Fenzi <kevin at tummy.com> - 1.4.5-6
+- Add patch for uppercase nodes (fixes 673263)
+
 * Tue Dec 21 2010 Kevin Fenzi <kevin at tummy.com> - 1.4.5-5
 - Build for ppc64 in epel6 again, just exclude java plugins subpackage. 
 


More information about the scm-commits mailing list