Merge ~sergiodj/ubuntu/+source/net-snmp:merge-5.9.4-dfsg-1-noble into ubuntu/+source/net-snmp:debian/sid

[Sergio Durigan Junior]

This is the merge of net-snmp 5.9.4+dfgs-1 from Debian unstable.

Overall a simple merge. One patch dropped and the other two needed small adjustments.

PPA: https://launchpad.net/~sergiodj/+archive/ubuntu/net-snmp-merge

dep8 results will be posted later.

[Bryce Harrington (bryce)]

  - net-snmp/5.9.4+dfsg-1ubuntu1~ppa1
    + ✅ net-snmp on noble for arm64 @ 02.01.24 23:51:29 Log️ 🗒️
    + ✅ net-snmp on noble for armhf @ 02.01.24 23:45:58 Log️ 🗒️
    + ✅ net-snmp on noble for ppc64el @ 02.01.24 23:42:55 Log️ 🗒️
    + ✅ net-snmp on noble for s390x @ 02.01.24 23:42:58 Log️ 🗒️

[Bryce Harrington (bryce)]

Changes carried correctly. Builds and tests all look good. Dropped change is present in the upstream git repository.

Only nitpick would be mentioning the version number where it was incorporated, i.e.:

  * Drop changes:
    - d/p/restore-support-for-long-dns-names.patch: Fix snmp requests
      for domains longer than 63 characters (LP #1998461)
      [ Incorporated in upstream release v5.9.4 ]

but that's style preference. Everything else LGTM, +1.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, bryce
Uploaders: sergiodj, bryce
MP auto-approved

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Wednesday, January 03 2024, Bryce Harrington wrote:

> Only nitpick would be mentioning the version number where it was incorporated, i.e.:
>
> * Drop changes:
> - d/p/restore-support-for-long-dns-names.patch: Fix snmp requests
> for domains longer than 63 characters (LP #1998461)
> [ Incorporated in upstream release v5.9.4 ]
>
> but that's style preference. Everything else LGTM, +1.

Thanks, Bryce. I adopted your suggestion.

Uploaded:

$ dput net-snmp_5.9.4+dfsg-1ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/net-snmp/net-snmp_5.9.4+dfsg-1ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/net-snmp/net-snmp_5.9.4+dfsg-1ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading net-snmp_5.9.4+dfsg-1ubuntu1.dsc: done.
  Uploading net-snmp_5.9.4+dfsg.orig.tar.xz: done.
  Uploading net-snmp_5.9.4+dfsg-1ubuntu1.debian.tar.xz: done.
  Uploading net-snmp_5.9.4+dfsg-1ubuntu1_source.buildinfo: done.
  Uploading net-snmp_5.9.4+dfsg-1ubuntu1_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/debian/changelog b/debian/changelog
index aa85fed..a8a673d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+net-snmp (5.9.4+dfsg-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2040402). 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
+    - Fix snmptrapd reconnection issue after hitting MySQL wait_timeout
+      (LP #1999711)
+      + d/p/snmptrapd-mysql-reconnection-after-hitting-wait_timeout.patch
+    - d/p/add-overlay-support.patch: Add Docker's "overlay" filesystem
+      (LP #2007856)
+  * Drop changes:
+    - d/p/restore-support-for-long-dns-names.patch: Fix snmp requests
+      for domains longer than 63 characters (LP #1998461)
+      [ Incorporated upstream release v5.9.4. ]
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 02 Jan 2024 16:17:02 -0500
+
 net-snmp (5.9.4+dfsg-1) unstable; urgency=medium
 
   * New upstream release
@@ -6,6 +25,44 @@ net-snmp (5.9.4+dfsg-1) unstable; urgency=medium
 
  -- Craig Small <[e-mail]>  Sat, 19 Aug 2023 19:36:39 +1000
 
+net-snmp (5.9.3+dfsg-2ubuntu3) lunar; urgency=medium
+
+  * d/p/add-overlay-support.patch: Add Docker's "overlay" filesystem
+    (LP: #2007856)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 22 Mar 2023 18:42:02 -0700
+
+net-snmp (5.9.3+dfsg-2ubuntu2) lunar; urgency=medium
+
+  * Fix snmptrapd reconnection issue after hitting MySQL wait_timeout
+    (LP: #1999711)
+    - d/p/snmptrapd-mysql-reconnection-after-hitting-wait_timeout.patch
+
+ -- Chengen Du <[e-mail]>  Thu, 16 Feb 2023 20:16:57 -0300
+
+net-snmp (5.9.3+dfsg-2ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1993419). 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/restore-support-for-long-dns-names.patch: Fix snmp requests
+      for domains longer than 63 characters (LP #1998461)
+  * Drop changes:
+    - SECURITY UPDATE: DoS via null pointer exception issues
+      + debian/patches/CVE-2022-4479x-1.patch: disallow SET with NULL varbind
+        in agent/snmp_agent.c.
+      + debian/patches/CVE-2022-4479x-2.patch: allow SET with NULL varbind
+        for testing in apps/snmpset.c.
+      + debian/patches/CVE-2022-4479x-3.patch: add test for NULL varbind set
+        in testing/fulltests/default/T0142snmpv2csetnull_simple.
+      + CVE-2022-44792
+      + CVE-2022-44793
+      [ Incorporated by Debian. ]
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 10 Jan 2023 22:54:16 -0500
+
 net-snmp (5.9.3+dfsg-2) unstable; urgency=medium
 
   [ Helmut Grohne ]
@@ -28,6 +85,62 @@ net-snmp (5.9.3+dfsg-2) unstable; urgency=medium
 
  -- Craig Small <[e-mail]>  Tue, 03 Jan 2023 13:01:46 +1100
 
+net-snmp (5.9.3+dfsg-1ubuntu5) lunar; urgency=medium
+
+  * d/p/restore-support-for-long-dns-names.patch: Update patch to match upstream
+    version of commit (LP: #1998461)
+
+ -- Lena Voytek <[e-mail]>  Mon, 09 Jan 2023 13:37:37 -0700
+
+net-snmp (5.9.3+dfsg-1ubuntu4) lunar; urgency=medium
+
+  * SECURITY UPDATE: DoS via null pointer exception issues
+    - debian/patches/CVE-2022-4479x-1.patch: disallow SET with NULL varbind
+      in agent/snmp_agent.c.
+    - debian/patches/CVE-2022-4479x-2.patch: allow SET with NULL varbind
+      for testing in apps/snmpset.c.
+    - debian/patches/CVE-2022-4479x-3.patch: add test for NULL varbind set
+      in testing/fulltests/default/T0142snmpv2csetnull_simple.
+    - CVE-2022-44792
+    - CVE-2022-44793
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 09 Jan 2023 09:41:56 -0500
+
+net-snmp (5.9.3+dfsg-1ubuntu3) lunar; urgency=medium
+
+  * d/p/restore-support-for-long-dns-names.patch: Fix snmp requests for domains
+    longer than 63 characters (LP: #1998461)
+
+ -- Lena Voytek <[e-mail]>  Mon, 05 Dec 2022 07:47:24 -0700
+
+net-snmp (5.9.3+dfsg-1ubuntu2) lunar; urgency=medium
+
+  * Rebuild against new perlapi-5.36.
+
+ -- Gianfranco Costamagna <[e-mail]>  Fri, 04 Nov 2022 12:17:36 +0100
+
+net-snmp (5.9.3+dfsg-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1987349). 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
+  * Drop changes:
+    - SECURITY UPDATE: Multiple security issus
+      + debian/patches/CVE-2022-248xx-1.patch: fix bounds checking in
+        NET-SNMP-AGENT-MIB, NET-SNMP-VACM-MIB, SNMP-VIEW-BASED-ACM-MIB,
+        SNMP-USER-BASED-SM-MIB in  agent/mibgroup/agent/nsLogging.c,
+        agent/mibgroup/agent/nsVacmAccessTable.c,
+        agent/mibgroup/mibII/vacm_vars.c, agent/mibgroup/snmpv3/usmUser.
+      + debian/patches/CVE-2022-248xx-2.patch: recover SET status from
+        delegated request in agent/snmp_agent.c.
+      + CVE-2022-24805, CVE-2022-24806, CVE-2022-24807, CVE-2022-24808,
+        CVE-2022-24809, CVE-2022-24810
+      [ Incorporated upstream. ]
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 22 Aug 2022 19:37:48 -0400
+
 net-snmp (5.9.3+dfsg-1) unstable; urgency=medium
 
   * New upstream source
@@ -35,6 +148,42 @@ net-snmp (5.9.3+dfsg-1) unstable; urgency=medium
 
  -- Craig Small <[e-mail]>  Mon, 18 Jul 2022 21:28:38 +1000
 
+net-snmp (5.9.1+dfsg-4ubuntu2) kinetic; urgency=medium
+
+  * SECURITY UPDATE: Multiple security issus
+    - debian/patches/CVE-2022-248xx-1.patch: fix bounds checking in
+      NET-SNMP-AGENT-MIB, NET-SNMP-VACM-MIB, SNMP-VIEW-BASED-ACM-MIB,
+      SNMP-USER-BASED-SM-MIB in  agent/mibgroup/agent/nsLogging.c,
+      agent/mibgroup/agent/nsVacmAccessTable.c,
+      agent/mibgroup/mibII/vacm_vars.c, agent/mibgroup/snmpv3/usmUser.
+    - debian/patches/CVE-2022-248xx-2.patch: recover SET status from
+      delegated request in agent/snmp_agent.c.
+    - CVE-2022-24805, CVE-2022-24806, CVE-2022-24807, CVE-2022-24808,
+      CVE-2022-24809, CVE-2022-24810
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 25 Jul 2022 13:48:42 -0400
+
+net-snmp (5.9.1+dfsg-4ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1971295, #1894190). 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
+  * Dropped changes:
+    - d/p/lp1945960-*: backport patches for the OpenSSL3 transition
+      (LP #1945960)
+    [ Included in 5.9.1+dfsg-3 ]
+    - d/p/lp1969623-net-snmp-create-v3-user-Fix-the-snmpd.conf-path.patch:
+      Set ${datarootdir} value in net-snmp-create-v3-user and fix
+      error when creating user.  (LP #1969623)
+    [ Included in 5.9.1+dfsg-3 ]
+    - d/control: Build-Depend on libsensors4-dev.
+    [ Unnecessary; libsensors4-dev is a dummy transitional package to
+      libsensors-dev ]
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 13 Jun 2022 17:36:01 -0400
+
 net-snmp (5.9.1+dfsg-4) unstable; urgency=medium
 
   * d/snmpd.postinst: Just chown $SNMP_DIR/snmpd.conf if the file exists.
@@ -80,6 +229,45 @@ net-snmp (5.9.1+dfsg-2) unstable; urgency=medium
 
  -- Craig Small <[e-mail]>  Wed, 25 May 2022 22:09:23 +1000
 
+net-snmp (5.9.1+dfsg-1ubuntu2.1) jammy; urgency=medium
+
+  * d/p/lp1969623-net-snmp-create-v3-user-Fix-the-snmpd.conf-path.patch:
+    Set ${datarootdir} value in net-snmp-create-v3-user and fix
+    error when creating user.  (LP: #1969623)
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 21 Apr 2022 16:14:05 -0400
+
+net-snmp (5.9.1+dfsg-1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild for the perl update.
+
+ -- Matthias Klose <[e-mail]>  Sun, 06 Feb 2022 13:33:00 +0100
+
+net-snmp (5.9.1+dfsg-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946877, #1912390). 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/lp1945960-*: backport patches for the OpenSSL3 transition
+      (LP #1945960)
+  * Dropped changes, incorporated by Debian:
+    - d/libsnmp-dev.install: Don't install archive (.a) files.
+      The archive files are just temporary files generated in order to
+      create the final shared objects (.so), and we don't need to ship
+      them in the package.
+  * Dropped changes, incorporated upstream:
+    - Fix segmentation fault when certificate contains extension
+      longer than 512 bytes (LP #1912389)
+      + d/p/lp1912389-libsnmp-Handle-certificate-loading-errors-gracefully.patch:
+        Skip certificate if loading fails.
+      + d/p/lp1912389-libsnmp-SSL-Increase-extension-buffer-size-to-preven.patch:
+        Make sure enough space is allocated for extensions longer than
+        512 bytes.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 11 Jan 2022 20:39:24 -0500
+
 net-snmp (5.9.1+dfsg-1) unstable; urgency=medium
 
   [ Owen Evans ]
@@ -114,6 +302,66 @@ net-snmp (5.9.1+dfsg-1) unstable; urgency=medium
 
  -- Craig Small <[e-mail]>  Mon, 20 Sep 2021 21:35:58 +1000
 
+net-snmp (5.9+dfsg-3ubuntu4) jammy; urgency=medium
+
+  * d/p/lp1945960-*: backport patches for the OpenSSL3 transition
+    (LP: #1945960)
+
+ -- Simon Chopin <[e-mail]>  Wed, 17 Nov 2021 14:58:54 +0100
+
+net-snmp (5.9+dfsg-3ubuntu3) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:21:20 +0200
+
+net-snmp (5.9+dfsg-3ubuntu2) impish; urgency=medium
+
+  * Fix segmentation fault when certificate contains extension
+    longer than 512 bytes (LP: #1912389)
+    - d/p/lp1912389-libsnmp-Handle-certificate-loading-errors-gracefully.patch:
+      Skip certificate if loading fails.
+    - d/p/lp1912389-libsnmp-SSL-Increase-extension-buffer-size-to-preven.patch:
+      Make sure enough space is allocated for extensions longer than
+      512 bytes.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 25 May 2021 19:03:31 -0400
+
+net-snmp (5.9+dfsg-3ubuntu1) hirsute; 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
+  * Dropped:
+    - d/p/Link-libnetsnmptrapd-against-MYSQL_LIBS.patch:
+      Link libnetsnmptrapd against MYSQL_LIBS. Thanks to Adam
+      Williamson <[e-mail]>.
+      (Closes #886221, LP #1814254)
+      [ Incorporated by Debian. ]
+    - Fix build with mysql-8 (LP #1814270):
+      + d/p/mysql8-replace-bool.patch: newer mysql dropped my_bool, use
+        char instead.
+      [ Incorporated by upstream. ]
+    - 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
+      [ Incorporated by upstream. ]
+    - 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.
+      [ Incorporated by upstream. ]
+  * Added changes:
+    - d/libsnmp-dev.install: Don't install archive (.a) files.
+      The archive files are just temporary files generated in order to
+      create the final shared objects (.so), and we don't need to ship
+      them in the package.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 05 Jan 2021 14:54:24 -0500
+
 net-snmp (5.9+dfsg-3) unstable; urgency=medium
 
   * Source only upload - no changes Closes: #970798
@@ -145,6 +393,57 @@ net-snmp (5.9+dfsg-1) unstable; urgency=medium
 
  -- Craig Small <[e-mail]>  Sat, 22 Aug 2020 17:11:17 +1000
 
+net-snmp (5.8+dfsg-5ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild for the perl update.
+
+ -- Matthias Klose <[e-mail]>  Mon, 09 Nov 2020 10:50:26 +0100
+
+net-snmp (5.8+dfsg-5ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1880724). 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/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.
+    - 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
+    - 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.
+  * Dropped changes, incorporated by Debian:
+    - 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
+    - SECURITY UPDATE: Fix segmentation fault that happens when using the
+      snmpv3 protocol with snmpbulkget. (LP #1877027)
+      + d/p/move-securityStateRef-into-free_securityStateRef.patch:
+        Consolidate the check of the securityStateRef pointer into the
+        free_securityStateRef function.
+      + d/p/prevent-snmpv3-bulkget-errors-double-free.patch:
+        Prevent snmpv3 bulkget errors from becoming resulting in a
+        double free.
+      + d/p/fix-usmStateReference-free.patch:
+        Fix typo on usm_free_usmStateReference from last patch.
+      + d/p/unexport-struct-usmStateReference.patch:
+        Unexport struct usmStateReference and to prevent ABI breakages,
+        since it will be necessary to add a reference count to it.
+      + d/p/introduce-refcount-usmStateReference.patch:
+        Introduce refcount in the struct usmStateReference, and adjust
+        code to properly use the field.
+      + CVE-2019-20892
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 06 Aug 2020 11:42:13 -0400
+
 net-snmp (5.8+dfsg-5) unstable; urgency=medium
 
   * Allow extend to be read-only Closes: #966544
@@ -210,6 +509,68 @@ net-snmp (5.8+dfsg-3) unstable; urgency=medium
 
  -- Craig Small <[e-mail]>  Thu, 02 Jul 2020 13:38:58 +1000
 
+net-snmp (5.8+dfsg-2ubuntu3) groovy; urgency=medium
+
+  * SECURITY UPDATE: Fix segmentation fault that happens when using the
+    snmpv3 protocol with snmpbulkget. (LP: #1877027)
+    - d/p/move-securityStateRef-into-free_securityStateRef.patch:
+      Consolidate the check of the securityStateRef pointer into the
+      free_securityStateRef function.
+    - d/p/prevent-snmpv3-bulkget-errors-double-free.patch:
+      Prevent snmpv3 bulkget errors from becoming resulting in a
+      double free.
+    - d/p/fix-usmStateReference-free.patch:
+      Fix typo on usm_free_usmStateReference from last patch.
+    - d/p/unexport-struct-usmStateReference.patch:
+      Unexport struct usmStateReference and to prevent ABI breakages,
+      since it will be necessary to add a reference count to it.
+    - d/p/introduce-refcount-usmStateReference.patch:
+      Introduce refcount in the struct usmStateReference, and adjust
+      code to properly use the field.
+    - CVE-2019-20892
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 23 Jun 2020 14:37:42 -0400
+
+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:
+    - 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
@@ -242,6 +603,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
@@ -305,6 +747,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.
@@ -316,6 +812,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 ]
@@ -439,6 +972,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
@@ -570,6 +1165,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.
@@ -579,6 +1224,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
@@ -627,6 +1291,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}
@@ -807,6 +1483,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.
@@ -823,6 +1513,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.
@@ -838,6 +1557,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.
@@ -851,6 +1598,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.
@@ -860,6 +1636,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.
@@ -884,6 +1677,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)
@@ -893,6 +1715,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)
@@ -950,6 +1821,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.
@@ -1014,6 +1952,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.
@@ -1024,6 +2023,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:
@@ -1071,6 +2085,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
@@ -1106,6 +2183,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.
@@ -1193,6 +2305,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
 
@@ -1249,6 +2385,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 e940a85..287de31 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: net-snmp
 Section: net
 Priority: optional
-Maintainer: Craig Small <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Craig Small <[e-mail]>
 Build-Depends: debhelper-compat (= 12),
  libtool, libwrap0-dev, libssl-dev, perl:any, perl-xs-dev,
  autoconf, automake, procps,
@@ -9,7 +10,7 @@ Build-Depends: debhelper-compat (= 12),
  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
+ default-libmysqlclient-dev, libpci-dev, dh-apport
 Build-Conflicts: libsnmp-dev
 Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/debian/net-snmp.git
diff --git a/debian/patches/add-overlay-support.patch b/debian/patches/add-overlay-support.patch
 new file mode 100644
index 0000000..daa3d45
--- /dev/null
+++ b/debian/patches/add-overlay-support.patch
@@ -0,0 +1,26 @@
+From 798f206561b7de4bc54453c01ffd21de8ae59c87 Mon Sep 17 00:00:00 2001
+From: Istvan Papp <[e-mail]>
+Date: Wed, 15 Feb 2023 09:51:45 +0100
+Subject: [PATCH] HOST-RESOURCES-MIB: Add overlay support
+
+Fixes: #525
+
+Origin: Upstream, https://github.com/net-snmp/net-snmp/commit/798f206561b7de4bc54453c01ffd21de8ae59c87
+Bug: https://github.com/net-snmp/net-snmp/issues/525
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/net-snmp/+bug/2007856
+Reviewed-By: Bryce Harrington <[e-mail]>
+Last-Updated: 2023-03-22
+---
+ agent/mibgroup/hardware/fsys/fsys_mntent.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- net-snmp.orig/agent/mibgroup/hardware/fsys/fsys_mntent.c	2024-01-02 16:15:30.802485163 -0500
++++ net-snmp/agent/mibgroup/hardware/fsys/fsys_mntent.c	2024-01-02 16:15:30.798485195 -0500
+@@ -87,6 +87,7 @@ static const char *other_fs[] = {
+     "nssvol",
+     "nvmfs",
+     "ocfs2",
++    "overlay",
+     "reiserfs",
+     "simfs",
+     "tmpfs",
diff --git a/debian/patches/series b/debian/patches/series
index e06a6c9..22ea048 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,3 +41,5 @@ snmptrapd_correct_mysql_includes
 makefile_trap_needs_agent
 includes_fix_national_encoding
 configure_fix_version
+snmptrapd-mysql-reconnection-after-hitting-wait_timeout.patch
+add-overlay-support.patch
diff --git a/debian/patches/snmptrapd-mysql-reconnection-after-hitting-wait_timeout.patch b/debian/patches/snmptrapd-mysql-reconnection-after-hitting-wait_timeout.patch
 new file mode 100644
index 0000000..a97b898
--- /dev/null
+++ b/debian/patches/snmptrapd-mysql-reconnection-after-hitting-wait_timeout.patch
@@ -0,0 +1,154 @@
+From: Chengen Du <[e-mail]>
+Date: Wed, 23 Nov 2022 14:11:36 +0800
+Subject: apps/snmptrap: Fix mysql reconnection after hitting wait_timeout
+
+ MySQL v8.0 supports ER_CLIENT_INTERACTION_TIMEOUT, which is not handled
+ in snmptrapd
+
+Origin: upstream, https://github.com/net-snmp/net-snmp/pull/484/files
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1999711
+Last-Update: 2022-12-15
+--- net-snmp.orig/apps/snmptrapd_sql.c	2024-01-02 16:05:28.287582057 -0500
++++ net-snmp/apps/snmptrapd_sql.c	2024-01-02 16:10:47.144801801 -0500
+@@ -248,6 +248,13 @@ netsnmp_sql_disconnected(void)
+     }
+ }
+ 
++static bool
++netsnmp_sql_server_disconnected(int err)
++{
++    // CR_SERVER_GONE_ERROR | CR_SERVER_LOST | ER_CLIENT_INTERACTION_TIMEOUT
++    return CR_SERVER_GONE_ERROR == err || CR_SERVER_LOST == err || 4031 == err;
++}
++
+ /*
+  * convenience function to log mysql errors
+  */
+@@ -255,17 +262,20 @@ static void
+ netsnmp_sql_error(const char *message)
+ {
+     u_int err = mysql_errno(_sql.conn);
+-    snmp_log(LOG_ERR, "%s\n", message);
+-    if (_sql.conn != NULL) {
++
++    if (0 == _sql.connected || !netsnmp_sql_server_disconnected(err)) {
++        snmp_log(LOG_ERR, "%s\n", message);
++        if (_sql.conn != NULL) {
+ #if MYSQL_VERSION_ID >= 40101
+-        snmp_log(LOG_ERR, "Error %u (%s): %s\n",
+-                 err, mysql_sqlstate(_sql.conn), mysql_error(_sql.conn));
++            snmp_log(LOG_ERR, "Error %u (%s): %s\n",
++                     err, mysql_sqlstate(_sql.conn), mysql_error(_sql.conn));
+ #else
+-        snmp(LOG_ERR, "Error %u: %s\n",
+-             mysql_errno(_sql.conn), mysql_error(_sql.conn));
++            snmp(LOG_ERR, "Error %u: %s\n",
++                 mysql_errno(_sql.conn), mysql_error(_sql.conn));
+ #endif
++        }
+     }
+-    if (CR_SERVER_GONE_ERROR == err)
++    if (netsnmp_sql_server_disconnected(err))
+         netsnmp_sql_disconnected();
+ }
+ 
+@@ -277,14 +287,15 @@ netsnmp_sql_stmt_error (MYSQL_STMT *stmt
+ {
+     u_int err = mysql_errno(_sql.conn);
+ 
+-    snmp_log(LOG_ERR, "%s\n", message);
+-    if (stmt) {
+-        snmp_log(LOG_ERR, "SQL Error %u (%s): %s\n",
+-                 mysql_stmt_errno(stmt), mysql_stmt_sqlstate(stmt),
+-                 mysql_stmt_error(stmt));
++    if (0 == _sql.connected || !netsnmp_sql_server_disconnected(err)) {
++        snmp_log(LOG_ERR, "%s\n", message);
++        if (stmt) {
++            snmp_log(LOG_ERR, "SQL Error %u (%s): %s\n",
++                     mysql_stmt_errno(stmt), mysql_stmt_sqlstate(stmt),
++                     mysql_stmt_error(stmt));
++        }
+     }
+-    
+-    if (CR_SERVER_GONE_ERROR == err)
++    if (netsnmp_sql_server_disconnected(err))
+         netsnmp_sql_disconnected();
+ }
+ 
+@@ -307,15 +318,6 @@ netsnmp_mysql_cleanup(void)
+     CONTAINER_FREE(_sql.queue);
+     _sql.queue = NULL;
+ 
+-    if (_sql.trap_stmt) {
+-        mysql_stmt_close(_sql.trap_stmt);
+-        _sql.trap_stmt = NULL;
+-    }
+-    if (_sql.vb_stmt) {
+-        mysql_stmt_close(_sql.vb_stmt);
+-        _sql.vb_stmt = NULL;
+-    }
+-    
+     /** disconnect from server */
+     netsnmp_sql_disconnected();
+ 
+@@ -373,6 +375,21 @@ netsnmp_mysql_connect(void)
+ 
+     DEBUGMSGTL(("sql:connection","connecting\n"));
+ 
++    if (_sql.conn) {
++        mysql_close(_sql.conn);
++        _sql.conn = NULL;
++    }
++
++    _sql.conn = mysql_init (NULL);
++    if (_sql.conn == NULL) {
++        netsnmp_sql_error("mysql_init() failed (out of memory?)");
++        goto err;
++    }
++
++#if HAVE_MYSQL_OPTIONS
++    mysql_options(_sql.conn, MYSQL_READ_DEFAULT_GROUP, "snmptrapd");
++#endif
++
+     /** connect to server */
+     if (mysql_real_connect (_sql.conn, _sql.host_name, _sql.user_name,
+                             _sql.password, _sql.db_name, _sql.port_num,
+@@ -549,16 +566,6 @@ netsnmp_mysql_init(void)
+ #endif
+     _vbind[VBIND_VAL].length = &_vbind[VBIND_VAL].buffer_length;
+ 
+-    _sql.conn = mysql_init (NULL);
+-    if (_sql.conn == NULL) {
+-        netsnmp_sql_error("mysql_init() failed (out of memory?)");
+-        return -1;
+-    }
+-
+-#ifdef HAVE_MYSQL_OPTIONS
+-    mysql_options(_sql.conn, MYSQL_READ_DEFAULT_GROUP, "snmptrapd");
+-#endif
+-
+     /** try to connect; we'll try again later if we fail */
+     (void) netsnmp_mysql_connect();
+ 
+@@ -1115,6 +1122,8 @@ _sql_process_queue(u_int dontcare, void
+         (void) netsnmp_mysql_connect();
+     }
+ 
++    bool sql_has_connected = _sql.connected;
++
+     CONTAINER_FOR_EACH(_sql.queue, (netsnmp_container_obj_func*)_sql_save,
+                        NULL);
+ 
+@@ -1128,8 +1137,10 @@ _sql_process_queue(u_int dontcare, void
+         }
+     }
+ 
+-    CONTAINER_CLEAR(_sql.queue, (netsnmp_container_obj_func*)_sql_buf_free,
+-                    NULL);
++    if (!sql_has_connected || _sql.connected) {
++        CONTAINER_CLEAR(_sql.queue, (netsnmp_container_obj_func*)_sql_buf_free,
++                        NULL);
++    }
+ }
+ 
+ #else
diff --git a/debian/rules b/debian/rules
index 34d8509..63862b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ export PERL5LIB=/usr/lib/$(DEB_HOST_MULTIARCH)/perl/cross-config-$(shell perl -M
 endif
 
 %:
-	dh $@
+	dh $@ --with apport
 
 # The net-snmp Makefiles cannot handle parallel builds
 override_dh_auto_build:
@@ -94,6 +94,10 @@ override_dh_fixperms-arch:
 	chmod -x debian/libsnmp-dev/etc/snmp/*.conf
 	chmod 640 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..f4b55f8
--- /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, they may contain sensitive information.  "
+                        "Do you want to include them 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\['))