Merge lp:~tdb/ubuntu/precise/munin/fix-for-1066942 into lp:ubuntu/precise-updates/munin

[Tim Bishop]

Fixes LP #1066942. Not sure if I've followed the procedures correctly, but the fix is trivial ultimately.

[Brian Murray (brian-murray)]

The patch itself looks good, the bug just needs updating for the SRU procedure. See the bug for the details, thanks!

review: Approve

Unmerged revisions

49. By Tim Bishop on 2014-07-01

debian/patches/lp_1066942_cps_plugin_autodetection.patch: Fix
autodetection for cps plugin. (LP: #1066942)

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-18 09:43:31 +0000
+++ debian/changelog	2014-07-10 14:41:55 +0000
@@ -1,3 +1,10 @@
+munin (1.4.6-3ubuntu3.5) precise; urgency=low
+
+  * debian/patches/lp_1066942_cps_plugin_autodetection.patch: Fix
+    autodetection for cps plugin. (LP: #1066942)
+
+ -- Tim Bishop <[e-mail]>  Tue, 01 Jul 2014 17:24:25 +0100
+
 munin (1.4.6-3ubuntu3.4) precise-security; urgency=low
 
   * SECURITY UPDATE: multiple denial of service issues

=== added file 'debian/patches/lp_1066942_cps_plugin_autodetection.patch'
--- debian/patches/lp_1066942_cps_plugin_autodetection.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp_1066942_cps_plugin_autodetection.patch	2014-07-10 14:41:55 +0000
@@ -0,0 +1,16 @@
+## Description: Fix cps plugin autodetection
+## Origin/Author: https://github.com/munin-monitoring/munin/commit/3281ce622bbd5dbf2c0ac5be8c951cb9a488e47a
+## Bug: https://bugs.launchpad.net/ubuntu/+source/munin/+bug/1066942
+Index: munin/plugins/node.d.linux/cps_.in
+===================================================================
+--- munin.orig/plugins/node.d.linux/cps_.in	2014-07-01 17:23:46.030555000 +0100
++++ munin/plugins/node.d.linux/cps_.in	2014-07-01 17:24:21.625308963 +0100
+@@ -103,7 +103,7 @@
+ 
+     foreach my $vip (sort keys %{$ipvs}) {
+ 	foreach my $port (sort keys %{$ipvs->{$vip}}) {
+-	    print "cps_${vip}_$port\n";
++	    print "${vip}_$port\n";
+ 	}
+     }
+     exit 0;

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-18 09:43:31 +0000
+++ debian/patches/series	2014-07-10 14:41:55 +0000
@@ -16,3 +16,4 @@
 CVE-2012-3512.patch
 CVE-2012-3512-regression.patch
 CVE-2013-6xxx.patch
+lp_1066942_cps_plugin_autodetection.patch