Merge ~lucaskanashiro/ubuntu/+source/munin:xenial-lp-1673357 into ubuntu/+source/munin:ubuntu/xenial-devel

[Lucas Kanashiro]

Fixes LP #1673357 in Xenial. This MP applies a simple upstream patch to address the reported issue. I also filled the SRU template in the bug description.

Here is a PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/xenial-munin/

and autopkgtest output:

autopkgtest [17:58:22]: @@@@@@@@@@@@@@@@@@@@ summary
run-tests PASS

[Sergio Durigan Junior (sergiodj)]

I'll review this one.

[Sergio Durigan Junior (sergiodj)]

Reproduced the problem:

$ munin-run if_enp5s0 config | tail -n 3
up.max -1000000
up.info Traffic of the enp5s0 interface. Maximum speed is -1 Mb/s.
down.max -1000000

And here's what I get when I use the PPA version of the package:

$ munin-run if_enp5s0 config | tail -n 3
up.cdef up,8,*
up.min 0
up.info Traffic of the enp5s0 interface. Unable to determine interface speed. Please install ethtool, wireless-tools, mii-tool or whatever is appropriate for the interface.

The problem seems to be that my VM is not properly reporting the speed of its network interface:

$ cat /sys/class/net/enp5s0/speed
-1

In this specific case, I consider that the problem has been fixed: the warning is much more informative than reporting "-1" as the speed.

The changes themselves look fine, so this is a +1 from me. Thanks!

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks Sergio! Package uploaded:

$ git push pkg upload/2.0.25-2ubuntu0.16.04.4
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 8 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.78 KiB | 364.00 KiB/s, done.
Total 11 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/munin
 * [new tag] upload/2.0.25-2ubuntu0.16.04.4 -> upload/2.0.25-2ubuntu0.16.04.4

$ dput ubuntu ../munin_2.0.25-2ubuntu0.16.04.4_source.changes
Checking signature on .changes
gpg: ../munin_2.0.25-2ubuntu0.16.04.4_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../munin_2.0.25-2ubuntu0.16.04.4.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading munin_2.0.25-2ubuntu0.16.04.4.dsc: done.
  Uploading munin_2.0.25-2ubuntu0.16.04.4.debian.tar.xz: done.
  Uploading munin_2.0.25-2ubuntu0.16.04.4_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index d9be16e..a8c2e8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+munin (2.0.25-2ubuntu0.16.04.4) xenial; urgency=medium
+
+  * Add patch to avoid reporting speed below 0 for network devices
+    (LP: #1673357).
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 20 Jul 2020 10:04:10 -0300
+
 munin (2.0.25-2ubuntu0.16.04.3) xenial-security; urgency=medium
 
   * SECURITY REGRESSION: log spamming issue (LP: #1669764)
diff --git a/debian/patches/0005-Do-not-report-speed-below-0-for-network-devices.patch b/debian/patches/0005-Do-not-report-speed-below-0-for-network-devices.patch
new file mode 100644
index 0000000..783424e
--- /dev/null
+++ b/debian/patches/0005-Do-not-report-speed-below-0-for-network-devices.patch
@@ -0,0 +1,25 @@
+From: Lucas Kanashiro <[e-mail]>
+Date: Mon, 20 Jul 2020 09:58:22 -0300
+Subject: Do not report speed below 0 for network devices
+
+Origin: upstream, https://github.com/munin-monitoring/munin/commit/78c3c3aa
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1673357
+Reviewed-by: Lucas Kanashiro <[e-mail]>
+Last-Updated: 2020-07-20
+---
+ plugins/node.d.linux/if_.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/node.d.linux/if_.in b/plugins/node.d.linux/if_.in
+index 7718979..34b57ef 100644
+--- a/plugins/node.d.linux/if_.in
++++ b/plugins/node.d.linux/if_.in
+@@ -91,7 +91,7 @@ findspeed_mbps() {
+     # iwlist first)
+     if [[ -r /sys/class/net/$INTERFACE/speed ]]; then
+             SPEED=$(cat /sys/class/net/$INTERFACE/speed 2>/dev/null)
+-            if [[ -n "$SPEED" ]]; then
++            if [[ "$SPEED" -gt 0 ]]; then
+                 echo $SPEED
+                 return
+             fi
diff --git a/debian/patches/series b/debian/patches/series
index 0a35848..37dd39c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 CVE-2017-6188.patch
 CVE-2017-6188-2.patch
 CVE-2017-6188-3.patch
+0005-Do-not-report-speed-below-0-for-network-devices.patch