Merge ~lvoytek/ubuntu/+source/munin:merge-lp1986980-kinetic into ubuntu/+source/munin:debian/sid

[Lena Voytek]

Merging in munin version 2.0.69

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/munin-merge-kinetic

Test results:

autopkgtest [12:29:13]: @@@@@@@@@@@@@@@@@@@@ summary
master-cron-systemd PASS
master-cgi-systemd PASS
node-systemd PASS
command1 PASS

[Andreas Hasenack (ahasenack)]

This split is incorrect:

commit 1c1d8bc9d4bfb02554b827cd89e8b81e8e6bb793
Author: Lena Voytek <email address hidden>
Date: Thu Aug 18 09:09:51 2022 -0700

    * Stop cron and clean cache before running tests, because cron can also run
      munin

It has in it other changes:
- munin-async.postinst: seems to be "run the setup again, if upgrading from 2.0.37-1"
- d/t/control: seems to be "disable sysv autopkgtests", an added change from a previous merge in groovy

For this split, I think you only want the debian/tests/master-cgi-systemd bit

This commit in split also seems wrong:
commit 30b550c0228789632023ab8154ea448cc37d1408
Author: Lena Voytek <email address hidden>
Date: Thu Aug 18 09:07:23 2022 -0700

    * Add missing test dependency on net-tools for netstat plugin.

As it's also disabling the node-sysv test. That change seems to be part of the "disable sysv autopkgtests" added delta, and should be in that commit.

Feel free to adjust the commit messages to include the files it touched, it will make future merges much easier and cleaner.

review: Needs Fixing

f9a520c... by Lena Voytek on 2022-08-23

* Add missing test dependency on net-tools for netstat plugin.

89f0180... by Lena Voytek on 2022-08-23

* Disable sysv autopkgtests

46c43e4... by Lena Voytek on 2022-08-23

* Stop cron and clean cache before running tests, because cron can also run
  munin

[Lena Voytek (lvoytek)]

Updated the commits along the merge-lp1986980-kinetic branch to match logical changes

[Andreas Hasenack (ahasenack)]

Thanks for the changes, they look good now.

I think we can drop this commit, though:

commit 7dab4c3646abad23c8de74bd091e9ec37b20722b
Author: Lena Voytek <email address hidden>
Date: Tue Aug 23 07:53:21 2022 -0700

    * Run the setup again, if upgrading from 2.0.37-1

It was flagged in previous uploads as droppable after 20.04LTS (bionic) was released. For example, in 2.0.56-1ubuntu1 (in focal):

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.
(...)

In fact, the current version that sits in kinetic says in d/changelog that this was dropped, but it wasn't:

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 <email address hidden> Thu, 07 May 2020 14:42:21 +0200

The reason it can be dropped after 20.04 is because the last ubuntu version that had version 2.0.37-1 was 18.04, and the only upgrade path available to it is to go to 20.04, which still has that fix. So from there on it's not needed anymore.

review: Needs Fixing

[Lena Voytek (lvoytek)]

Alright, removed the commit and marked it in the changelog

[Andreas Hasenack (ahasenack)]

Great, just a nit in d/changelog and then I can upload this

[Lena Voytek (lvoytek)]

done

a686ce8... by Lena Voytek on 2022-08-23

changelog

[Andreas Hasenack (ahasenack)]

+1, uploading

review: Approve

[Andreas Hasenack (ahasenack)]

Uploading munin_2.0.69-1ubuntu1.dsc
Uploading munin_2.0.69.orig.tar.gz
Uploading munin_2.0.69-1ubuntu1.debian.tar.xz
Uploading munin_2.0.69-1ubuntu1_source.buildinfo
Uploading munin_2.0.69-1ubuntu1_source.changes

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

Approvers: ahasenack, lvoytek
Uploaders: ahasenack
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

The package migrated, please mark this MP as "merged", thanks

diff --git a/debian/changelog b/debian/changelog
index f6c356c..0ddb42a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+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 ]
@@ -104,6 +123,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 ]
@@ -124,7 +164,18 @@ munin (2.0.57-1) unstable; urgency=medium
   * d/tests (sysvinit): wait for all init scripts to be finished before
     starting any tests (Closes: #949887)
 
- -- Holger Levsen <[e-mail]>  Sat, 14 Mar 2020 18:59:29 +0100
+ -- Balint Reczey <[e-mail]>  Thu, 07 May 2020 13:19:58 +0200
+
+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
 
@@ -138,6 +189,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.
@@ -168,6 +237,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.
@@ -187,6 +266,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 ]
@@ -226,6 +315,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 ]
@@ -261,6 +360,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 ]
@@ -499,6 +621,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.
@@ -2088,7 +2218,7 @@ munin (1.2.3-3) unstable; urgency=medium
 
   * server/munin-graph.in, debian/control:
       - Replaced the patch from 1.2.3-2 with the upstream one from SVN revision
-        954.  This re-enables support for RRDtool 1.0, so the versioned
+        1.    This re-enables support for RRDtool 1.0, so the versioned
         dependency on librrds-perl is dropped.
 
   * server/munin-cron.in:
@@ -2597,3 +2727,4 @@ lrrd (0.9.6-1) unstable; urgency=low
   * Initial release, closes: #169079.
 
  -- Tore Anderson <[e-mail]>  Sat, 31 May 2003 17:15:35 +0200
+
diff --git a/debian/control b/debian/control
index 7b1d91b..5536c2f 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:
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 55f7fd9..e50ec66 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -30,9 +30,9 @@ Depends: munin, munin-node, daemontools, apache2, curl, file, libcgi-fast-perl, 
 Restrictions: needs-root, breaks-testbed, isolation-container
 
 # sysvinit-core
-Tests: master-cron-sysv, master-cgi-sysv
-Depends: munin, munin-node, daemontools, apache2, curl, file, libcgi-fast-perl, psmisc, sharness, sysvinit-core, cron
-Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, allow-stderr, skip-not-installable
+#Tests: master-cron-sysv, master-cgi-sysv
+#Depends: munin, munin-node, daemontools, apache2, curl, file, libcgi-fast-perl, psmisc, sharness, sysvinit-core, #cron
+#Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, allow-stderr, skip-not-installable
 
 
 # Tests for munin-node:
@@ -45,14 +45,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: munin-node, netcat-openbsd, sharness, sysvinit-core, cron
-Restrictions: needs-root, breaks-testbed, isolation-container, needs-reboot, allow-stderr, skip-not-installable
-
+#Tests: node-sysv
+#Depends: munin-node, netcat-openbsd, sharness, net-tools, sysvinit-core, cron
+#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-systemd b/debian/tests/master-cgi-systemd
index 9384c3d..9d940b7 100755
--- a/debian/tests/master-cgi-systemd
+++ b/debian/tests/master-cgi-systemd
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# set up clean env for testing the scripts
+service cron stop
+rm -rf /var/cache/munin/www/*
+
 . debian/tests/switch_init_helper.inc
 . debian/tests/enable_cgi_strategy.inc
 
diff --git a/debian/tests/master-cron-systemd b/debian/tests/master-cron-systemd
index 7f90de5..d985f21 100755
--- a/debian/tests/master-cron-systemd
+++ b/debian/tests/master-cron-systemd
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# set up clean env for testing the scripts
+service cron stop
+rm -rf /var/cache/munin/www/*
+
 . debian/tests/switch_init_helper.inc