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

Proposed by Rafael David Tinoco
Status: Merged
Approved by: Rafael David Tinoco
Approved revision: bea3ca6805f3b6971fbcad8068228619b22ba95a
Merged at revision: bea3ca6805f3b6971fbcad8068228619b22ba95a
Proposed branch: ~rafaeldtinoco/ubuntu/+source/net-snmp:lp1871307-focal
Merge into: ubuntu/+source/net-snmp:ubuntu/focal-devel
Diff against target: 57 lines (+35/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/lp1871307-log-once-proc-net-if_inet6-failure.patch (+27/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Lucas Kanashiro Approve
Canonical Server Team Pending
Canonical Server Core Reviewers Pending
Review via email: mp+382003@code.launchpad.net

Commit message

To post a comment you must log in.
Lucas Kanashiro (lucaskanashiro) wrote :

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) wrote :

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

Rafael David Tinoco (rafaeldtinoco) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index d682db3..d6d30a8 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+net-snmp (5.8+dfsg-2ubuntu2) focal; urgency=medium
7+
8+ * d/p/lp1871307-log-once-proc-net-if_inet6-failure.patch (LP: #1871307):
9+ - MIB-II: Only log once that opening /proc/net/if_inet6 failed
10+
11+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Thu, 09 Apr 2020 12:30:45 +0000
12+
13 net-snmp (5.8+dfsg-2ubuntu1) focal; urgency=medium
14
15 * Merge with Debian unstable (LP: #1855943). Remaining changes:
16diff --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
17new file mode 100644
18index 0000000..e1d7a5d
19--- /dev/null
20+++ b/debian/patches/lp1871307-log-once-proc-net-if_inet6-failure.patch
21@@ -0,0 +1,27 @@
22+Description: MIB-II: Only log once that opening /proc/net/if_inet6 failed
23+
24+If IPv6 has been disabled (ipv6.disable=1) then opening /proc/net/if_inet6
25+fails. Only log this once instead of thousand of times a day.
26+
27+Reported-by: Fif <lefif@users.sourceforge.net>
28+
29+Origin: upstream, https://sourceforge.net/p/net-snmp/code/ci/cd09fd8252
30+Bug: https://sourceforge.net/p/net-snmp/bugs/2903/
31+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1871307
32+Reviewed-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
33+Last-Update: 2020-04-09
34+---
35+ agent/mibgroup/ip-mib/data_access/ipaddress_linux.c | 2 +-
36+ 1 file changed, 1 insertion(+), 1 deletion(-)
37+
38+--- a/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
39++++ b/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
40+@@ -234,7 +234,7 @@
41+
42+ #define PROCFILE "/proc/net/if_inet6"
43+ if (!(in = fopen(PROCFILE, "r"))) {
44+- snmp_log_perror("ipaddress_linux: could not open " PROCFILE);
45++ NETSNMP_LOGONCE((LOG_ERR, "ipaddress_linux: could not open " PROCFILE));
46+ return -2;
47+ }
48+
49diff --git a/debian/patches/series b/debian/patches/series
50index 460f931..8160545 100644
51--- a/debian/patches/series
52+++ b/debian/patches/series
53@@ -36,3 +36,4 @@ mysql8-replace-bool.patch
54 autofs-skip-autofs-entries.patch
55 autofs-fix-a-recently-introduced-bug.patch
56 fix-check-hr-filesys-autofs.patch
57+lp1871307-log-once-proc-net-if_inet6-failure.patch

Subscribers

People subscribed via source and target branches