Merge lp:~bkbox/ubuntu/maverick/munin/fix-for-699967 into lp:ubuntu/maverick/munin

[BK Box]

SRU: minimal patch for Maverick

This bug will affect anyone using uppercase letters in their hostname. Munin will not be able to collect any data at all until the hostname is changed to all lowercase, or this patch is applied.

When setting the node name, it is changed to lowercase, but is not checked against lowercase when getting a list of services:

http://munin-monitoring.org/changeset/3404#file19

TEST CASE:

Install a new machine with uppercase letters in the hostname (Maverick.example.com) and install munin-node then run the following commands:
# telnet localhost 4949
> nodes
> list Maverick.example.com

or run

# su - munin --shell=/bin/bash -c munin-cron

[Daniel Hahler (blueyed)]

Pasting the comment from the bug:

The following issues have been found by ari-tczew looking at the patch (#ubuntu-motu):
 - debian/changelog should have maverick-proposed as pocket instead of maverick
 - you are patching node/lib/Munin/Node/Server.pm directly, instead of using the patch system (where you are referring to upstream_bug_952.patch, but not including it). Please add the patch instead of patching the source directly.

review: Needs Fixing

[lp:~bkbox/ubuntu/maverick/munin/fix-for-699967]

35. By BK Box on 2011-02-08

Updating the changelog

36. By BK Box on 2011-02-08

reverting the inline change

37. By BK Box on 2011-02-08

Added patch file

[BK Box (bkbox)]

I made the requested changes. Please review.

review: Needs Resubmitting

[Artur Rona (ari-tczew)]

Thank you for your time and efforts making Ubuntu better! However, there are some issues:

1) I'd like to see improved entry in debian/changelog, so I encourage to:
  * debian/patches/upstream_bug_952.patch:
    - Fix empty list of plugins/services. (LP: #699967)

2) Please add DEP3 tags.
https://wiki.ubuntu.com/PackagingGuide/PatchSystems#Patch%20Tagging%20Guidelines

review: Needs Fixing

[lp:~bkbox/ubuntu/maverick/munin/fix-for-699967]

38. By BK Box on 2011-02-09

debian/patches/upstream_bug_952.patch:
-Fix empty list of plugins/services (LP: #699967)

39. By BK Box on 2011-02-09

Added DEP-3 data

40. By BK Box on 2011-02-09

Wrong Authors

[Daniel Hahler (blueyed)]

review: Approve

[Artur Rona (ari-tczew)]

As it's backported from natty, I encourage to update debian/changelog entry (you can copy it):
  * debian/patches/upstream_bug_952.patch:
    - Fix empty list of plugins/services. (LP: #699967)
      Patch is backported from natty.

Also DEP3 tags should be improved:
- update: Description: Fix empty list of plugins/services in munin-node. Patch is backported from natty.
- add next: Origin: upstream, http://munin-monitoring.org/changeset/3404#file19
- update: Bug-Ubuntu: https://launchpad.net/bugs/699967
- add blank line between DEP3 headers and code below, for pedantic look

review: Needs Fixing

[BK Box (bkbox)]

> As it's backported from natty, I encourage to update debian/changelog entry
> (you can copy it):
> * debian/patches/upstream_bug_952.patch:
> - Fix empty list of plugins/services. (LP: #699967)
> Patch is backported from natty.
>
> Also DEP3 tags should be improved:
> - update: Description: Fix empty list of plugins/services in munin-node. Patch
> is backported from natty.
> - add next: Origin: upstream, http://munin-
> monitoring.org/changeset/3404#file19
> - update: Bug-Ubuntu: https://launchpad.net/bugs/699967
> - add blank line between DEP3 headers and code below, for pedantic look

How about now?

[lp:~bkbox/ubuntu/maverick/munin/fix-for-699967]

41. By BK Box on 2011-02-09

    Patch is backported from natty

42. By BK Box on 2011-02-09

More changes to DEP3 and changelog

[BK Box (bkbox)]

This looks good to me, but then again, I submitted it.

review: Approve

[Artur Rona (ari-tczew)]

Beautiful, built fine. Give chance for core-dev.

review: Approve

[Kees Cook (kees)]

This looks good. I'll merge and upload it to -proposed. Thanks!

review: Approve

[Kees Cook (kees)]

Actually, I made an additional small change: the version number wasn't a SRU version. It should have been ubuntu2.1 instead of ubuntu3. But I just fixed it, no worries. :)

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-13 12:54:34 +0000
+++ debian/changelog	2011-02-09 20:29:43 +0000
@@ -1,3 +1,11 @@
+munin (1.4.5-1ubuntu3) maverick-proposed; urgency=low
+
+  * debian/patches/upstream_bug_952.patch:
+    - Fix empty list of plugins/services (LP: #699967)
+      Patch is backported from natty
+
+ -- BK Box <[e-mail]>  Tue, 08 Feb 2011 14:22:37 -0600
+
 munin (1.4.5-1ubuntu2) maverick; urgency=low
 
   * debian/rules: Remove sysvinit symlinks. (LP: #574704, LP: #616404)

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-06-05 07:20:27 +0000
+++ debian/patches/series	2011-02-09 20:29:43 +0000
@@ -1,2 +1,3 @@
+upstream_bug_952.patch
 100-DejaVu-Fonts-Path.patch
 237-hddtemp_smartctl-sata-detect.patch

=== added file 'debian/patches/upstream_bug_952.patch'
--- debian/patches/upstream_bug_952.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/upstream_bug_952.patch	2011-02-09 20:29:43 +0000
@@ -0,0 +1,19 @@
+Description: Fix empty list of plugins/services in munin-node.
+ Patch is backported from natty.
+Origin: upstream, http://munin-monitoring.org/changeset/3404#file19
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/699967
+Last-Update: 2010-02-07
+
+Index: munin-1.4.5/node/lib/Munin/Node/Server.pm
+===================================================================
+--- munin-1.4.5.orig/node/lib/Munin/Node/Server.pm	2011-01-07 19:41:00.000000000 +0100
++++ munin-1.4.5/node/lib/Munin/Node/Server.pm	2011-01-07 19:41:13.000000000 +0100
+@@ -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);