Merge lp:~davewalker/ubuntu/natty/munin/uppercase-hostname-mismatch into lp:ubuntu/natty/munin

[Dave Walker]

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-15 14:16:41 +0000
+++ debian/changelog	2011-01-25 13:47:10 +0000
@@ -1,3 +1,12 @@
+munin (1.4.5-3ubuntu2) natty; urgency=low
+
+  * debian/patches/uppercase-hostname-mismatch.patch: Correctly match the
+    hostnames in munin-node, fixing a mismatch when the hostname contains
+    an uppercase character, resolving the failed discovery of plugins to 
+    match. Patch courtesy of upstream svn trunk.  (LP: #707099)
+
+ -- Dave Walker (Daviey) <[e-mail]>  Tue, 25 Jan 2011 13:31:14 +0000
+
 munin (1.4.5-3ubuntu1) natty; urgency=low
 
   * Merge from debian unstable. (LP: #661505)  Remaining changes:

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-10-15 14:16:41 +0000
+++ debian/patches/series	2011-01-25 13:47:10 +0000
@@ -3,3 +3,4 @@
 102-snort-bashism.patch
 103-ejabberd-cli.patch
 237-hddtemp_smartctl-sata-detect.patch
+uppercase-hostname-mismatch.patch

=== added file 'debian/patches/uppercase-hostname-mismatch.patch'
--- debian/patches/uppercase-hostname-mismatch.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/uppercase-hostname-mismatch.patch	2011-01-25 13:47:10 +0000
@@ -0,0 +1,28 @@
+Description: Correctly match the hostnames in munin-node, fixing a mismatch 
+ when the hostname contains an uppercase character, resolving the failed 
+ discovery of plugins to match. 
+Origin: Cherry picked from upstream svn trunk, subset of changeset 3404.
+Bug: http://munin-monitoring.org/ticket/952
+Bug-Ubuntu: https://launchpad.net/bugs/707099
+--- a/node/lib/Munin/Node/Server.pm
++++ b/node/lib/Munin/Node/Server.pm
+@@ -88,6 +88,10 @@
+         my $node = $config->{sconf}{$service}{host_name}
+                 || (split /\s+/, ($host_name || ''))[1]
+                 || $config->{fqdn};
++	
++	# hostname checks are case in-sensitive, 
++	# so store everything in lowercase
++	$node = lc($node);
+ 
+         # hostname checks are case insensitive, so store everything in lowercase
+         $node = lc($node);
+@@ -171,7 +175,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);