Merge ~rafaeldtinoco/ubuntu/+source/net-snmp:lp1855943-focal into ubuntu/+source/net-snmp:debian/sid

[Rafael David Tinoco]

MERGE BUG: https://bugs.launchpad.net/ubuntu/+source/net-snmp/+bug/1855943
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1855943

PREVIOUS MERGE REQUEST (ALMOST A +1 FROM @PAELZER):
https://code.launchpad.net/~rafaeldtinoco/+git/net-snmp/+merge/376741
All comments (likely) addressed in here.

[Rafael David Tinoco (rafaeldtinoco)]

From previous (Already done) work:

https://code.launchpad.net/~rafaeldtinoco/+git/net-snmp/+merge/376741/comments/987513

Continuing work here...

[Christian Ehrhardt  (paelzer)]

Still functionally correct, continuing our discussion on better headers/changelog in some inline comments.

Once you fixed those please ping me, other than that it functionally LGTM already

review: Needs Fixing

22e8f10... by Rafael David Tinoco on 2019-12-16

 * Skip autofs entries when calling statfs to prevent autofs
   being mounted on snmpd startup (LP: #1835818):
   - d/p/autofs-fix-a-recently-introduced-bug.patch
   - d/p/autofs-skip-autofs-entries.patch

[Rafael David Tinoco (rafaeldtinoco)]

Fixing after your last review and re-pushing.

Thanks for reviewing this!

Obs: mind pushing into the repo if no other changes are needed ?

Thanks!

[Christian Ehrhardt  (paelzer)]

Looking again ...

[Christian Ehrhardt  (paelzer)]

Thanks for fixing those up.
Sorry I have bothered with that so much, but you'll see that it will help all of us on the continued maintenance of this.

All I requested is now present - thanks.
I pushed the tag, but before sponsoring I'll apply the full review template to be sure I'm not missing something.

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/net-snmp
 * [new tag] upload/5.8+dfsg-2ubuntu1 -> upload/5.8+dfsg-2ubuntu1

review: Approve

[Christian Ehrhardt  (paelzer)]

Changelog:
- [√] old content and logical tag match as expected
- [√] changelog entry correct version and targeted codename
- [√] changelog entries correct
- [√] update-maintainer has been run

Actual changes:
- [√] no major upstream changes to consider (looks like good fixes to me)
- [√] no further upstream version to consider
- [√] debian changes look safe to me

Old Delta:
- [√] dropped changes are ok to be dropped
- [√] nothing else to drop
- [√] changes forwarded upstream/debian (if appropriate)

New Delta:
- [√] new patches are good or match what was proposed upstream (refreshing old ones)
- [√] new patches correctly included in debian/patches/series?
- [√] new patches have correct DEP3 metadata

Build/Test:
- [√] build is ok
- [√] sanity checks test fine

review: Approve

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading net-snmp_5.8+dfsg-2ubuntu1.dsc: done.
  Uploading net-snmp_5.8+dfsg.orig.tar.xz: done.
  Uploading net-snmp_5.8+dfsg-2ubuntu1.debian.tar.xz: done.
  Uploading net-snmp_5.8+dfsg-2ubuntu1_source.buildinfo: done.
  Uploading net-snmp_5.8+dfsg-2ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 8482bb7..d682db3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+net-snmp (5.8+dfsg-2ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable (LP: #1855943). Remaining changes:
+    - d/p/fix-check-hr-filesys-autofs.patch (LP #1843036)
+    - Skip autofs entries when calling statfs (LP #1835818):
+      - d/p/autofs-skip-autofs-entries.patch
+      - d/p/autofs-fix-a-recently-introduced-bug.patch
+        [Replaced former Non-upstream patches with clean cherry-pick)
+    - d/p/mysql8-replace-bool.patch: fix build with mysql-8 (LP 1814270)
+    - d/p/Link-libnetsnmptrapd-against-MYSQL_LIBS.patch: Link
+      libnetsnmptrapd against MYSQL_LIBS.
+    - Add apport hook.
+      - d/control: add dh-apport to Build-Depends
+      - d/rules: install the apport hook via debhelper
+      - d/source.apport: apport hook
+  * Dropped patches that are upstream and in Debian 5.8+dfsg-2:
+    - d/p/put-paranthesis-around-macros-which-are-expressions.patch
+      (LP #1843036)
+    - Fix build with mysql-8 (LP #1814270):
+      - d/p/mysql-options.patch: use mysql_options if no {my_,}load_defaults
+        was found.
+      - d/p/mysql-init.patch: handle the various mysql init functions.
+      - d/p/mysql8-headers.patch: detect if my_global.h and my_sys.h are
+        available.
+      - d/p/my-load-defaults.patch: properly detect (and use)
+        my_load_defaults().
+    - d/p/snmptrapd_mysql_init: no need to drop this patch anymore
+      (LP #1814254)
+    - d/p/0001-swinst_apt.c-Fix-indexing-of-hrSWInstalledTable-to-s.patch
+      (LP #1314760)
+
+ -- Rafael David Tinoco <[e-mail]>  Fri, 13 Dec 2019 03:27:52 +0000
+
 net-snmp (5.8+dfsg-2) unstable; urgency=medium
 
   * All MIB directory values removed and just use the default compile-time
@@ -30,6 +63,87 @@ net-snmp (5.8+dfsg-1) unstable; urgency=medium
 
  -- Craig Small <[e-mail]>  Thu, 10 Oct 2019 22:37:15 +1100
 
+net-snmp (5.7.3+dfsg-5ubuntu6) focal; urgency=medium
+
+  * No-change rebuild for the perl update.
+
+ -- Matthias Klose <[e-mail]>  Fri, 18 Oct 2019 19:37:07 +0000
+
+net-snmp (5.7.3+dfsg-5ubuntu5) eoan; urgency=medium
+
+  * d/p/fix-check-hr-filesys-autofs.patch:
+    - On Linux getmntent() is available but getfsstat() not.
+      Hence remove #if HAVE_GETFSSTAT from around the HRFS_type
+      check.
+
+ -- Eric Desrochers <[e-mail]>  Sat, 07 Sep 2019 16:30:53 +0000
+
+net-snmp (5.7.3+dfsg-5ubuntu4) eoan; urgency=medium
+
+  * d/p/put-paranthesis-around-macros-which-are-expressions.patch:
+    - put paranthesis around macros which are expressions.
+    (LP: #1843036)
+
+ -- Eric Desrochers <[e-mail]>  Fri, 06 Sep 2019 23:15:43 +0000
+
+net-snmp (5.7.3+dfsg-5ubuntu3) eoan; urgency=medium
+
+  * Skip autofs entries when calling statfs to prevent autofs being mounted on
+    snmpd startup (LP: #1835818):
+    - d/p/autofs-skip-autofs-entries.patch
+    - d/p/autofs-fix-a-recently-introduced-bug.patch
+
+ -- Ioanna Alifieraki <[e-mail]>  Wed, 21 Aug 2019 12:22:37 +0100
+
+net-snmp (5.7.3+dfsg-5ubuntu2) eoan; urgency=medium
+
+  * No change rebuild for libmysqlclient21.
+
+ -- Robie Basak <[e-mail]>  Mon, 12 Aug 2019 11:32:18 +0000
+
+net-snmp (5.7.3+dfsg-5ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add apport hook.
+      + d/control: add dh-apport to Build-Depends
+      + d/rules: install the apport hook via debhelper
+      + d/source.apport: apport hook
+    - d/p/0001-swinst_apt.c-Fix-indexing-of-hrSWInstalledTable-to-s.patch:
+      set first hrSWInstalledIndex to 1 to follow RFC 2790 (LP #1314760)
+  * Drop:
+    - SECURITY UPDATE: DoS via NULL pointer exception
+      + debian/patches/CVE-2018-18065.patch: fix logic in
+        agent/helpers/table.c.
+      + CVE-2018-18065
+      [Fixed in 5.7.3+dfsg-4]
+    - d/p/my_load_defaults: use my_load_defaults instead of the
+      libmysqlclient-internal load_defaults (LP #1565003). Thanks to Lars
+      Tangvald.
+      [Replaced by a more complete patch]
+    - debian/rules: Fix calculation of UPSTREAM_VERSION and COMPAT_VERSION.
+      [No more needed since 5.7.3+dfsg-5]
+  * Added:
+    - d/p/snmptrapd_mysql_init: drop this patch. The first part fixes builds
+      with newer mariadb, which Ubuntu doesn't use, and the second part is
+      an unrelated change which we are fixing in another patch (see #1814254
+      for details).
+    - d/p/0001-Link-libnetsnmptrapd-against-MYSQL_LIBS.patch: Link
+      libnetsnmptrapd against MYSQL_LIBS.  Thanks to Adam
+      Williamson <[e-mail]>. (Closes: #886221, LP: #1814254)
+    - Fix build with mysql-8 (LP: #1814270):
+      + d/p/mysql8-replace-bool.patch: newer mysql dropped my_bool, use char
+        instead.
+      + d/p/my-load-defaults.patch: properly detect (and use)
+        my_load_defaults(). This replaces the previous
+        my_load_defaults patch.
+      + d/p/mysql8-headers.patch: detect if my_global.h and my_sys.h are
+        available
+      + d/p/mysql-init.patch: handle the various mysql init functions
+      + d/p/mysql-options.patch: use mysql_options if no {my_,}load_defaults
+        was found.
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 05 Feb 2019 16:00:35 -0200
+
 net-snmp (5.7.3+dfsg-5) unstable; urgency=medium
 
   * Use debhelper macros for shlibs Closes: #912685
@@ -93,6 +207,60 @@ net-snmp (5.7.3+dfsg-2) unstable; urgency=medium
 
  -- Craig Small <[e-mail]>  Sat, 31 Mar 2018 20:00:51 +1100
 
+net-snmp (5.7.3+dfsg-1.8ubuntu5) disco; urgency=medium
+
+  * No-change rebuild against latest lm-sensors
+
+ -- Jeremy Bicha <[e-mail]>  Wed, 02 Jan 2019 17:37:45 -0500
+
+net-snmp (5.7.3+dfsg-1.8ubuntu4) disco; urgency=medium
+
+  * debian/rules: Fix calculation of UPSTREAM_VERSION and COMPAT_VERSION.
+
+ -- Adam Conrad <[e-mail]>  Mon, 05 Nov 2018 13:22:39 -0700
+
+net-snmp (5.7.3+dfsg-1.8ubuntu3.18.10.1) cosmic-security; urgency=medium
+
+  * SECURITY UPDATE: DoS via NULL pointer exception
+    - debian/patches/CVE-2018-18065.patch: fix logic in
+      agent/helpers/table.c.
+    - CVE-2018-18065
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 22 Oct 2018 08:03:49 -0400
+
+net-snmp (5.7.3+dfsg-1.8ubuntu3) bionic; urgency=medium
+
+  * d/p/0001-swinst_apt.c-Fix-indexing-of-hrSWInstalledTable-to-s.patch:
+    set first hrSWInstalledIndex to 1 to follow RFC 2790 (LP: #1314760)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 20 Feb 2018 15:24:41 +0100
+
+net-snmp (5.7.3+dfsg-1.8ubuntu2) bionic; urgency=high
+
+  * No change rebuild against openssl1.1.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 06 Feb 2018 17:54:39 +0000
+
+net-snmp (5.7.3+dfsg-1.8ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1742518). Remaining changes:
+    - Add apport hook.
+      + d/control: add dh-apport to Build-Depends
+      + d/rules: install the apport hook via debhelper
+      + d/source.apport: apport hook
+    - d/p/my_load_defaults: use my_load_defaults instead of the
+      libmysqlclient-internal load_defaults (LP #1565003). Thanks to Lars
+      Tangvald.
+  * Dropped:
+    - Avoid installing links in rc[06].d.
+      [It's not clear what it was trying to solve (no details or bug
+      number), but update-rc.d no longer takes start/stop arguments and
+      this delta was actually resulting in warnings during the installation.
+      Also, Ubuntu is using systemd now and this package has systemd service
+      files.]
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 11 Jan 2018 16:07:07 -0200
+
 net-snmp (5.7.3+dfsg-1.8) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -104,6 +272,43 @@ net-snmp (5.7.3+dfsg-1.8) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 23 Dec 2017 23:48:23 +0100
 
+net-snmp (5.7.3+dfsg-1.7ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable (LP: #1712569). Remaining changes:
+    - Add apport hook.
+      + d/control: add dh-apport to Build-Depends
+      + d/rules: install the apport hook via debhelper
+      + d/source.apport: apport hook
+    - Avoid installing links in rc[06].d.
+    - d/p/my_load_defaults: use my_load_defaults instead of the
+      libmysqlclient-internal load_defaults (LP #1565003). Thanks to Lars
+      Tangvald.
+  * Drop:
+    - SECURITY UPDATE: denial of service and possible code execution via
+      incompletely parsed varBind variables
+      + debian/patches/CVE-2015-5621.patch: don't return incorrectly parsed
+        varbinds in snmplib/snmp_api.c.
+      + CVE-2015-5621
+      [Added by Debian as 0025-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
+      in 5.7.3+dfsg-1.1]
+    - debian/snmp.preinst:
+      It turns out that the original motivation why killall was added is gone.
+      So we can just remove the killall introduced by Ubuntu LP #573391
+      (Closes: #781257, LP #1245604)
+      [Fixed in Debian 5.7.3+dfsg-1.1]
+    - Fix "FTBFS with Perl 5.24: error: conflicting types for 'U64'":
+      add patch from upstream git which removes the U64 typedef from the
+      Net-SNMP header files.
+      Thanks to Niky Tyni for extracting the patch.
+      (Closes: #825014)
+      [Fixed in Debian 5.7.3+dfsg-1.5]
+    - Additionally add another patch from upstream git which fixes
+      perl/*/Makefile.PL to fix build failures with Perl 5.24.
+      Cf. https://sourceforge.net/p/net-snmp/bugs/2712/
+      [Fixed in Debian 5.7.3+dfsg-1.5]
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 23 Aug 2017 10:29:35 -0300
+
 net-snmp (5.7.3+dfsg-1.7) unstable; urgency=medium
 
   [ Niels Thykier ]
@@ -227,6 +432,68 @@ net-snmp (5.7.3+dfsg-1.1) unstable; urgency=medium
 
  -- Steinar H. Gunderson <[e-mail]>  Tue, 29 Mar 2016 10:30:24 +0200
 
+net-snmp (5.7.3+dfsg-1ubuntu6) artful; urgency=medium
+
+  * No-change rebuild for perl 5.26.0.
+
+ -- Matthias Klose <[e-mail]>  Wed, 26 Jul 2017 20:11:36 +0000
+
+net-snmp (5.7.3+dfsg-1ubuntu5) zesty; urgency=medium
+
+  * Cherry-pick two patches from Debian's 5.7.3+dfsg-1.5:
+  * Fix "FTBFS with Perl 5.24: error: conflicting types for 'U64'":
+    add patch from upstream git which removes the U64 typedef from the
+    Net-SNMP header files.
+    Thanks to Niky Tyni for extracting the patch.
+    (Closes: #825014)
+  * Additionally add another patch from upstream git which fixes
+    perl/*/Makefile.PL to fix build failures with Perl 5.24.
+    Cf. https://sourceforge.net/p/net-snmp/bugs/2712/
+
+ -- Iain Lane <[e-mail]>  Tue, 25 Oct 2016 10:28:38 +0100
+
+net-snmp (5.7.3+dfsg-1ubuntu4) xenial; urgency=medium
+
+  * Rebuild against libmysqlclient20.
+  * d/p/my_load_defaults: use my_load_defaults instead of the
+    libmysqlclient-internal load_defaults (LP: #1565003). Thanks to Lars
+    Tangvald.
+
+ -- Robie Basak <[e-mail]>  Tue, 05 Apr 2016 15:17:35 +0000
+
+net-snmp (5.7.3+dfsg-1ubuntu3) xenial; urgency=medium
+
+  * Rebuild for Perl 5.22.1.
+
+ -- Colin Watson <[e-mail]>  Fri, 18 Dec 2015 01:20:38 +0000
+
+net-snmp (5.7.3+dfsg-1ubuntu2) wily; urgency=medium
+
+  * debian/snmp.preinst:
+    It turns out that the original motivation why killall was added is gone.
+    So we can just remove the killall introduced by Ubuntu LP #573391
+    (Closes: #781257, LP: #1245604)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 09 Oct 2015 13:18:25 +0200
+
+net-snmp (5.7.3+dfsg-1ubuntu1) wily; urgency=medium
+
+  * Resynchronise with Debian. Remaining changes:
+    - Add apport hook.
+    - Avoid installing links in rc[06].d.
+  * Dropped patches included in new version:
+    - debian/patches/00upstream-btrfs.patch
+    - debian/patches/CVE-2012-6151.patch
+    - debian/patches/CVE-2014-2284.patch
+    - debian/patches/CVE-2014-2285.patch
+  * SECURITY UPDATE: denial of service and possible code execution via
+    incompletely parsed varBind variables
+    - debian/patches/CVE-2015-5621.patch: don't return incorrectly parsed
+      varbinds in snmplib/snmp_api.c.
+    - CVE-2015-5621
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 17 Aug 2015 12:58:43 -0400
+
 net-snmp (5.7.3+dfsg-1) unstable; urgency=medium
 
   * Imported Upstream version 5.7.3+dfsg
@@ -358,6 +625,56 @@ net-snmp (5.7.2.1~dfsg-1) experimental; urgency=medium
 
  -- Hideki Yamane <[e-mail]>  Sun, 30 Mar 2014 19:58:39 +0900
 
+net-snmp (5.7.2~dfsg-8.1ubuntu5) utopic; urgency=medium
+
+  * Backport from 5.7.2.1~dfsg-6.1:
+    - Fix "hardcodes /usr/lib/perl5":
+      Make debian/libsnmp-perl.install executable and use
+      $Config{vendorarch} to get the perl library directory. Patch from Niko
+      Tyni.
+      (Closes: #751918)
+
+ -- Colin Watson <[e-mail]>  Wed, 20 Aug 2014 11:16:35 +0100
+
+net-snmp (5.7.2~dfsg-8.1ubuntu4) utopic; urgency=medium
+
+  * Rebuild for Perl 5.20.0.
+
+ -- Colin Watson <[e-mail]>  Wed, 20 Aug 2014 00:21:26 +0100
+
+net-snmp (5.7.2~dfsg-8.1ubuntu3) trusty; urgency=medium
+
+  * SECURITY UPDATE: denial of service via AgentX subagent timeout
+    - debian/patches/CVE-2012-6151.patch: track cancelled sessions in
+      agent/mibgroup/agentx/{master.c,master_admin.c}, agent/snmp_agent.c,
+      include/net-snmp/agent/snmp_agent.h.
+    - CVE-2012-6151
+  * SECURITY UPDATE: denial of service when ICMP-MIB is in use
+    - debian/patches/CVE-2014-2284.patch: fix ICMP mib table handling in
+      agent/mibgroup/mibII/icmp.c, agent/mibgroup/mibII/kernel_linux.*.
+    - CVE-2014-2284
+  * SECURITY UPDATE: denial of service in perl trap handler
+    - debian/patches/CVE-2014-2285.patch: handle empty community string in
+      perl/TrapReceiver/TrapReceiver.xs.
+    - CVE-2014-2285
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 08 Apr 2014 08:17:14 -0400
+
+net-snmp (5.7.2~dfsg-8.1ubuntu2) trusty; urgency=medium
+
+  * Add 00upstream-btrfs.patch: Add btrfs support to hrFSTable. Cherrypicked
+    from upstream, by way of Nafallo Bjälevik. Thanks! (LP: #1289503)
+
+ -- Martin Pitt <[e-mail]>  Wed, 12 Mar 2014 13:24:18 +0100
+
+net-snmp (5.7.2~dfsg-8.1ubuntu1) trusty; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Add apport hook.
+    - Avoid installing links in rc[06].d.
+
+ -- Colin Watson <[e-mail]>  Tue, 29 Oct 2013 06:29:46 -0700
+
 net-snmp (5.7.2~dfsg-8.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -367,6 +684,25 @@ net-snmp (5.7.2~dfsg-8.1) unstable; urgency=low
 
  -- Laurent Bigonville <[e-mail]>  Sat, 13 Jul 2013 17:13:09 +0200
 
+net-snmp (5.7.2~dfsg-8ubuntu2) trusty; urgency=low
+
+  * Rebuild for Perl 5.18.
+
+ -- Colin Watson <[e-mail]>  Mon, 21 Oct 2013 12:30:05 +0100
+
+net-snmp (5.7.2~dfsg-8ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable (LP: #1200516).  Remaining changes:
+    + Add apport hook (LP: #533603):
+      - debian/source.apport: apport hook
+      - debian/control: Build-depends on dh-apport.
+      - debian/rules:
+        + Add --with apport.
+        + override_dh_apport to install hook on snmpd package only.
+  * Call dh_installinit correctly to avoid installing links in rc[06].d
+
+ -- Yolanda Robla <[e-mail]>  Fri, 12 Jul 2013 09:47:12 +0200
+
 net-snmp (5.7.2~dfsg-8) unstable; urgency=low
 
   * add libsnmp-perl.preinst to deal with empty directory by libsnmp15
@@ -415,6 +751,18 @@ net-snmp (5.7.2~dfsg-5) unstable; urgency=low
 
  -- Hideki Yamane <[e-mail]>  Sun, 19 May 2013 23:09:52 +0900
 
+net-snmp (5.7.2~dfsg-4ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules: Don't stop service in runlevels 0 and 6.
+    - debian/snmpd.init: LSBify the init script.
+    - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
+      by snmp user before install/uninstall.
+    - Add apport hook.
+  * debian/patches/ubuntu-fix-lp-587828.patch: Drop. Fixed upstream.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 16 May 2013 21:01:27 -0400
+
 net-snmp (5.7.2~dfsg-4) unstable; urgency=low
 
   * debian/snmpd.{init,default,postinst}
@@ -595,6 +943,20 @@ net-snmp (5.7.2~dfsg-1~0.1) experimental; urgency=low
 
  -- Hideki Yamane <[e-mail]>  Sun, 27 Jan 2013 11:57:29 +0900
 
+net-snmp (5.4.3~dfsg-2.7ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/rules: Don't stop service in runlevels 0 and 6.
+    - debian/snmpd.init: LSBify the init script.
+    - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
+      by snmp user before install/uninstall.
+    - Add apport hook.
+    - debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
+      arches
+    - debian/{control,rules}: Use dh_python2
+
+ -- Logan Rosen <[e-mail]>  Tue, 04 Dec 2012 16:57:00 -0500
+
 net-snmp (5.4.3~dfsg-2.7) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -611,6 +973,35 @@ net-snmp (5.4.3~dfsg-2.6) unstable; urgency=low
 
  -- David Prévot <[e-mail]>  Sun, 18 Nov 2012 09:24:30 -0400
 
+net-snmp (5.4.3~dfsg-2.5ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/rules: Don't stop service in runlevels 0 and 6.
+    - debian/snmpd.init: LSBify the init script.
+    - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
+      by snmp user before install/uninstall.
+    - Add apport hook.
+    - debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
+      arches
+    - debian/{control,rules}: Use dh_python2
+  * Dropped changes:
+    - debian/patches/50_use_bash.patch: Patch wasn't actually being
+      applied, and upstream apparently fixed this in 5.4.2.
+    - debian/patches/52_fix_snmpcmd_1_typo.patch: Patch wasn't actually
+      being applied, and fix is included in 56_manpage.patch.
+    - debian/snmpd.postinst: Source debconf before doing work: included in
+      debian package now.
+    - debian/patches/99-fix-ubuntu-div0.patch: wasn't applied.
+    - debian/patches/CVE-2008-6123.*: wasn't applied.
+    - debian/patches/CVE-2012-2141.patch: use debian's patch.
+    - debian/README.Debian-source: this change is irrelevant since we
+      use the debian tarball as-is.
+    - debian/rules: removed misc irrelevant and undocumented changes.
+    - debian/snmpd.postinst: no longer need to remove shutdown and reboot
+      links since this is from Maverick-era.
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 20 Jun 2012 09:45:11 -0400
+
 net-snmp (5.4.3~dfsg-2.5) unstable; urgency=medium
 
   * Non-maintainer upload by the Security Team.
@@ -626,6 +1017,34 @@ net-snmp (5.4.3~dfsg-2.5) unstable; urgency=medium
 
  -- Luk Claes <[e-mail]>  Sun, 27 May 2012 17:22:01 +0200
 
+net-snmp (5.4.3~dfsg-2.4ubuntu2) quantal; urgency=low
+
+  * SECURITY UPDATE: denial of service via SNMP GET with non-existent
+    extension table entry
+    - debian/patches/CVE-2012-2141.patch: validate line_idx in
+      agent/mibgroup/agent/extend.c.
+    - CVE-2012-2141
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 22 May 2012 16:30:48 -0400
+
+net-snmp (5.4.3~dfsg-2.4ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing.  Remaining changes:
+    - net-snmp-config: Use bash.
+    - Removed multiuser option when calling update-rc.d.
+    - debian/snmpd.init: LSBify the init script.
+    - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in
+      snmpcmd.1.
+    - debian/snmpd.postinst: Source debconf before doing work.
+    - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
+      by snmp user before install/uninstall.
+    - Add apport hook.
+    - debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
+      arches
+    - debian/rules: Use dh_python2
+
+ -- Chuck Short <[e-mail]>  Mon, 23 Jan 2012 09:44:25 -0500
+
 net-snmp (5.4.3~dfsg-2.4) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -639,6 +1058,35 @@ net-snmp (5.4.3~dfsg-2.4) unstable; urgency=low
 
  -- Christian Perrier <[e-mail]>  Mon, 19 Dec 2011 07:34:31 +0100
 
+net-snmp (5.4.3~dfsg-2.3ubuntu3) precise; urgency=low
+
+  * Build using dh_python2.
+
+ -- Matthias Klose <[e-mail]>  Wed, 14 Dec 2011 15:48:05 +0100
+
+net-snmp (5.4.3~dfsg-2.3ubuntu2) precise; urgency=low
+
+  * Rebuild for Perl 5.14.
+
+ -- Colin Watson <[e-mail]>  Tue, 15 Nov 2011 20:49:15 +0000
+
+net-snmp (5.4.3~dfsg-2.3ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - net-snmp-config: Use bash.
+    - Removed multiuser option when calling update-rc.d.
+    - debian/snmpd.init: LSBify the init script.
+    - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in
+      snmpcmd.1.
+    - debian/snmpd.postinst: Source debconf before doing work.
+    - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
+      by snmp user before install/uninstall.
+    - Add apport hook.
+    - debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
+      arches.
+
+ -- Chuck Short <[e-mail]>  Sat, 27 Aug 2011 18:10:55 +0000
+
 net-snmp (5.4.3~dfsg-2.3) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -648,6 +1096,23 @@ net-snmp (5.4.3~dfsg-2.3) unstable; urgency=low
 
  -- Stephen Gran <[e-mail]>  Sat, 27 Aug 2011 09:10:09 +0000
 
+net-snmp (5.4.3~dfsg-2.2ubuntu1) oneiric; urgency=low
+
+  * Resynchronise with Debian (LP: #780149).  Remaining changes:
+    - net-snmp-config: Use bash.
+    - Removed multiuser option when calling update-rc.d.
+    - debian/snmpd.init: LSBify the init script.
+    - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in
+      snmpcmd.1.
+    - debian/snmpd.postinst: Source debconf before doing work.
+    - debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
+      by snmp user before install/uninstall.
+    - Add apport hook.
+    - debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
+      arches.
+
+ -- Colin Watson <[e-mail]>  Tue, 10 May 2011 06:14:05 +0100
+
 net-snmp (5.4.3~dfsg-2.2) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -672,6 +1137,35 @@ net-snmp (5.4.3~dfsg-2.1) unstable; urgency=high
 
  -- Cyril Brulebois <[e-mail]>  Sat, 07 May 2011 12:14:26 +0200
 
+net-snmp (5.4.3~dfsg-2ubuntu2) oneiric; urgency=low
+
+  * Rebuild for Perl 5.12.
+
+ -- Colin Watson <[e-mail]>  Sat, 07 May 2011 23:29:06 +0100
+
+net-snmp (5.4.3~dfsg-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Set Ubuntu maintainer address.
+    - net-snmp-config: Use bash (LP: #104738)
+    - Removed multiuser option when calling update-rc.d (LP: #254261)
+    - debian/snmpd.init: LSBify the init script.
+    - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
+      (LP: #250459)
+    - debian/snmpd.postinst: source debconf before doing work. (LP: #589056)
+    - debian/snmp.preinst, debian/snmp.prerm: kill any/all processes owned by
+      snmp user before install/uninstall (LP: #573391)
+    - Add apport hook (LP: #533603):
+      - debian/control: Build-depends on dh-apport.
+      - debian/rules:
+        + Add --with apport.
+        + override_dh_apport to install hook on snmpd package only.
+     - debian/patches/ubntu-fix-lp-58728.patch: Fix row creation for 64bit
+       arches. (LP: #587828)
+     - Fix build failures with ld --no-add-needed.
+
+ -- Chuck Short <[e-mail]>  Thu, 06 Jan 2011 00:35:28 +0000
+
 net-snmp (5.4.3~dfsg-2) unstable; urgency=high
 
   * Add libperl-dev to libsnmp-dev dependencies (Closes: #608794)
@@ -681,6 +1175,55 @@ net-snmp (5.4.3~dfsg-2) unstable; urgency=high
 
  -- Jochen Friedrich <[e-mail]>  Wed, 05 Jan 2011 13:03:32 +0100
 
+net-snmp (5.4.3~dfsg-1ubuntu5) natty; urgency=low
+
+  * Fix build failure with ld --no-add-needed.
+
+ -- Matthias Klose <[e-mail]>  Fri, 03 Dec 2010 23:45:33 +0000
+
+net-snmp (5.4.3~dfsg-1ubuntu4) natty; urgency=low
+
+  * Rebuild to add support for python 2.7.
+
+ -- Matthias Klose <[e-mail]>  Fri, 03 Dec 2010 00:05:05 +0000
+
+net-snmp (5.4.3~dfsg-1ubuntu3) maverick; urgency=low
+
+  * debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit arches.
+    (LP: #587828)
+
+ -- Chuck Short <[e-mail]>  Wed, 25 Aug 2010 10:18:45 -0400
+
+net-snmp (5.4.3~dfsg-1ubuntu2) maverick; urgency=low
+
+  * No-change rebuild against current debhelper to drop sizable upstream
+    changelog.
+
+ -- Martin Pitt <[e-mail]>  Mon, 02 Aug 2010 08:34:07 +0200
+
+net-snmp (5.4.3~dfsg-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Set Ubuntu maintainer address.
+    - net-snmp-config: Use bash. (LP: #104738)
+    - Removed multiuser option when calling update-rc.d. (LP: #254261)
+    - debian/snmpd.init: LSBify the init script.
+    - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
+      (LP: #250459)
+    - debian/snmpd.postinst: source debconf before doing work, LP: #589056
+    - debian/snmp.preinst, debian/snmp.prerm: kill any/all processes owned by
+      snmp user before install/uninstall, LP: #573391
+    - Add apport hook (LP: #533603):
+    - debian/{snmp,snmpd}.apport: Added.
+    - debian/control: Build-depends on dh-apport.
+    - debian/rules: 
+      + Add --with apport.
+      + override_dh_apport to install hook on snmpd package only.
+   * Dropped patches:
+     - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.. 
+
+ -- Chuck Short <[e-mail]>  Mon, 28 Jun 2010 14:59:36 -0400
+
 net-snmp (5.4.3~dfsg-1) unstable; urgency=low
 
   * New upstream version (Closes: #559109)
@@ -738,6 +1281,73 @@ net-snmp (5.4.2.1~dfsg-4) unstable; urgency=low
 
  -- Jochen Friedrich <[e-mail]>  Tue, 01 Dec 2009 18:40:38 +0100
 
+net-snmp (5.4.2.1~dfsg0ubuntu1-0ubuntu4) maverick; urgency=low
+
+  * debian/snmpd.postinst: source debconf before doing work, LP: #589056
+  * debian/snmp.preinst, debian/snmp.prerm: kill any/all processes owned by
+    snmp user before install/uninstall, LP: #573391
+
+ -- Dustin Kirkland <[e-mail]>  Tue, 22 Jun 2010 14:04:48 -0500
+
+net-snmp (5.4.2.1~dfsg0ubuntu1-0ubuntu3) maverick; urgency=low
+
+  * SECURITY UPDATE: access restriction bypass
+    - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=516801
+    - http://net-snmp.svn.sourceforge.net/viewvc/net-snmp?view=rev&revision=17367
+    - CVE-2008-6123
+
+ -- Corey Wright <[e-mail]>  Mon, 31 May 2010 00:00:29 -0500
+
+net-snmp (5.4.2.1~dfsg0ubuntu1-0ubuntu2) lucid; urgency=low
+
+  * Add apport hook (LP: #533603):
+    - debian/{snmp,snmpd}.apport: Added.
+    - debian/control: Build-depends on dh-apport.
+    - debian/rules: 
+      + Add --with apport.
+      + override_dh_apport to install hook on snmpd package only.
+
+ -- Andres Rodriguez <[e-mail]>  Sun, 28 Mar 2010 00:25:13 -0400
+
+net-snmp (5.4.2.1~dfsg0ubuntu1-0ubuntu1) lucid; urgency=low
+
+  * Repackage upstream tarball to re-add the MIBs: even if they are not
+    modifiable (which is questionable), this is not a reason to keep them
+    out of Ubuntu main.
+  * Revert the changes to prompt about MIB downloads.
+  * Call dh_installinit correctly to avoid installing links in rc[06].d
+  * Temporarily re-add postinst snippet to clean up rc[06].d links left by
+    the previous upload.
+  * Fix egg name listed in debian/rules, apparently needed to fix another
+    build failure.
+
+ -- Steve Langasek <[e-mail]>  Sat, 12 Dec 2009 00:05:34 -0800
+
+net-snmp (5.4.2.1~dfsg-3ubuntu2) lucid; urgency=low
+
+  * Fix FTBFS. 
+
+ -- Chuck Short <[e-mail]>  Thu, 26 Nov 2009 13:20:26 -0500
+
+net-snmp (5.4.2.1~dfsg-3ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes:
+    - Set Ubuntu maintainer address.
+    - net-snmp-config: Use bash. (LP: #104738)
+    - Removed multiuser option when calling update-rc.d. (LP: #254261)
+    - debian/snmpd.init: LSBify the init script.
+    - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
+      (LP: #250459)
+    - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.
+      (LP: #426813).
+   * Dropped patches:
+     - debian/patches/101-fix-ipalias.patch: Applied upstream.
+     - debian/patches/99-fix-net-snmp-syslog.patch: Applied upstream.
+     - debian/patches/99-fix-perl-counter-in-subagent.patch: Applied upstream.
+     - ebian/patches/103-fix-ubuntu-lmsensors.patch: No longer needed.
+
+ -- Chuck Short <[e-mail]>  Thu, 26 Nov 2009 01:27:00 +0000
+
 net-snmp (5.4.2.1~dfsg-3) unstable; urgency=low
 
   * Fix typo in NEWS.
@@ -802,6 +1412,67 @@ net-snmp (5.4.2.1~dfsg-1) unstable; urgency=low
 
  -- Jochen Friedrich <[e-mail]>  Mon, 09 Nov 2009 18:29:10 +0100
 
+net-snmp (5.4.1~dfsg-12ubuntu7) karmic; urgency=low
+
+  * debian/patches/99-fix-ubuntu-div0.patch: Fix division by zero.
+    (LP: #426813).
+
+ -- Chuck Short <[e-mail]>  Mon, 28 Sep 2009 14:02:16 -0400
+
+net-snmp (5.4.1~dfsg-12ubuntu6) karmic; urgency=low
+
+  * debian/patches/101-fix-ipalias.patch : Fix flooding syslog - 
+    Syslog fills with hundreds of these errors if you have a network
+    interface, e.g. eth2, with no IP address, but you have an alias,
+    e.g. eth2:1, that does have an IP address (and netmask).
+    (LP: #270713)
+  * debian/patches/103-fix-ubuntu-lmsensors.patch: Point to the right
+    place for /etc/sensors3.conf. (LP: #192745)
+
+ -- Chuck Short <[e-mail]>  Mon, 14 Sep 2009 12:19:41 -0400
+
+net-snmp (5.4.1~dfsg-12ubuntu5) karmic; urgency=low
+
+  * debian/patches/99-fix-perl-counter-in-subagent.patch: Fix for Counter64 in
+    perl subagent. (LP: #406171)
+
+ -- Chuck Short <[e-mail]>  Fri, 04 Sep 2009 12:10:01 -0500
+
+net-snmp (5.4.1~dfsg-12ubuntu4) karmic; urgency=low
+
+  * debian/patches/99-fix-net-snmp-syslog.patch: Fixes "invalid syslog facility".
+   (LP: #369577)
+
+ -- Chuck Short <[e-mail]>  Wed, 24 Jun 2009 14:44:51 -0400
+
+net-snmp (5.4.1~dfsg-12ubuntu3) jaunty; urgency=low
+
+  * No-change rebuild to fix lpia shared library dependencies.
+
+ -- Colin Watson <[e-mail]>  Thu, 19 Mar 2009 13:00:18 +0000
+
+net-snmp (5.4.1~dfsg-12ubuntu2) jaunty; urgency=low
+
+  * Python 2.6 transition, debian/rules (LP: #338556):
+    - Include /usr/share/python/python.mk.
+    - Use py_sitename and py_setup_install_args macros to install all python
+      stuffs in the right places (/usr/lib/python*/*-packages/) and rebuild.
+
+ -- Alessio Treglia <[e-mail]>  Thu, 12 Mar 2009 00:38:57 +0100
+
+net-snmp (5.4.1~dfsg-12ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Set Ubuntu maintainer address.
+    - net-snmp-config: Use bash. LP: #104738)
+  * Removed multiuser option when calling update-rc.d (LP: #254261).
+  * debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcd.1
+    (LP: #250459)
+  * debian/snmp.init: LSBify the snmpd.init script. Add status notification,
+    based on initial patch by Gary Coady. (LP: #43575)
+
+ -- Chuck Short <[e-mail]>  Wed, 17 Dec 2008 00:58:14 +0000
+
 net-snmp (5.4.1~dfsg-12) unstable; urgency=high
 
   * Urgency high because of RC bug fix.
@@ -812,6 +1483,21 @@ net-snmp (5.4.1~dfsg-12) unstable; urgency=high
 
  -- Jochen Friedrich <[e-mail]>  Tue, 16 Dec 2008 15:29:28 +0100
 
+net-snmp (5.4.1~dfsg-11ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Set Ubuntu maintainer address.
+    - net-snmp-config. Use bash (LP: #104738)
+  * Removed multiuser option when calling update-rc.d (LP: #254261).
+  * debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcd.1
+    (LP: #250459)
+  * debian/snmp.init: LSBify the snmpd.init script. Add status notification,
+    based on inital patch by Gary Coady. (LP: #43575)
+  * Dropped debian/patches/51_CVE-2008-0960.patch: Use debian's instead.
+  * Dropped debian/patches/54_fix_registration_error.patch: Use debian's instead. 
+
+ -- Chuck Short <[e-mail]>  Wed, 05 Nov 2008 02:59:05 +0000
+
 net-snmp (5.4.1~dfsg-11) unstable; urgency=high
 
   * This update fixes the following security issue:
@@ -859,6 +1545,69 @@ net-snmp (5.4.1~dfsg-8) unstable; urgency=low
 
  -- Jochen Friedrich <[e-mail]>  Tue, 03 Jun 2008 13:06:57 +0200
 
+net-snmp (5.4.1~dfsg-7.1ubuntu6) intrepid; urgency=low
+
+  * debian/snmpd.init: Fix snmpd script error. (LP: #270961) 
+
+ -- Chuck Short <[e-mail]>  Mon, 22 Sep 2008 14:18:08 -0400
+
+net-snmp (5.4.1~dfsg-7.1ubuntu5) intrepid; urgency=low
+
+  * debian/snmpd.init: LSBify the snmpd.init script. And add status
+    notification, based on inital patch by Gary Coady. (LP: #43575) 
+  * debian/patches/54_fix_registration_error.patch: Surpresses annoying
+    registrations in startup. (LP: #200614) 
+
+ -- Chuck Short <[e-mail]>  Fri, 12 Sep 2008 13:21:40 -0400
+
+net-snmp (5.4.1~dfsg-7.1ubuntu4) intrepid; urgency=low
+
+  * Fix lsb headers in init script: stop in single user mode 
+    (LP: #254261). 
+
+ -- Mathias Gug <[e-mail]>  Thu, 21 Aug 2008 23:07:59 -0400
+
+net-snmp (5.4.1~dfsg-7.1ubuntu3) intrepid; urgency=low
+
+  [ Salvatore Palma ]
+  * Add 52_fix_snmpcmd_1_typo.patch patch to adjust a typo in 
+    snmpcmd.1 (LP: #250459). 
+
+  [ Mathias Gug ]
+  * Remove multiuser option when calling update-rc.d. (LP: #254261).
+
+ -- Mathias Gug <[e-mail]>  Tue, 12 Aug 2008 23:03:05 -0400
+
+net-snmp (5.4.1~dfsg-7.1ubuntu2) intrepid; urgency=low
+
+  * SECURITY UPDATE: HMAC authentication spoofing.
+  * debian/patches/51_CVE-2008-0960.patch: fixes HMAC authentication spoofing. 
+  * debian/patches/52_use_right_config_file.patch: Use the right configuration
+    file for lmsensors. (LP: #192745)
+
+ -- Chuck Short <[e-mail]>  Mon, 16 Jun 2008 15:47:18 +0000
+
+net-snmp (5.4.1~dfsg-7.1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Set Ubuntu maintainer address.
+    - net-snmp-config: Use bash. LP: #104738.
+    - Add missing Replaces: libsnmp9-dev (<< 5.4~dfsg) to 
+      libsnmp-base to avoid file confict on dapper->hardy upgrades. 
+      (LP: #203610)
+
+ -- Chuck Short <[e-mail]>  Tue, 27 May 2008 13:06:56 -0500
+
+net-snmp (5.4.1~dfsg-7.1) unstable; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Fix buffer overflow in the python and perl module (__snprint_value
+    function)that can be exploited via large OCTETSTRING in an
+    attribute value pair (AVP) leading to arbitrary code
+    execution (CVE-2008-2292; Closes: #482333).
+
+ -- Nico Golde <[e-mail]>  Sat, 24 May 2008 13:12:16 +0200
+
 net-snmp (5.4.1~dfsg-7) unstable; urgency=low
 
   * Add some more Conflicts: and Replaces: magic to allow moving
@@ -894,6 +1643,41 @@ net-snmp (5.4.1~dfsg-5) unstable; urgency=low
 
  -- Jochen Friedrich <[e-mail]>  Fri, 28 Dec 2007 12:43:21 +0100
 
+net-snmp (5.4.1~dfsg-4ubuntu4) hardy; urgency=low
+
+  * Add missing Replaces: libsnmp9-dev (<< 5.4~dfsg) to 
+    libsnmp-base to avoid file confict on dapper->hardy upgrades
+    (LP: #203610)
+
+ -- Michael Vogt <[e-mail]>  Tue, 18 Mar 2008 17:47:13 +0100
+
+net-snmp (5.4.1~dfsg-4ubuntu3) hardy; urgency=low
+
+  * Rebuild with recent python-central.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <[e-mail]>  Mon, 10 Mar 2008 12:46:06 +0000
+
+net-snmp (5.4.1~dfsg-4ubuntu2) hardy; urgency=low
+
+  * net-snmp-config: Use bash. LP: #104738.
+
+ -- Matthias Klose <[e-mail]>  Wed, 06 Feb 2008 14:45:12 +0000
+
+net-snmp (5.4.1~dfsg-4ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable.
+  * Remaining Ubuntu changes:
+    - Remove stop links from rc0 and rc6
+    - Munge Maintainer field as per spec.
+  * Ubuntu changes dropped:
+    - Symlink common files between the packages, CDBS ought to handle that
+      for us automatically.
+  * The latest Debian changes has dropped history from the changelog. Slot in
+    the Ubuntu changes as best I can. 
+
+ -- Steve Kowalik <[e-mail]>  Sat, 08 Dec 2007 14:59:50 +1100
+
 net-snmp (5.4.1~dfsg-4) unstable; urgency=low
 
   * Do it right this time.
@@ -981,6 +1765,30 @@ net-snmp (5.4~dfsg-1) experimental; urgency=low
 
  -- Jochen Friedrich <[e-mail]>  Fri, 13 Apr 2007 16:16:02 +0200
 
+net-snmp (5.3.1-6ubuntu2) gutsy; urgency=low
+
+  * Do not install the upstream changelog in libsnmp10 and libsnmp-base.
+  * Symlink files common in libsnmp10 and libsnmp-base.
+
+ -- Matthias Klose <[e-mail]>  Fri, 05 Oct 2007 14:55:58 +0200
+
+net-snmp (5.3.1-6ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable.
+  * Remaining Ubuntu changes:
+    - Remove stop links from rc0 and rc6
+    - Munge Maintainer field as per spec.
+
+ -- Steve Kowalik <[e-mail]>  Wed, 23 May 2007 08:58:46 +1000
+
+net-snmp (5.3.1-5ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable.
+  * Remaining Ubuntu changes:
+    - Remove stop links from rc0 and rc6
+  * Munge Maintainer field as per spec. 
+
+ -- Steve Kowalik <[e-mail]>  Thu, 10 May 2007 22:20:23 +1000
 
 net-snmp (5.3.1-3) unstable; urgency=low
 
@@ -1037,6 +1845,19 @@ net-snmp (5.3.1-1) experimental; urgency=low
 
  -- Jochen Friedrich <[e-mail]>  Wed, 26 Jul 2006 12:08:46 +0200
 
+net-snmp (5.2.3-4ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove stop links from rc0 and rc6
+
+ -- Scott James Remnant <[e-mail]>  Tue, 28 Nov 2006 12:29:34 +0000
+
+net-snmp (5.2.2-5ubuntu1) edgy; urgency=low
+
+  * Remove stop script symlinks from rc0 and rc6.
+
+ -- Scott James Remnant <[e-mail]>  Fri, 15 Sep 2006 17:32:44 +0100
+
 net-snmp (5.2.2-4) unstable; urgency=low
 
   * Add French translation. Thanks to Thomas Huriaux
diff --git a/debian/control b/debian/control
index 02c87ae..523fab1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: net-snmp
 Section: net
 Priority: optional
-Maintainer: Net-SNMP Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Net-SNMP Packaging Team <[e-mail]>
 Uploaders: Craig Small <[e-mail]>,
  Thomas Anders <[e-mail]>,
  Noah Meyerhans <[e-mail]>
@@ -12,8 +13,8 @@ Build-Depends: debhelper-compat (= 12),
  pkg-config [kfreebsd-i386 kfreebsd-amd64],
  libbsd-dev [kfreebsd-i386 kfreebsd-amd64],
  libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
- libsensors-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- default-libmysqlclient-dev, libpci-dev
+ libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ default-libmysqlclient-dev, libpci-dev, dh-apport
 Build-Conflicts: libsnmp-dev
 Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/debian/net-snmp.git
diff --git a/debian/patches/Link-libnetsnmptrapd-against-MYSQL_LIBS.patch b/debian/patches/Link-libnetsnmptrapd-against-MYSQL_LIBS.patch
new file mode 100644
index 0000000..2469c49
--- /dev/null
+++ b/debian/patches/Link-libnetsnmptrapd-against-MYSQL_LIBS.patch
@@ -0,0 +1,32 @@
+From 9432f629e66e4f9500f6335eab3ad427f84523b2 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <[e-mail]>
+Date: Thu, 20 Jul 2017 10:31:47 -0700
+Subject: [PATCH] Link libnetsnmptrapd against MYSQL_LIBS
+
+When building with MySQL (MariaDB) support, this library must
+be linked against the MySQL client library, or else it will
+have unresolved symbols.
+
+Origin: https://bugzilla.redhat.com/attachment.cgi?id=1301954
+Bug: https://sourceforge.net/p/net-snmp/bugs/2792/
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886221
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/net-snmp/+bug/1814254
+Reviewed By: Rafael David Tinoco <[e-mail]>
+Last-Update: 2019-12-12
+---
+ apps/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apps/Makefile.in b/apps/Makefile.in
+index 1ea4415..e77d433 100644
+--- a/apps/Makefile.in
++++ b/apps/Makefile.in
+@@ -232,7 +232,7 @@ snmppcap$(EXEEXT):    snmppcap.$(OSUFFIX) $(USELIBS)
+ 	$(LINK) ${CFLAGS} -o $@ snmppcap.$(OSUFFIX) ${LDFLAGS} ${LIBS} -lpcap
+ 
+ libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS)
+-	$(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LDFLAGS)
++	$(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LDFLAGS) $(MYSQL_LIBS)
+ 	$(RANLIB) $@
+ 
+ snmpinforminstall:
diff --git a/debian/patches/autofs-fix-a-recently-introduced-bug.patch b/debian/patches/autofs-fix-a-recently-introduced-bug.patch
new file mode 100644
index 0000000..23a55ea
--- /dev/null
+++ b/debian/patches/autofs-fix-a-recently-introduced-bug.patch
@@ -0,0 +1,36 @@
+HOST-MIB: Fix a recently introduced bug
+
+Fixes: cf41e6e91015 ("HOST-MIB: Skip autofs entries")
+
+Note: this bug was not introduced by Josef but by me.
+
+Description: HOST-MIB: Fix a recently introduced bug
+Author: Bart Van Assche <[e-mail]>
+Origin: upstream, https://github.com/net-snmp/net-snmp/commit/a0df31c18c
+Applied-Upstream: v5.8.rc4-386-ga0df31c18 (drop after v5.8.1.pre1)
+Bug: https://sourceforge.net/p/net-snmp/bugs/2968/
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935325
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1835818
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2019-12-16
+
+---
+ agent/mibgroup/host/hrh_storage.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/agent/mibgroup/host/hrh_storage.c b/agent/mibgroup/host/hrh_storage.c
+index 6f8ff6c53..c7c53922a 100644
+--- a/agent/mibgroup/host/hrh_storage.c
++++ b/agent/mibgroup/host/hrh_storage.c
+@@ -371,7 +371,7 @@ really_try_next:
+                                    NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
+             Check_HR_FileSys_NFS())
+             return NULL;
+-        if (Check_HR_FileSys_AutoFs())
++        if (HRFS_entry && Check_HR_FileSys_AutoFs())
+             return NULL;
+         if (store_idx <= NETSNMP_MEM_TYPE_MAX ) {
+ 	    mem = (netsnmp_memory_info*)ptr;
+-- 
+2.24.0
+
diff --git a/debian/patches/autofs-skip-autofs-entries.patch b/debian/patches/autofs-skip-autofs-entries.patch
new file mode 100644
index 0000000..7f5f258
--- /dev/null
+++ b/debian/patches/autofs-skip-autofs-entries.patch
@@ -0,0 +1,237 @@
+HOST-MIB: Skip autofs entries
+
+Do not call statfs() for autofs entries.
+
+See also https://sourceforge.net/p/net-snmp/patches/1350/.
+See also https://sourceforge.net/p/net-snmp/bugs/2968/.
+
+[ bvanassche: Made several small edits ]
+
+Description: HOST-MIB: Skip autofs entries
+Author: Josef Ridky <[e-mail]>
+Origin: upstream, https://github.com/net-snmp/net-snmp/commit/cf41e6e910
+Applied-Upstream: v5.8.rc4-366-gcf41e6e91 (drop after v5.8.1.pre1)
+Bug: https://sourceforge.net/p/net-snmp/bugs/2968/
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935325
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1835818
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2019-12-16
+---
+ agent/mibgroup/hardware/fsys/fsys_mntctl.c |  8 ++++++--
+ agent/mibgroup/hardware/fsys/fsys_mntent.c | 11 +++++++++++
+ agent/mibgroup/hardware/fsys/mnttypes.h    |  3 +++
+ agent/mibgroup/host/hr_filesys.c           | 21 +++++++++++++++++++++
+ agent/mibgroup/host/hr_filesys.h           |  1 +
+ agent/mibgroup/host/hr_storage.c           |  5 ++++-
+ agent/mibgroup/host/hrh_filesys.c          |  6 ++++++
+ agent/mibgroup/host/hrh_filesys.h          |  1 +
+ agent/mibgroup/host/hrh_storage.c          |  5 ++++-
+ include/net-snmp/agent/hardware/fsys.h     |  1 +
+ 10 files changed, 58 insertions(+), 4 deletions(-)
+
+diff --git a/agent/mibgroup/hardware/fsys/fsys_mntctl.c b/agent/mibgroup/hardware/fsys/fsys_mntctl.c
+index e7d9a1c5a..782c8edd2 100644
+--- a/agent/mibgroup/hardware/fsys/fsys_mntctl.c
++++ b/agent/mibgroup/hardware/fsys/fsys_mntctl.c
+@@ -43,8 +43,9 @@ _fsys_type( int type)
+ 
+         case  MNT_NFS:
+         case  MNT_NFS3:
+-        case  MNT_AUTOFS:
+             return NETSNMP_FS_TYPE_NFS;
++        case  MNT_AUTOFS:
++            return NETSNMP_FS_TYPE_AUTOFS;
+ 
+     /*
+      *  The following code covers selected filesystems
+@@ -155,12 +156,15 @@ netsnmp_fsys_arch_load( void )
+          */
+ 
+         /*
+-         *  Optionally skip retrieving statistics for remote mounts
++         *  Skip retrieving statistics for AUTOFS and optionally for remote
++         *  mounts.
+          */
+         if ( (entry->flags & NETSNMP_FS_FLAG_REMOTE) &&
+             netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+                                    NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES))
+             continue;
++        if (entry->type == NETSNMP_FS_TYPE_AUTOFS)
++            continue;
+ 
+         if ( statfs( entry->path, &stat_buf ) < 0 ) {
+             snprintf( tmpbuf, sizeof(tmpbuf), "Cannot statfs %s", entry->path );
+diff --git a/agent/mibgroup/hardware/fsys/fsys_mntent.c b/agent/mibgroup/hardware/fsys/fsys_mntent.c
+index 3cdcea1fb..79e6e4f72 100644
+--- a/agent/mibgroup/hardware/fsys/fsys_mntent.c
++++ b/agent/mibgroup/hardware/fsys/fsys_mntent.c
+@@ -150,6 +150,13 @@ _fsys_type( char *typename )
+               !strcmp(typename, MNTTYPE_LOFS))
+        return NETSNMP_FS_TYPE_OTHER;
+ 
++    /* Detection of AUTOFS.
++     * This file system will be ignored by default
++     */ 
++    else if (!strcmp(typename, MNTTYPE_AUTOFS))
++        return NETSNMP_FS_TYPE_AUTOFS;
++
++
+     /*    
+      *  All other types are silently skipped
+      */
+@@ -239,6 +246,10 @@ netsnmp_fsys_arch_load( void )
+                                    NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES))
+             continue;
+ 
++        /* Skip AUTOFS entries */
++        if (entry->type == NETSNMP_FS_TYPE_AUTOFS)
++            continue;
++
+ #ifdef irix6
+         if ( NSFS_STATFS( entry->path, &stat_buf, sizeof(struct statfs), 0) < 0 )
+ #else
+diff --git a/agent/mibgroup/hardware/fsys/mnttypes.h b/agent/mibgroup/hardware/fsys/mnttypes.h
+index bb1b40173..53f1cc896 100644
+--- a/agent/mibgroup/hardware/fsys/mnttypes.h
++++ b/agent/mibgroup/hardware/fsys/mnttypes.h
+@@ -165,6 +165,9 @@
+ #ifndef MNTTYPE_APP
+ #define MNTTYPE_APP      "app"
+ #endif
++#ifndef MNTTYPE_AUTOFS
++#define MNTTYPE_AUTOFS   "autofs"
++#endif
+ #ifndef MNTTYPE_DEVPTS
+ #define MNTTYPE_DEVPTS   "devpts"
+ #endif
+diff --git a/agent/mibgroup/host/hr_filesys.c b/agent/mibgroup/host/hr_filesys.c
+index 56c8b2095..8caeecf4e 100644
+--- a/agent/mibgroup/host/hr_filesys.c
++++ b/agent/mibgroup/host/hr_filesys.c
+@@ -834,6 +834,27 @@ Check_HR_FileSys_NFS (void)
+     return 0;		/* no NFS file system */
+ }
+ 
++/* This function checks whether current file system is an AutoFs
++ * HRFS_entry must be valid prior to calling this function
++ * return 1 if AutoFs, 0 otherwise
++ */
++int
++Check_HR_FileSys_AutoFs(void)
++{
++#if HAVE_GETFSSTAT
++    if (HRFS_entry->HRFS_type != NULL && 
++#if defined(MNTTYPE_AUTOFS)
++        !strcmp(HRFS_entry->HRFS_type, MNTTYPE_AUTOFS)
++#else
++        !strcmp(HRFS_entry->HRFS_type, "autofs")
++#endif
++        )
++#endif /* HAVE_GETFSSTAT */
++        return 1;  /* AUTOFS */
++
++    return 0; /* no AUTOFS */
++}
++
+ void
+ End_HR_FileSys(void)
+ {
+diff --git a/agent/mibgroup/host/hr_filesys.h b/agent/mibgroup/host/hr_filesys.h
+index 2f00355f3..36cd7dd08 100644
+--- a/agent/mibgroup/host/hr_filesys.h
++++ b/agent/mibgroup/host/hr_filesys.h
+@@ -10,6 +10,7 @@ extern void     Init_HR_FileSys(void);
+ extern FindVarMethod var_hrfilesys;
+ extern int      Get_Next_HR_FileSys(void);
+ extern int      Check_HR_FileSys_NFS(void);
++extern int      Check_HR_FileSys_AutoFs(void);
+ 
+ extern int      Get_FSIndex(char *);
+ extern long     Get_FSSize(char *);     /* Temporary */
+diff --git a/agent/mibgroup/host/hr_storage.c b/agent/mibgroup/host/hr_storage.c
+index a86898451..6b459ec51 100644
+--- a/agent/mibgroup/host/hr_storage.c
++++ b/agent/mibgroup/host/hr_storage.c
+@@ -544,6 +544,8 @@ really_try_next:
+                                         NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
+                  Check_HR_FileSys_NFS())
+                 return NULL;  /* or goto try_next; */
++            if (Check_HR_FileSys_AutoFs())
++                return NULL;
+ 	    if (HRFS_statfs(HRFS_entry->HRFS_mount, &stat_buf) < 0) {
+ 		snmp_log_perror(HRFS_entry->HRFS_mount);
+ 		goto try_next;
+@@ -683,7 +685,8 @@ Get_Next_HR_Store(void)
+ 		if (HRS_index >= 0) {
+ 			if (!(netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, 
+ 							NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) && 
+-						Check_HR_FileSys_NFS())) {
++						Check_HR_FileSys_NFS()) &&
++                            !Check_HR_FileSys_AutoFs()) {
+ 				return HRS_index + NETSNMP_MEM_TYPE_MAX;	
+ 			}
+ 		} else {
+diff --git a/agent/mibgroup/host/hrh_filesys.c b/agent/mibgroup/host/hrh_filesys.c
+index 5ad82b20f..5d2102e24 100644
+--- a/agent/mibgroup/host/hrh_filesys.c
++++ b/agent/mibgroup/host/hrh_filesys.c
+@@ -429,3 +429,9 @@ Check_HR_FileSys_NFS (void)
+ {
+     return (HRFS_entry->flags & NETSNMP_FS_FLAG_REMOTE) ? 1 : 0;
+ }
++
++int
++Check_HR_FileSys_AutoFs (void)
++{
++    return HRFS_entry->type == NETSNMP_FS_TYPE_AUTOFS;
++}
+diff --git a/agent/mibgroup/host/hrh_filesys.h b/agent/mibgroup/host/hrh_filesys.h
+index 568917e09..c0f5d6e8c 100644
+--- a/agent/mibgroup/host/hrh_filesys.h
++++ b/agent/mibgroup/host/hrh_filesys.h
+@@ -10,6 +10,7 @@ extern void     Init_HR_FileSys(void);
+ extern FindVarMethod var_hrhfilesys;
+ extern int      Get_Next_HR_FileSys(void);
+ extern int      Check_HR_FileSys_NFS(void);
++extern int	Check_HR_FileSys_AutoFs(void);
+ 
+ extern int      Get_FSIndex(char *);
+ extern long     Get_FSSize(char *);     /* Temporary */
+diff --git a/agent/mibgroup/host/hrh_storage.c b/agent/mibgroup/host/hrh_storage.c
+index 810766946..6f8ff6c53 100644
+--- a/agent/mibgroup/host/hrh_storage.c
++++ b/agent/mibgroup/host/hrh_storage.c
+@@ -371,6 +371,8 @@ really_try_next:
+                                    NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
+             Check_HR_FileSys_NFS())
+             return NULL;
++        if (Check_HR_FileSys_AutoFs())
++            return NULL;
+         if (store_idx <= NETSNMP_MEM_TYPE_MAX ) {
+ 	    mem = (netsnmp_memory_info*)ptr;
+         }
+@@ -508,7 +510,8 @@ Get_Next_HR_Store(void)
+ 		if (HRS_index >= 0) {
+ 			if (!(netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, 
+ 							NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) && 
+-						Check_HR_FileSys_NFS())) {
++						Check_HR_FileSys_NFS()) &&
++                         !Check_HR_FileSys_AutoFs()) {
+ 				return HRS_index + NETSNMP_MEM_TYPE_MAX;	
+ 			}
+ 		} else {
+diff --git a/include/net-snmp/agent/hardware/fsys.h b/include/net-snmp/agent/hardware/fsys.h
+index 3f2b28440..54ab9d806 100644
+--- a/include/net-snmp/agent/hardware/fsys.h
++++ b/include/net-snmp/agent/hardware/fsys.h
+@@ -41,6 +41,7 @@ typedef struct netsnmp_fsys_info_s netsnmp_fsys_info;
+ #define NETSNMP_FS_TYPE_SYSFS	   (4 | _NETSNMP_FS_TYPE_LOCAL | _NETSNMP_FS_TYPE_SKIP_BIT)
+ #define NETSNMP_FS_TYPE_TMPFS	   (5 | _NETSNMP_FS_TYPE_LOCAL)
+ #define NETSNMP_FS_TYPE_USBFS	   (6 | _NETSNMP_FS_TYPE_LOCAL)
++#define NETSNMP_FS_TYPE_AUTOFS	   (7 | _NETSNMP_FS_TYPE_LOCAL | _NETSNMP_FS_TYPE_SKIP_BIT)
+ 
+ #define NETSNMP_FS_FLAG_ACTIVE   0x01
+ #define NETSNMP_FS_FLAG_REMOTE   0x02
+-- 
+2.24.0
+
diff --git a/debian/patches/fix-check-hr-filesys-autofs.patch b/debian/patches/fix-check-hr-filesys-autofs.patch
new file mode 100644
index 0000000..9751a94
--- /dev/null
+++ b/debian/patches/fix-check-hr-filesys-autofs.patch
@@ -0,0 +1,36 @@
+Description: HOST-MIB, hr_filesys: Fix Check_HR_FileSys_AutoFs()
+    
+ On Linux getmntent() is available but getfsstat() not. Hence remove #if
+ HAVE_GETFSSTAT from around the HRFS_type check.
+
+ See also https://sourceforge.net/p/net-snmp/patches/1350/.
+ Fixes: cf41e6e91015 ("HOST-MIB: Skip autofs entries").
+Author: Bart Van Assche <[e-mail]>
+Origin: upstream, https://github.com/net-snmp/net-snmp/commit/bcb1a6b8afc444bbcd099a195e08f0b01cbc8f6b
+Bug: https://sourceforge.net/p/net-snmp/patches/1350/
+Bug-Ubuntu: https://launchpad.net/bugs/1843036
+Index: net-snmp-5.7.3+dfsg/agent/mibgroup/host/hr_filesys.c
+===================================================================
+--- net-snmp-5.7.3+dfsg.orig/agent/mibgroup/host/hr_filesys.c
++++ net-snmp-5.7.3+dfsg/agent/mibgroup/host/hr_filesys.c
+@@ -846,18 +846,8 @@ Check_HR_FileSys_NFS (void)
+ int
+ Check_HR_FileSys_AutoFs(void)
+ {
+-#if HAVE_GETFSSTAT
+-    if (HRFS_entry->HRFS_type != NULL && 
+-#if defined(MNTTYPE_AUTOFS)
+-        !strcmp(HRFS_entry->HRFS_type, MNTTYPE_AUTOFS)
+-#else
+-        !strcmp(HRFS_entry->HRFS_type, "autofs")
+-#endif
+-        )
+-#endif /* HAVE_GETFSSTAT */
+-        return 1;  /* AUTOFS */
+-
+-    return 0; /* no AUTOFS */
++    return HRFS_entry->HRFS_type &&
++        strcmp(HRFS_entry->HRFS_type, MNTTYPE_AUTOFS) == 0;
+ }
+ 
+ void
diff --git a/debian/patches/mysql8-replace-bool.patch b/debian/patches/mysql8-replace-bool.patch
new file mode 100644
index 0000000..8c66f4a
--- /dev/null
+++ b/debian/patches/mysql8-replace-bool.patch
@@ -0,0 +1,26 @@
+apps/snmptrapd_sql: Fix build against MySQL 8
+
+See also https://sourceforge.net/p/net-snmp/bugs/2922/.
+
+[bvanassche: changed 'int' into 'char']
+
+Description: apps/snmptrapd_sql: Fix build against MySQL 8
+Author: Andreas Hasenack <[e-mail]>
+Origin: upstream, https://github.com/net-snmp/net-snmp/commit/9f4af8c42d
+Bug: https://sourceforge.net/p/net-snmp/bugs/2922/
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1814270
+Applied-Upstream: v5.8.rc4-180-g9f4af8c42 (drop after v5.8.1.pre1)
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2019-12-16
+
+--- a/apps/snmptrapd_sql.c
++++ b/apps/snmptrapd_sql.c
+@@ -194,7 +194,7 @@ typedef struct sql_buf_t {
+  * static bind structures, plus 2 static buffers to bind to.
+  */
+ static MYSQL_BIND _tbind[TBIND_MAX], _vbind[VBIND_MAX];
+-static my_bool    _no_v3;
++static char       _no_v3;
+ 
+ static void _sql_process_queue(u_int dontcare, void *meeither);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1d0cb11..460f931 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,8 @@ snmpcmd_1_groff
 netsnmp_mib_api_3_groff
 snmplib_error_subcontainer
 apps_makefile_use_ldflags
+Link-libnetsnmptrapd-against-MYSQL_LIBS.patch
+mysql8-replace-bool.patch
+autofs-skip-autofs-entries.patch
+autofs-fix-a-recently-introduced-bug.patch
+fix-check-hr-filesys-autofs.patch
diff --git a/debian/rules b/debian/rules
index 181ad5c..1314ba1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ MIB_MODULES += host
 endif
 
 %:
-	dh $@
+	dh $@ --with apport
 
 # The net-snmp Makefiles cannot handle parallel builds
 override_dh_auto_build:
@@ -86,6 +86,10 @@ override_dh_fixperms-arch:
 	chmod -x debian/libsnmp-dev/etc/snmp/*.conf
 	chmod 600 debian/snmpd/etc/snmp/snmp*d.conf
 
+.PHONY: override_dh_apport
+override_dh_apport:
+	dh_apport -psnmpd
+
 override_dh_auto_test:
 	# prevent test since it fails with network configuration under pbuilder/etc.
 	true
diff --git a/debian/source.apport b/debian/source.apport
new file mode 100644
index 0000000..867fe9e
--- /dev/null
+++ b/debian/source.apport
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+'''apport hook for net-snmp
+
+(c) 2010 Andres Rodriguez
+Author: Andres Rodriguez <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+from apport.hookutils import *
+import re
+
+def add_info(report, ui):
+    response = ui.yesno("The contents of your /etc/snmp/snmpd.conf and "
+                        "your /etc/snmp/snmptrapd.conf files may help "
+                        "developers diagnose your bug more quickly.  "
+                        "However, it may contain sensitive information.  "
+                        "Do you want to include it in your bug report?")
+
+    if response == None: # user cancelled
+        raise StopIteration
+
+    elif response == True:
+        attach_conffiles(report, 'snmpd')
+
+        # get version
+        report['SNMPVersion'] = root_command_output(['/usr/sbin/snmpd', '-v'])
+
+        # get syslog stuff
+        report['SyslogSnmpd'] = recent_syslog(re.compile('snmpd\['))
+        report['SyslogSnmptrapd'] = recent_syslog(re.compile('snmptrapd\['))