Merge ~rafaeldtinoco/ubuntu/+source/net-snmp:lp1871307-focal into ubuntu/+source/net-snmp:ubuntu/focal-devel

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/net-snmp/+bug/1871307

Built locally and works good.

[Lucas Kanashiro (lucaskanashiro)]

I'd upload it to a PPA to build in different architectures just to make sure it doesn't break. Moreover, I'd run autopkgtest against this new version.

However, I see the patch is straightforward and provided by upstream so the steps above should not spot any issue, if you are confident enough please go ahead (I think this is one of the cases our team discussed about the trade-off of doing all these QA steps for small changes).

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

Thanks.. creating a generic PPA to test things like this! Will upload after all builds are good.

[Rafael David Tinoco (rafaeldtinoco)]

Uploaded:

(c)rafaeldtinoco@reviews:~/.../sources/ubuntu/net-snmp$ git push pkg upload/5.8+dfsg-2ubuntu2
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.83 KiB | 124.00 KiB/s, done.
Total 11 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/net-snmp
 * [new tag] upload/5.8+dfsg-2ubuntu2 -> upload/5.8+dfsg-2ubuntu2

(c)rafaeldtinoco@reviews:~/.../sources/ubuntu/net-snmp$ dput ubuntu ../net-snmp_5.8+dfsg-2ubuntu2_source.changes
Checking signature on .changes
gpg: ../net-snmp_5.8+dfsg-2ubuntu2_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: ../net-snmp_5.8+dfsg-2ubuntu2.dsc: Valid signature from A93E0E0AD83C0D0F
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading net-snmp_5.8+dfsg-2ubuntu2.dsc: done.
  Uploading net-snmp_5.8+dfsg-2ubuntu2.debian.tar.xz: done.
  Uploading net-snmp_5.8+dfsg-2ubuntu2_source.buildinfo: done.
  Uploading net-snmp_5.8+dfsg-2ubuntu2_source.changes: done.
Successfully uploaded packages.

[Rafael David Tinoco (rafaeldtinoco)]

PPA used for checking builds: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/generic/+packages

diff --git a/debian/changelog b/debian/changelog
index d682db3..d6d30a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+net-snmp (5.8+dfsg-2ubuntu2) focal; urgency=medium
+
+  * d/p/lp1871307-log-once-proc-net-if_inet6-failure.patch (LP: #1871307):
+    - MIB-II: Only log once that opening /proc/net/if_inet6 failed
+
+ -- Rafael David Tinoco <[e-mail]>  Thu, 09 Apr 2020 12:30:45 +0000
+
 net-snmp (5.8+dfsg-2ubuntu1) focal; urgency=medium
 
   * Merge with Debian unstable (LP: #1855943). Remaining changes:
diff --git a/debian/patches/lp1871307-log-once-proc-net-if_inet6-failure.patch b/debian/patches/lp1871307-log-once-proc-net-if_inet6-failure.patch
 new file mode 100644
index 0000000..e1d7a5d
--- /dev/null
+++ b/debian/patches/lp1871307-log-once-proc-net-if_inet6-failure.patch
@@ -0,0 +1,27 @@
+Description: MIB-II: Only log once that opening /proc/net/if_inet6 failed
+
+If IPv6 has been disabled (ipv6.disable=1) then opening /proc/net/if_inet6
+fails. Only log this once instead of thousand of times a day.
+
+Reported-by: Fif <[e-mail]>
+
+Origin: upstream, https://sourceforge.net/p/net-snmp/code/ci/cd09fd8252
+Bug: https://sourceforge.net/p/net-snmp/bugs/2903/
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1871307
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-04-09
+---
+ agent/mibgroup/ip-mib/data_access/ipaddress_linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
++++ b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
+@@ -234,7 +234,7 @@
+ 
+ #define PROCFILE "/proc/net/if_inet6"
+     if (!(in = fopen(PROCFILE, "r"))) {
+-        snmp_log_perror("ipaddress_linux: could not open " PROCFILE);
++        NETSNMP_LOGONCE((LOG_ERR, "ipaddress_linux: could not open " PROCFILE));
+         return -2;
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 460f931..8160545 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,3 +36,4 @@ mysql8-replace-bool.patch
 autofs-skip-autofs-entries.patch
 autofs-fix-a-recently-introduced-bug.patch
 fix-check-hr-filesys-autofs.patch
+lp1871307-log-once-proc-net-if_inet6-failure.patch