diff -pruN 2.0.57-1/debian/changelog 2.0.57-1ubuntu2/debian/changelog --- 2.0.57-1/debian/changelog 2020-03-14 17:59:29.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/changelog 2021-11-12 22:27:50.000000000 +0000 @@ -1,3 +1,24 @@ +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 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 Thu, 07 May 2020 14:42:21 +0200 + munin (2.0.57-1) unstable; urgency=medium [ Lars Kruse ] @@ -18,7 +39,18 @@ munin (2.0.57-1) unstable; urgency=mediu * d/tests (sysvinit): wait for all init scripts to be finished before starting any tests (Closes: #949887) - -- Holger Levsen Sat, 14 Mar 2020 18:59:29 +0100 + -- Balint Reczey 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 Fri, 14 Feb 2020 12:25:00 +0100 munin (2.0.56-1) unstable; urgency=medium @@ -32,6 +64,24 @@ munin (2.0.56-1) unstable; urgency=mediu -- Holger Levsen 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 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 Sat, 01 Feb 2020 12:56:26 -0800 + munin (2.0.54-1) unstable; urgency=medium * New upstream release, drop debian/patches merged upstream. @@ -62,6 +112,16 @@ munin (2.0.52-1) unstable; urgency=mediu -- Holger Levsen 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 Sat, 19 Oct 2019 23:54:59 -0700 + munin (2.0.51-1) unstable; urgency=medium * New upstream bugfix release. @@ -81,6 +141,16 @@ munin (2.0.50-1) unstable; urgency=mediu -- Holger Levsen 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 Fri, 16 Aug 2019 00:44:38 -0700 + munin (2.0.49-3) unstable; urgency=medium [ Lars Kruse ] @@ -120,6 +190,16 @@ munin (2.0.49-2) unstable; urgency=mediu -- Holger Levsen 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 Fri, 14 Jun 2019 14:36:42 -0700 + munin (2.0.49-1) unstable; urgency=medium [ Lars Kruse ] @@ -155,6 +235,29 @@ munin (2.0.49-1) unstable; urgency=mediu -- Holger Levsen 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 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 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 Fri, 12 Apr 2019 12:31:44 -0700 + munin (2.0.47-1) unstable; urgency=medium [ Holger Levsen ] @@ -393,6 +496,14 @@ munin (2.0.37-2) unstable; urgency=mediu -- Holger Levsen 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 Thu, 10 May 2018 23:49:23 -0700 + munin (2.0.37-1) unstable; urgency=medium * New upstream version 2.0.37. @@ -2491,3 +2602,4 @@ lrrd (0.9.6-1) unstable; urgency=low * Initial release, closes: #169079. -- Tore Anderson Sat, 31 May 2003 17:15:35 +0200 + diff -pruN 2.0.57-1/debian/control 2.0.57-1ubuntu2/debian/control --- 2.0.57-1/debian/control 2020-01-30 10:59:01.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/control 2021-11-12 22:27:50.000000000 +0000 @@ -1,7 +1,8 @@ Source: munin Section: net Priority: optional -Maintainer: Munin Debian Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Munin Debian Maintainers Uploaders: Holger Levsen , Stig Sandbeck Mathisen Build-Depends-Indep: diff -pruN 2.0.57-1/debian/munin-async.postinst 2.0.57-1ubuntu2/debian/munin-async.postinst --- 2.0.57-1/debian/munin-async.postinst 2020-01-20 19:40:56.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/munin-async.postinst 2021-11-12 22:27:50.000000000 +0000 @@ -22,7 +22,7 @@ initperms() { case "$1" in configure) add_munin_async_user - if [ -z "$2" ]; then + if [ -z "$2" -o "$2" = "2.0.37-1" ]; then initperms fi ;; diff -pruN 2.0.57-1/debian/patches/munin-node-configure-doc-fix.patch 2.0.57-1ubuntu2/debian/patches/munin-node-configure-doc-fix.patch --- 2.0.57-1/debian/patches/munin-node-configure-doc-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/patches/munin-node-configure-doc-fix.patch 2021-11-12 22:27:50.000000000 +0000 @@ -0,0 +1,54 @@ +Description: Edit munin-node-configure documentation to match correct arguments +Author: Lena Voytek +Origin: upstream, https://github.com/munin-monitoring/munin/commit/5ee7fbda4a92efdcb0278aefa20befc4847c02d8 +Bug: https://github.com/munin-monitoring/munin/issues/1341 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/munin/+bug/1680975 +Last-Update: 2021-11-16 +--- +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 +@@ -501,10 +501,6 @@ + + Override plugin library [@@LIBDIR@@/plugins/] + +-=item B<< --exitnoterror >> +- +-Do not consider plugins that exit non-zero exit-value as error. +- + =item B<< --suggest >> + + Suggest plugins that might be added or removed, instead of those that are +@@ -616,17 +612,17 @@ + + Username. There is no default. + +-=item B<< --snmpauthpassword >> ++=item B<< --snmpauthpass >> + + 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 >> ++=item B<< --snmpauthproto >> + + 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 >> ++=item B<< --snmpprivpass >> + + Privacy password to enable encryption. There is no default. An empty ('') + password is considered as no password and will not enable encryption. +@@ -635,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 >> ++=item B<< --snmpprivproto >> + + 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 -pruN 2.0.57-1/debian/patches/series 2.0.57-1ubuntu2/debian/patches/series --- 2.0.57-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/patches/series 2021-11-12 22:27:50.000000000 +0000 @@ -0,0 +1 @@ +munin-node-configure-doc-fix.patch diff -pruN 2.0.57-1/debian/tests/control 2.0.57-1ubuntu2/debian/tests/control --- 2.0.57-1/debian/tests/control 2020-03-13 16:40:22.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/tests/control 2021-11-12 22:27:50.000000000 +0000 @@ -30,9 +30,9 @@ Depends: munin, munin-node, daemontools, 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 # 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 -pruN 2.0.57-1/debian/tests/master-cgi-systemd 2.0.57-1ubuntu2/debian/tests/master-cgi-systemd --- 2.0.57-1/debian/tests/master-cgi-systemd 2020-03-13 16:40:22.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/tests/master-cgi-systemd 2021-11-12 22:27:50.000000000 +0000 @@ -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 -pruN 2.0.57-1/debian/tests/master-cgi-sysv 2.0.57-1ubuntu2/debian/tests/master-cgi-sysv --- 2.0.57-1/debian/tests/master-cgi-sysv 2020-03-13 16:40:22.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/tests/master-cgi-sysv 2021-11-12 22:27:50.000000000 +0000 @@ -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 -pruN 2.0.57-1/debian/tests/master-cron-systemd 2.0.57-1ubuntu2/debian/tests/master-cron-systemd --- 2.0.57-1/debian/tests/master-cron-systemd 2020-03-13 16:40:22.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/tests/master-cron-systemd 2021-11-12 22:27:50.000000000 +0000 @@ -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 diff -pruN 2.0.57-1/debian/tests/master-cron-sysv 2.0.57-1ubuntu2/debian/tests/master-cron-sysv --- 2.0.57-1/debian/tests/master-cron-sysv 2020-03-13 16:40:22.000000000 +0000 +++ 2.0.57-1ubuntu2/debian/tests/master-cron-sysv 2021-11-12 22:27:50.000000000 +0000 @@ -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