Merge ~vpa1977/ubuntu/+source/munin:2054628 into ubuntu/+source/munin:debian/sid

[Vladimir Petko]

Please review the munin merge.

Note: the changelog for 2.0.74-2ubuntu1 states that sysv tests are dropped, but the delta is still present and tests are not disabled in Debian. I have left this change.

The merge was a clean rebase of Ubuntu delta on new Debian version. I have added a fix for the plugin list test that was not expecting extra plugins.

PPA: ppa:vpa1977/plusone[1]

Changes:
  * Merge with Debian unstable (LP: #2054628). Remaining changes:
    - d/p/munin-node-configure-doc-fix.patch: Remove deprecated
      argument exitonerror and update some snmp arguments to match
      their correct naming.
    - Drop sysvinit autopkgtests, sysvinit is not supported in Ubuntu
    - Add missing test dependency on net-tools for netstat plugin.
    - d/Makefile.config: Use java_compat_level provided by java-common
      to set --release level.
  * New changes:
    - d/t/munin-node/02.plugins.t: add conditional postfix plugin to
      the plugin list test.

Testing:
 - install/remove, install-upgrade-purge tests[2]
   Note: piuparts for some reason attempts to remove
     bsdutils
     libblkid1:amd64
     libuuid1:amd64
     util-linux
     libmount1:amd64
     libsmartcols1:amd64
     and fails.
 - autopkgtest
    + ✅ munin on noble for amd64 @ 22.02.24 22:38:39 Log️ 🗒️
    + ✅ munin on noble for arm64 @ 22.02.24 22:47:06 Log️ 🗒️
    + ✅ munin on noble for armhf @ 22.02.24 22:40:44 Log️ 🗒️
    + ❌ munin on noble for i386 @ 22.02.24 22:37:02 Log️ 🗒️[3]
      • master-cron-systemd FAIL 🟥
      • master-cgi-systemd FAIL 🟥
      • node-systemd FAIL 🟥
      • command1 FAIL 🟥
    + ✅ munin on noble for ppc64el @ 22.02.24 22:30:05 Log️ 🗒️
    + ✅ munin on noble for s390x @ 22.02.24 22:42:02 Log️ 🗒️

The test fails on i386 due to package being uninstallable[4]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone
[2] https://bugs.launchpad.net/ubuntu/+source/munin/+bug/2054628/comments/1
[3] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/i386/m/munin/20240222_223702_5cc54@/log.gz
[4] https://autopkgtest.ubuntu.com/packages/munin/noble/i386

[Zixing Liu (liushuyu-011)]

The merge looks good to me.

Regarding autopkgtest, I have queued an all-proposed test to see if it will co-install with other Java packages currently residing in the -proposed pocket. The results will show in https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/?format=plain after they finish running.

[Zixing Liu (liushuyu-011)]

review: Approve

[Vladimir Petko (vpa1977)]

Uploaded, thank you!!!

diff --git a/debian/Makefile.config b/debian/Makefile.config
index 8778c64..9882482 100644
--- a/debian/Makefile.config
+++ b/debian/Makefile.config
@@ -1,6 +1,8 @@
 # This file overrides variables used by the makefile, so its behaviour
 # becomes suitable for building Debian packages.
 
+include /usr/share/java/java_defaults.mk
+
 PREFIX     = $(DESTDIR)/usr
 CONFDIR    = $(DESTDIR)/etc/munin
 HTMLDIR    = $(DESTDIR)/var/cache/munin/www
@@ -26,3 +28,5 @@ CHGRP      = \#
 
 # Distinction between a Linux and FreeBSD kernel
 OSTYPE     := $(shell debian/ostype_helper)
+
+JFLAGS     := -g --release $(java_compat_level) -Xlint
diff --git a/debian/changelog b/debian/changelog
index 1bc9ccb..0d35b2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+munin (2.0.75-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2054628). Remaining changes:
+    - d/p/munin-node-configure-doc-fix.patch: Remove deprecated
+      argument exitonerror and update some snmp arguments to match
+      their correct naming.
+    - Drop sysvinit autopkgtests, sysvinit is not supported in Ubuntu
+    - Add missing test dependency on net-tools for netstat plugin.
+    - d/Makefile.config: Use java_compat_level provided by java-common
+      to set --release level.
+  * New changes:
+    - d/t/munin-node/02.plugins.t: add conditional postfix plugin to
+      the plugin list test.
+
+ -- Vladimir Petko <[e-mail]>  Thu, 22 Feb 2024 17:17:06 +1300
+
 munin (2.0.75-1) unstable; urgency=medium
 
   * new upstream version:
@@ -5,6 +21,25 @@ munin (2.0.75-1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Mon, 25 Dec 2023 15:17:57 +0100
 
+munin (2.0.74-2ubuntu2) noble; urgency=medium
+
+  * d/Makefile.config: use java_compat_level variable provided by
+    java-common to adjust --release level to the minimum required by the
+    default Java (LP: #2053290).
+
+ -- Vladimir Petko <[e-mail]>  Thu, 15 Feb 2024 12:04:15 +1300
+
+munin (2.0.74-2ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. (LP: #2044187) Remaining changes:
+    - d/p/munin-node-configure-doc-fix.patch: Remove deprecated argument
+      exitnoerror and update some snmp arguments to match their correct naming.
+    - Add missing test dependency on net-tools for netstat plugin.
+  * Dropped changes, included in Debian:
+    - Drop sysvinit autopkgtests, sysvinit is not supported in Ubuntu.
+
+ -- Aaron Rainbolt <[e-mail]>  Tue, 21 Nov 2023 14:10:43 -0600
+
 munin (2.0.74-2) unstable; urgency=medium
 
   * d/control:
@@ -75,6 +110,16 @@ munin (2.0.72-1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Wed, 08 Feb 2023 15:33:04 +0100
 
+munin (2.0.71-2ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add missing test dependency on net-tools for netstat plugin.
+    - Disable sysv autopkgtests
+    - d/p/munin-node-configure-doc-fix.patch: Remove deprecated argument
+      exitnoerror and update some snmp arguments to match their correct naming.
+
+ -- dann frazier <[e-mail]>  Mon, 21 Nov 2022 13:14:25 -0700
+
 munin (2.0.71-2) unstable; urgency=medium
 
   [ dann frazier ]
@@ -83,6 +128,24 @@ munin (2.0.71-2) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Wed, 16 Nov 2022 18:08:55 +0100
 
+munin (2.0.71-1.1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add missing test dependency on net-tools for netstat plugin.
+    - Disable sysv autopkgtests
+    - d/p/munin-node-configure-doc-fix.patch: Remove deprecated argument
+      exitnoerror and update some snmp arguments to match their correct naming.
+  * autopkgtest: Avoid remaining race with cron shutdown. (LP: #1865938)
+
+ -- dann frazier <[e-mail]>  Thu, 10 Nov 2022 06:41:20 -0700
+
+munin (2.0.71-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * No source change upload to rebuild with debhelper 13.10.
+
+ -- Michael Biebl <[e-mail]>  Sat, 15 Oct 2022 12:24:47 +0200
+
 munin (2.0.71-1) unstable; urgency=medium
 
   * New upstream release. Closes: #1019343.
@@ -93,6 +156,25 @@ munin (2.0.71-1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Mon, 26 Sep 2022 14:44:44 +0200
 
+munin (2.0.69-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1986980). Remaining changes:
+    - Add missing test dependency on net-tools for netstat plugin.
+    - Disable sysv autopkgtests
+    - Stop cron and clean cache before running tests, because cron can also run
+      munin
+    - Run the setup again, if upgrading from 2.0.37-1
+    - d/p/munin-node-configure-doc-fix.patch: Remove deprecated argument
+      exitnoerror and update some snmp arguments to match their correct naming.
+      (LP #1680975)
+  * Dropped changes:
+    - Run the setup again, if upgrading from 2.0.37-1
+  * New Changes:
+    - d/p/munin-node-configure-doc-fix.patch: Refresh patch as it was partially
+      fixed upstream
+
+ -- Lena Voytek <[e-mail]>  Thu, 18 Aug 2022 09:36:18 -0700
+
 munin (2.0.69-1) unstable; urgency=medium
 
   [ Holger Levsen ]
@@ -199,6 +281,27 @@ munin (2.0.63-1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Tue, 09 Jun 2020 01:55:12 +0200
 
+munin (2.0.57-1ubuntu2) jammy; urgency=medium
+
+  * d/p/munin-node-configure-doc-fix.patch: Remove deprecated argument
+    exitnoerror and update some snmp arguments to match their correct naming.
+    (LP: #1680975)
+
+ -- Lena Voytek <[e-mail]>  Fri, 12 Nov 2021 15:27:50 -0700
+
+munin (2.0.57-1ubuntu1) groovy; urgency=medium
+
+  * Merge from Debian unstable
+    - Remaining changes:
+      * Add missing test dependency on net-tools for netstat plugin.
+      * Stop cron and clean cache before running tests, because cron
+        can also run munin
+    - Dropped changes:
+      * Run the setup again, if upgrading from 2.0.37-1
+   * Disable sysv autopkgtests
+
+ -- Balint Reczey <[e-mail]>  Thu, 07 May 2020 14:42:21 +0200
+
 munin (2.0.57-1) unstable; urgency=medium
 
   [ Lars Kruse ]
@@ -221,6 +324,17 @@ munin (2.0.57-1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Sat, 14 Mar 2020 18:59:29 +0100
 
+munin (2.0.56-1ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run the setup again, if upgrading from 2.0.37-1.  This change can be
+      dropped after the Ubuntu 20.04 LTS release.
+    - Add missing test dependency on net-tools for netstat plugin.
+    - Stop cron and clean cache before running tests, because cron can also run
+      munin
+
+ -- Balint Reczey <[e-mail]>  Fri, 14 Feb 2020 12:25:00 +0100
+
 munin (2.0.56-1) unstable; urgency=medium
 
   [ Holger Levsen ]
@@ -233,6 +347,24 @@ munin (2.0.56-1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Sat, 08 Feb 2020 00:08:10 +0100
 
+munin (2.0.54-1ubuntu2) focal; urgency=medium
+
+  * Stop cron and clean cache before running tests, because cron can also run
+    munin
+
+ -- Balint Reczey <[e-mail]>  Thu, 13 Feb 2020 19:45:12 +0100
+
+munin (2.0.54-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run the setup again, if upgrading from 2.0.37-1.  This change can be
+      dropped after the Ubuntu 20.04 LTS release.
+    - Add missing test dependency on net-tools for netstat plugin.
+  * Dropped changes, included in Debian:
+    - Drop sysvinit autopkgtests, sysvinit is not supported in Ubuntu.
+
+ -- Steve Langasek <[e-mail]>  Sat, 01 Feb 2020 12:56:26 -0800
+
 munin (2.0.54-1) unstable; urgency=medium
 
   * New upstream release, drop debian/patches merged upstream.
@@ -263,6 +395,16 @@ munin (2.0.52-1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Tue, 14 Jan 2020 13:39:41 +0100
 
+munin (2.0.51-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run the setup again, if upgrading from 2.0.37-1.  This change can be
+      dropped after the Ubuntu 20.04 LTS release.
+    - Add missing test dependency on net-tools for netstat plugin.
+    - Drop sysvinit autopkgtests, sysvinit is not supported in Ubuntu.
+
+ -- Steve Langasek <[e-mail]>  Sat, 19 Oct 2019 23:54:59 -0700
+
 munin (2.0.51-1) unstable; urgency=medium
 
   * New upstream bugfix release.
@@ -282,6 +424,16 @@ munin (2.0.50-1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Thu, 17 Oct 2019 11:18:09 +0200
 
+munin (2.0.49-3ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run the setup again, if upgrading from 2.0.37-1.  This change can be
+      dropped after the Ubuntu 20.04 LTS release.
+    - Add missing test dependency on net-tools for netstat plugin.
+    - Drop sysvinit autopkgtests, sysvinit is not supported in Ubuntu.
+
+ -- Steve Langasek <[e-mail]>  Fri, 16 Aug 2019 00:44:38 -0700
+
 munin (2.0.49-3) unstable; urgency=medium
 
   [ Lars Kruse ]
@@ -321,6 +473,16 @@ munin (2.0.49-2) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Sun, 04 Aug 2019 11:21:12 -0300
 
+munin (2.0.49-1ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run the setup again, if upgrading from 2.0.37-1.  This change can be
+      dropped after the Ubuntu 20.04 LTS release.
+    - Add missing test dependency on net-tools for netstat plugin.
+    - Drop sysvinit autopkgtests, sysvinit is not supported in Ubuntu.
+
+ -- Steve Langasek <[e-mail]>  Fri, 14 Jun 2019 14:36:42 -0700
+
 munin (2.0.49-1) unstable; urgency=medium
 
   [ Lars Kruse ]
@@ -356,6 +518,29 @@ munin (2.0.49-1) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Thu, 16 May 2019 01:21:08 +0200
 
+munin (2.0.47-1ubuntu3) disco; urgency=medium
+
+  * Add missing test dependency on net-tools for netstat plugin.
+
+ -- Steve Langasek <[e-mail]>  Fri, 12 Apr 2019 17:33:48 -0700
+
+munin (2.0.47-1ubuntu2) disco; urgency=medium
+
+  * Drop sysvinit autopkgtests, sysvinit is not supported in Ubuntu.
+
+ -- Steve Langasek <[e-mail]>  Fri, 12 Apr 2019 15:01:41 -0700
+
+munin (2.0.47-1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Run the setup again, if upgrading from 2.0.37-1.  This change can be
+      dropped after the Ubuntu 20.04 LTS release.
+  * Dropped changes, included in Debian:
+    - Revert more of f1f48dee so that directories are again setup correctly on
+      initial installations of munin-node and munin-async.
+
+ -- Steve Langasek <[e-mail]>  Fri, 12 Apr 2019 12:31:44 -0700
+
 munin (2.0.47-1) unstable; urgency=medium
 
   [ Holger Levsen ]
@@ -594,6 +779,14 @@ munin (2.0.37-2) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Wed, 30 May 2018 23:41:48 +0000
 
+munin (2.0.37-1ubuntu1) cosmic; urgency=medium
+
+  * Revert more of f1f48dee so that directories are again setup correctly on
+    initial installations of munin-node and munin-async. (LP: #1770569)
+    - Run the setup again, if upgrading from 2.0.37-1.
+
+ -- Stefano Rivera <[e-mail]>  Thu, 10 May 2018 23:49:23 -0700
+
 munin (2.0.37-1) unstable; urgency=medium
 
   * New upstream version 2.0.37.
diff --git a/debian/control b/debian/control
index bb601e1..3ed8cad 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: munin
 Section: net
 Priority: optional
-Maintainer: Munin Debian Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Munin Debian Maintainers <[e-mail]>
 Uploaders: Holger Levsen <[e-mail]>,
            Stig Sandbeck Mathisen <[e-mail]>
 Build-Depends-Indep: default-jdk,
diff --git a/debian/patches/munin-node-configure-doc-fix.patch b/debian/patches/munin-node-configure-doc-fix.patch
 new file mode 100644
index 0000000..cc1cb01
--- /dev/null
+++ b/debian/patches/munin-node-configure-doc-fix.patch
@@ -0,0 +1,42 @@
+Description: Edit munin-node-configure documentation to match correct arguments
+Author: Lena Voytek <[e-mail]>
+Bug: https://github.com/munin-monitoring/munin/issues/1341
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/munin/+bug/1680975
+Last-Update: 2022-08-18
+---
+This patch combines the upstream patch referenced above, which removes the exitnoerror info, with
+a custom patch that modifies the snmp argument names.
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/node/sbin/munin-node-configure
++++ b/node/sbin/munin-node-configure
+@@ -612,17 +612,17 @@
+ 
+ Username.  There is no default.
+ 
+-=item B<< --snmpauthpassword <password> >>
++=item B<< --snmpauthpass <password> >>
+ 
+ Authentication password.  Optional when encryption is also enabled, in which
+-case defaults to the privacy password (C<--snmpprivpassword>).
++case defaults to the privacy password (C<--snmpprivpass>).
+ 
+-=item B<< --snmpauthprotocol <protocol> >>
++=item B<< --snmpauthproto <protocol> >>
+ 
+ Authentication protocol.  One of 'md5' or 'sha' (HMAC-MD5-96, RFC1321 and
+ SHA-1/HMAC-SHA-96, NIST FIPS PIB 180, RFC2264).  ['md5']
+ 
+-=item B<< --snmpprivpassword <password> >>
++=item B<< --snmpprivpass <password> >>
+ 
+ Privacy password to enable encryption.  There is no default.  An empty ('')
+ password is considered as no password and will not enable encryption.
+@@ -631,7 +631,7 @@
+ but all of these are defaulted (to 'des', 'md5', and the privpassword value,
+ respectively) and may therefore be left unspecified.
+ 
+-=item B<< --snmpprivprotocol <protocol> >>
++=item B<< --snmpprivproto <protocol> >>
+ 
+ If the privpassword is set this setting controls what kind of encryption is
+ used to achieve privacy in the session.  Only the very weak 'des' encryption
diff --git a/debian/patches/series b/debian/patches/series
 new file mode 100644
index 0000000..9116287
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+munin-node-configure-doc-fix.patch
diff --git a/debian/tests/control b/debian/tests/control
index b6a8251..262bbd9 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -38,19 +38,19 @@ Depends: apache2,
 Restrictions: needs-root, breaks-testbed, isolation-container
 
 # sysvinit-core
-Tests: master-cron-sysv, master-cgi-sysv
-Depends: apache2,
-         cron,
-         curl,
-         daemontools,
-         file,
-         libcgi-fast-perl,
-         munin,
-         munin-node,
-         psmisc,
-         sharness,
-         sysvinit-core
-Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, allow-stderr, skip-not-installable
+#Tests: master-cron-sysv, master-cgi-sysv
+#Depends: apache2,
+#         cron,
+#         curl,
+#         daemontools,
+#         file,
+#         libcgi-fast-perl,
+#         munin,
+#         munin-node,
+#         psmisc,
+#         sharness,
+#         sysvinit-core
+#Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, allow-stderr, skip-not-installable
 
 # Tests for munin-node:
 #   * run the node
@@ -62,13 +62,13 @@ Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, all
 
 # systemd
 Tests: node-systemd
-Depends: munin-node, netcat-openbsd, sharness, systemd-sysv
+Depends: munin-node, netcat-openbsd, sharness, net-tools, systemd-sysv
 Restrictions: needs-root, breaks-testbed, isolation-container
 
 # sysvinit-core
-Tests: node-sysv
-Depends: cron, munin-node, netcat-openbsd, sharness, sysvinit-core
-Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, allow-stderr, skip-not-installable
+#Tests: node-sysv
+#Depends: cron, munin-node, netcat-openbsd, sharness, sysvinit-core
+#Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, allow-stderr, skip-not-installable
 
 # verify that all binary packages can be installed at the same time (without conflicts)
 Test-Command: true
diff --git a/debian/tests/master-cgi-sysv b/debian/tests/master-cgi-sysv
 deleted file mode 120000
index 3f6f801..0000000
--- a/debian/tests/master-cgi-sysv
+++ /dev/null
@@ -1 +0,0 @@
-master-cgi-systemd
 \ No newline at end of file
diff --git a/debian/tests/master-cron-sysv b/debian/tests/master-cron-sysv
 deleted file mode 120000
index ad765b9..0000000
--- a/debian/tests/master-cron-sysv
+++ /dev/null
@@ -1 +0,0 @@
-master-cron-systemd
 \ No newline at end of file
diff --git a/debian/tests/munin-node/02.plugins.t b/debian/tests/munin-node/02.plugins.t
index 8cdcbd7..769dfcd 100755
--- a/debian/tests/munin-node/02.plugins.t
+++ b/debian/tests/munin-node/02.plugins.t
@@ -55,6 +55,11 @@ EOF
     if [ -x /bin/netstat ]; then
       echo netstat
     fi
+    SPOOLDIR="$(postconf -h queue_directory 2>/dev/null || echo /var/spool/postfix)"
+    if [ -d "$SPOOLDIR" ]; then
+        echo postfix_mailqueue
+        echo postfix_mailvolume
+    fi
   } | sort >expected_plugins
   test_cmp expected_plugins all_without_network_interfaces
 '
diff --git a/debian/tests/node-sysv b/debian/tests/node-sysv
 deleted file mode 120000
index 40c8c5c..0000000
--- a/debian/tests/node-sysv
+++ /dev/null
@@ -1 +0,0 @@
-node-systemd
 \ No newline at end of file