From 07fe06d737e4de10ee16544aecfa6e79622123d9 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 27 Aug 2022 15:20:56 +0200 Subject: [PATCH] - updated to 2.0.69 --- munin-plugins.patch | 239 ++++++++++++------------ munin-separate-configs.patch | 350 +++++++++++++++++------------------ munin-templatedir.patch | 50 ++--- munin.spec | 4 +- 4 files changed, 322 insertions(+), 321 deletions(-) diff --git a/munin-plugins.patch b/munin-plugins.patch index 3dc24ed..8ee3d4d 100644 --- a/munin-plugins.patch +++ b/munin-plugins.patch @@ -1,6 +1,7 @@ -diff -ur munin-2.0.65.orig/plugins/node.d/amavis.in munin-2.0.65/plugins/node.d/amavis.in ---- munin-2.0.65.orig/plugins/node.d/amavis.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/amavis.in 2021-01-04 17:53:09.637969144 +0100 +Only in munin-2.0.69: munin-plugins.patch +diff -ur munin-2.0.69.orig/plugins/node.d/amavis.in munin-2.0.69/plugins/node.d/amavis.in +--- munin-2.0.69.orig/plugins/node.d/amavis.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/amavis.in 2022-08-27 15:12:36.150833006 +0200 @@ -76,7 +76,7 @@ AMAVIS_LOG=${amavislog:-/var/log/mail/mail.info} @@ -28,9 +29,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/amavis.in munin-2.0.65/plugins/node.d/ if [ -n "$TEMP_FILE" ] && [ -f "$TEMP_FILE" ]; then if [ "$ARGS" != 0 ]; then -diff -ur munin-2.0.65.orig/plugins/node.d/apache_accesses.in munin-2.0.65/plugins/node.d/apache_accesses.in ---- munin-2.0.65.orig/plugins/node.d/apache_accesses.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/apache_accesses.in 2021-01-04 17:53:09.638969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/apache_accesses.in munin-2.0.69/plugins/node.d/apache_accesses.in +--- munin-2.0.69.orig/plugins/node.d/apache_accesses.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/apache_accesses.in 2022-08-27 15:12:36.151833008 +0200 @@ -99,6 +99,7 @@ my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto"; @@ -52,9 +53,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/apache_accesses.in munin-2.0.65/plugin print "graph_args --base 1000\n"; print "graph_vlabel accesses / \${graph_period}\n"; print "graph_category apache\n"; -diff -ur munin-2.0.65.orig/plugins/node.d/apache_processes.in munin-2.0.65/plugins/node.d/apache_processes.in ---- munin-2.0.65.orig/plugins/node.d/apache_processes.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/apache_processes.in 2021-01-04 17:53:09.638969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/apache_processes.in munin-2.0.69/plugins/node.d/apache_processes.in +--- munin-2.0.69.orig/plugins/node.d/apache_processes.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/apache_processes.in 2022-08-27 15:12:36.151833008 +0200 @@ -106,6 +106,7 @@ my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto"; @@ -76,9 +77,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/apache_processes.in munin-2.0.65/plugi print "graph_args --base 1000 -l 0\n"; print "graph_category apache\n"; print "graph_order "; -diff -ur munin-2.0.65.orig/plugins/node.d/apache_volume.in munin-2.0.65/plugins/node.d/apache_volume.in ---- munin-2.0.65.orig/plugins/node.d/apache_volume.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/apache_volume.in 2021-01-04 17:53:09.639969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/apache_volume.in munin-2.0.69/plugins/node.d/apache_volume.in +--- munin-2.0.69.orig/plugins/node.d/apache_volume.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/apache_volume.in 2022-08-27 15:12:36.151833008 +0200 @@ -99,6 +99,7 @@ my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto"; @@ -100,9 +101,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/apache_volume.in munin-2.0.65/plugins/ print "graph_args --base 1000\n"; print "graph_vlabel bytes per \${graph_period}\n"; print "graph_category apache\n"; -diff -ur munin-2.0.65.orig/plugins/node.d/bind9.in munin-2.0.65/plugins/node.d/bind9.in ---- munin-2.0.65.orig/plugins/node.d/bind9.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/bind9.in 2021-01-04 17:53:09.639969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/bind9.in munin-2.0.69/plugins/node.d/bind9.in +--- munin-2.0.69.orig/plugins/node.d/bind9.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/bind9.in 2022-08-27 15:12:36.151833008 +0200 @@ -53,7 +53,7 @@ use strict; @@ -121,9 +122,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/bind9.in munin-2.0.65/plugins/node.d/b while () { chomp; my ($q,$n) = split(/\s+/,$_,2); -diff -ur munin-2.0.65.orig/plugins/node.d/courier_.in munin-2.0.65/plugins/node.d/courier_.in ---- munin-2.0.65.orig/plugins/node.d/courier_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/courier_.in 2021-01-04 17:53:09.639969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/courier_.in munin-2.0.69/plugins/node.d/courier_.in +--- munin-2.0.69.orig/plugins/node.d/courier_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/courier_.in 2022-08-27 15:12:36.152833010 +0200 @@ -55,7 +55,7 @@ COURIER_LOG=${logfile:-/var/log/mail.log} SERVICE=${service:-$(basename "$0" | sed 's/^courier_//g')} @@ -133,9 +134,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/courier_.in munin-2.0.65/plugins/node. case $1 in -diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.65/plugins/node.d/courier_mta_mailstats.in ---- munin-2.0.65.orig/plugins/node.d/courier_mta_mailstats.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/courier_mta_mailstats.in 2021-01-04 17:53:09.639969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.69/plugins/node.d/courier_mta_mailstats.in +--- munin-2.0.69.orig/plugins/node.d/courier_mta_mailstats.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/courier_mta_mailstats.in 2022-08-27 15:12:36.152833010 +0200 @@ -108,7 +108,9 @@ if($startsize < $pos) { @@ -147,9 +148,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.65/ $pos = 0; } -diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.65/plugins/node.d/courier_mta_mailvolume.in ---- munin-2.0.65.orig/plugins/node.d/courier_mta_mailvolume.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/courier_mta_mailvolume.in 2021-01-04 17:53:09.639969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.69/plugins/node.d/courier_mta_mailvolume.in +--- munin-2.0.69.orig/plugins/node.d/courier_mta_mailvolume.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/courier_mta_mailvolume.in 2022-08-27 15:12:36.152833010 +0200 @@ -98,7 +98,9 @@ if($startsize < $pos) { @@ -161,9 +162,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.65 $pos = 0; } -diff -ur munin-2.0.65.orig/plugins/node.d/cupsys_pages.in munin-2.0.65/plugins/node.d/cupsys_pages.in ---- munin-2.0.65.orig/plugins/node.d/cupsys_pages.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/cupsys_pages.in 2021-01-04 17:53:09.640969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/cupsys_pages.in munin-2.0.69/plugins/node.d/cupsys_pages.in +--- munin-2.0.69.orig/plugins/node.d/cupsys_pages.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/cupsys_pages.in 2022-08-27 15:12:36.155833015 +0200 @@ -105,7 +105,9 @@ } if ($startsize < $pos) { @@ -184,9 +185,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/cupsys_pages.in munin-2.0.65/plugins/n if(!defined($printers{$1}) && keys(%printers) < $MAXLABEL) { $printers{$1} += int($2)*int($3); } elsif(defined($printers{$1})) { -diff -ur munin-2.0.65.orig/plugins/node.d/foldingathome_rank.in munin-2.0.65/plugins/node.d/foldingathome_rank.in ---- munin-2.0.65.orig/plugins/node.d/foldingathome_rank.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/foldingathome_rank.in 2021-01-04 17:53:09.640969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/foldingathome_rank.in munin-2.0.69/plugins/node.d/foldingathome_rank.in +--- munin-2.0.69.orig/plugins/node.d/foldingathome_rank.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/foldingathome_rank.in 2022-08-27 15:12:36.155833015 +0200 @@ -12,7 +12,7 @@ # scripts): #%# family=contrib @@ -196,9 +197,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/foldingathome_rank.in munin-2.0.65/plu if [ "$1" = "config" ]; then echo 'graph_title Folding@Home Rank' -diff -ur munin-2.0.65.orig/plugins/node.d/mailman.in munin-2.0.65/plugins/node.d/mailman.in ---- munin-2.0.65.orig/plugins/node.d/mailman.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mailman.in 2021-01-04 17:53:09.640969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/mailman.in munin-2.0.69/plugins/node.d/mailman.in +--- munin-2.0.69.orig/plugins/node.d/mailman.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mailman.in 2022-08-27 15:12:36.156833017 +0200 @@ -39,7 +39,13 @@ # System paths $logfile = $ENV{'logfile'} || "/var/log/mailman/post"; @@ -214,9 +215,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mailman.in munin-2.0.65/plugins/node.d if (-f "$logfile.0") { -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_.in munin-2.0.65/plugins/node.d/mysql_.in ---- munin-2.0.65.orig/plugins/node.d/mysql_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_.in 2021-01-04 17:53:09.641969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_.in munin-2.0.69/plugins/node.d/mysql_.in +--- munin-2.0.69.orig/plugins/node.d/mysql_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mysql_.in 2022-08-27 15:12:36.156833017 +0200 @@ -50,6 +50,7 @@ env.mysqlconnection DBI:mysql:information_schema;host=127.0.0.1;port=3306 env.mysqluser munin @@ -246,18 +247,18 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mysql_.in munin-2.0.65/plugins/node.d/ $shared_memory_cache->set('data', $data); $shared_memory_cache->set('graphs', nfreeze(\%graphs)); -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_innodb.in munin-2.0.65/plugins/node.d/mysql_innodb.in ---- munin-2.0.65.orig/plugins/node.d/mysql_innodb.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_innodb.in 2021-01-04 17:53:09.641969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_innodb.in munin-2.0.69/plugins/node.d/mysql_innodb.in +--- munin-2.0.69.orig/plugins/node.d/mysql_innodb.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mysql_innodb.in 2022-08-27 15:12:36.156833017 +0200 @@ -1,4 +1,4 @@ -#!@@GOODSH@@ +#!@@BASH@@ : << =cut -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.65/plugins/node.d/mysql_slowqueries.in ---- munin-2.0.65.orig/plugins/node.d/mysql_slowqueries.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_slowqueries.in 2021-01-04 17:53:09.641969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.69/plugins/node.d/mysql_slowqueries.in +--- munin-2.0.69.orig/plugins/node.d/mysql_slowqueries.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mysql_slowqueries.in 2022-08-27 15:12:36.156833017 +0200 @@ -61,6 +61,6 @@ exit 0 fi @@ -266,9 +267,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.65/plug +/bin/printf "queries.value " # shellcheck disable=SC2086 ("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo a a a a a a a a U) | awk '{print $9}' -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_threads.in munin-2.0.65/plugins/node.d/mysql_threads.in ---- munin-2.0.65.orig/plugins/node.d/mysql_threads.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_threads.in 2021-01-04 17:53:09.641969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_threads.in munin-2.0.69/plugins/node.d/mysql_threads.in +--- munin-2.0.69.orig/plugins/node.d/mysql_threads.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mysql_threads.in 2022-08-27 15:12:36.156833017 +0200 @@ -70,6 +70,6 @@ exit 0 fi @@ -277,10 +278,10 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mysql_threads.in munin-2.0.65/plugins/ +/bin/printf "threads.value " # shellcheck disable=SC2086 ("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo 'a a a U') | awk '{print $4}' -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/ntp_.in ---- munin-2.0.65.orig/plugins/node.d/ntp_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_.in 2021-01-04 17:57:57.057969144 +0100 -@@ -68,9 +68,9 @@ +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_.in munin-2.0.69/plugins/node.d/ntp_.in +--- munin-2.0.69.orig/plugins/node.d/ntp_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_.in 2022-08-27 15:12:36.157833019 +0200 +@@ -70,9 +70,9 @@ if (!$has_requirements) { print "no (missing Net::DNS or Net::IP modules)\n"; } else { @@ -292,7 +293,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/nt print "yes\n"; } else { print "no (ntpq -p returned no peers)\n"; -@@ -83,10 +83,10 @@ +@@ -85,10 +85,10 @@ } if ($ARGV[0] and $ARGV[0] eq "suggest") { @@ -305,7 +306,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/nt $peerinfo =~ s/\R/ /g; my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/); print $peer_addr, "\n" unless $peer_addr eq "0.0.0.0"; -@@ -118,12 +118,12 @@ +@@ -120,12 +120,12 @@ my $delay = "U"; my $offset = "U"; my $jitter = "U"; @@ -320,7 +321,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/nt $peerinfo =~ s/\R/ /g; ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/); ($delay) = ($peerinfo =~ m/delay=([^, ]+)/); -@@ -163,7 +163,7 @@ +@@ -165,7 +165,7 @@ ASSOCS: foreach my $line (@associations) { if ($line =~ m/^\s*\d+/) { my (undef, undef, $assid, undef, undef, undef, undef, undef, undef, undef) = split(/\s+/, $line); @@ -329,9 +330,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_.in munin-2.0.65/plugins/node.d/nt $peerinfo =~ s/\R/ /g; ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/); ($delay) = ($peerinfo =~ m/delay=([^, ]+)/); -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.65/plugins/node.d/ntp_kernel_err.in ---- munin-2.0.65.orig/plugins/node.d/ntp_kernel_err.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_kernel_err.in 2021-01-04 17:56:35.893969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.69/plugins/node.d/ntp_kernel_err.in +--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_err.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_kernel_err.in 2022-08-27 15:12:36.157833019 +0200 @@ -32,7 +32,7 @@ export PATH=/usr/local/sbin:$PATH @@ -356,9 +357,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.65/plugins - ntpq -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3 / 1000) }' + /usr/sbin/ntpq -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3 / 1000) }' fi -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in ---- munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in 2021-01-04 17:55:34.045969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in +--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in 2022-08-27 15:12:36.157833019 +0200 @@ -35,7 +35,7 @@ export PATH=/usr/local/sbin:$PATH @@ -385,9 +386,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.65/pl fi "$cmd" -c kerninfo | awk -v "fcomp=$fcomp" '/^pll frequency:/ { printf("%.9f\n", $3 + fcomp) }' -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.65/plugins/node.d/ntp_kernel_pll_off.in ---- munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_off.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_kernel_pll_off.in 2021-01-04 17:54:55.598969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.69/plugins/node.d/ntp_kernel_pll_off.in +--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_off.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_kernel_pll_off.in 2022-08-27 15:12:36.159833023 +0200 @@ -32,7 +32,7 @@ export PATH=/usr/local/sbin:$PATH @@ -412,10 +413,10 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.65/plu - ntpq -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3 / 1000) }' + /usr/sbin/ntpq -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3 / 1000) }' fi -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_offset.in munin-2.0.65/plugins/node.d/ntp_offset.in ---- munin-2.0.65.orig/plugins/node.d/ntp_offset.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_offset.in 2021-01-04 17:53:09.693969144 +0100 -@@ -42,9 +42,9 @@ +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_offset.in munin-2.0.69/plugins/node.d/ntp_offset.in +--- munin-2.0.69.orig/plugins/node.d/ntp_offset.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_offset.in 2022-08-27 15:12:36.160833025 +0200 +@@ -43,9 +43,9 @@ do_autoconf () { @@ -427,7 +428,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_offset.in munin-2.0.65/plugins/nod 0) echo 'no (unable to list peers)' exit 0 -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ } do_config () { @@ -436,7 +437,7 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_offset.in munin-2.0.65/plugins/nod # shellcheck disable=SC2086 set - $syspeer -@@ -91,7 +91,7 @@ +@@ -95,7 +95,7 @@ do_ () { # Fetch operation @@ -445,9 +446,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_offset.in munin-2.0.65/plugins/nod # shellcheck disable=SC2086 set - $syspeer -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_states.in munin-2.0.65/plugins/node.d/ntp_states.in ---- munin-2.0.65.orig/plugins/node.d/ntp_states.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_states.in 2021-01-04 17:55:58.249969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_states.in munin-2.0.69/plugins/node.d/ntp_states.in +--- munin-2.0.69.orig/plugins/node.d/ntp_states.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ntp_states.in 2022-08-27 15:12:36.160833025 +0200 @@ -54,9 +54,9 @@ if (!$has_net_dns) { print "no (missing perl module Net::DNS)\n"; @@ -473,9 +474,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_states.in munin-2.0.65/plugins/nod $peerinfo =~ s/\s//g; my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/); -diff -ur munin-2.0.65.orig/plugins/node.d/nut_misc.in munin-2.0.65/plugins/node.d/nut_misc.in ---- munin-2.0.65.orig/plugins/node.d/nut_misc.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/nut_misc.in 2021-01-04 17:53:09.694969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/nut_misc.in munin-2.0.69/plugins/node.d/nut_misc.in +--- munin-2.0.69.orig/plugins/node.d/nut_misc.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/nut_misc.in 2022-08-27 15:12:36.160833025 +0200 @@ -38,7 +38,8 @@ my %status; @@ -521,9 +522,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/nut_misc.in munin-2.0.65/plugins/node. while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -ur munin-2.0.65.orig/plugins/node.d/nut_volts.in munin-2.0.65/plugins/node.d/nut_volts.in ---- munin-2.0.65.orig/plugins/node.d/nut_volts.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/nut_volts.in 2021-01-04 17:53:09.694969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/nut_volts.in munin-2.0.69/plugins/node.d/nut_volts.in +--- munin-2.0.69.orig/plugins/node.d/nut_volts.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/nut_volts.in 2022-08-27 15:12:36.160833025 +0200 @@ -14,7 +14,8 @@ my %status; @@ -574,9 +575,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/nut_volts.in munin-2.0.65/plugins/node while ($data =~ /([a-z.]+): (.+)\b/g) { my $label = $1; my $value = $2; -diff -ur munin-2.0.65.orig/plugins/node.d/perdition.in munin-2.0.65/plugins/node.d/perdition.in ---- munin-2.0.65.orig/plugins/node.d/perdition.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/perdition.in 2021-01-04 17:53:09.695969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/perdition.in munin-2.0.69/plugins/node.d/perdition.in +--- munin-2.0.69.orig/plugins/node.d/perdition.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/perdition.in 2022-08-27 15:12:36.161833027 +0200 @@ -53,7 +53,7 @@ # Set the location of the perdition logs PERDITION_LOG=${logfile:-/var/log/perdition.log} @@ -586,9 +587,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/perdition.in munin-2.0.65/plugins/node case $1 in autoconf|detect) -diff -ur munin-2.0.65.orig/plugins/node.d/pop_stats.in munin-2.0.65/plugins/node.d/pop_stats.in ---- munin-2.0.65.orig/plugins/node.d/pop_stats.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/pop_stats.in 2021-01-04 17:53:09.695969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/pop_stats.in munin-2.0.69/plugins/node.d/pop_stats.in +--- munin-2.0.69.orig/plugins/node.d/pop_stats.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/pop_stats.in 2022-08-27 15:12:36.161833027 +0200 @@ -68,7 +68,9 @@ if ($startsize < $pos) { @@ -600,9 +601,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/pop_stats.in munin-2.0.65/plugins/node $pos = 0; } -diff -ur munin-2.0.65.orig/plugins/node.d/postgres_scans_.in munin-2.0.65/plugins/node.d/postgres_scans_.in ---- munin-2.0.65.orig/plugins/node.d/postgres_scans_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/postgres_scans_.in 2021-01-04 17:53:09.695969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/postgres_scans_.in munin-2.0.69/plugins/node.d/postgres_scans_.in +--- munin-2.0.69.orig/plugins/node.d/postgres_scans_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/postgres_scans_.in 2022-08-27 15:12:36.161833027 +0200 @@ -65,7 +65,6 @@ vlabel => 'Scans / sec', basequery => @@ -611,9 +612,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/postgres_scans_.in munin-2.0.65/plugin pivotquery => 1, configquery => "VALUES ('sequential','Sequential scans'), ('index','Index scans')", -diff -ur munin-2.0.65.orig/plugins/node.d/postgres_tuples_.in munin-2.0.65/plugins/node.d/postgres_tuples_.in ---- munin-2.0.65.orig/plugins/node.d/postgres_tuples_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/postgres_tuples_.in 2021-01-04 17:53:09.695969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/postgres_tuples_.in munin-2.0.69/plugins/node.d/postgres_tuples_.in +--- munin-2.0.69.orig/plugins/node.d/postgres_tuples_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/postgres_tuples_.in 2022-08-27 15:12:36.161833027 +0200 @@ -74,7 +74,6 @@ . " COALESCE(sum(n_tup_del),0) AS deleted FROM pg_stat_user_tables", ], @@ -622,9 +623,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/postgres_tuples_.in munin-2.0.65/plugi pivotquery => 1, configquery => [ "VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted')," -diff -ur munin-2.0.65.orig/plugins/node.d/slapd_.in munin-2.0.65/plugins/node.d/slapd_.in ---- munin-2.0.65.orig/plugins/node.d/slapd_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/slapd_.in 2021-01-04 17:53:09.696969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/slapd_.in munin-2.0.69/plugins/node.d/slapd_.in +--- munin-2.0.69.orig/plugins/node.d/slapd_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/slapd_.in 2022-08-27 15:12:36.161833027 +0200 @@ -37,7 +37,7 @@ # Change these to reflect your LDAP ACL. The given DN must have @@ -634,21 +635,21 @@ diff -ur munin-2.0.65.orig/plugins/node.d/slapd_.in munin-2.0.65/plugins/node.d/ my $server = ($ENV{'server'} || 'localhost'); my $userdn = ($ENV{'binddn'} || ''); my $userpw = ($ENV{'bindpw'} || ''); -diff -ur munin-2.0.65.orig/plugins/node.d.linux/iostat.in munin-2.0.65/plugins/node.d.linux/iostat.in ---- munin-2.0.65.orig/plugins/node.d.linux/iostat.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/iostat.in 2021-01-04 17:53:09.715969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/iostat.in munin-2.0.69/plugins/node.d.linux/iostat.in +--- munin-2.0.69.orig/plugins/node.d.linux/iostat.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/iostat.in 2022-08-27 15:16:13.861246722 +0200 @@ -169,7 +169,7 @@ if ($tmpnam =~ /\d+$/ and !$include_numbered) { - # Special case for devices like cXdXpX, - # like the cciss driver -- next unless $tmpnam =~ /\/c\d+d\d+$/ -+ next unless $tmpnam =~ /\/.*d\d+$/ + # Special case for devices like cXdXpX, like the cciss driver, + # or nvmeXnXpX for nvme. +- next unless ($tmpnam =~ /\/c\d+d\d+$/ || $tmpnam =~ /nvme\d+n\d+$/) ++ next unless ($tmpnam =~ /\/.*d\d+$/ || $tmpnam =~ /nvme\d+n\d+$/) } next unless grep { $_ } @fields; -diff -ur munin-2.0.65.orig/plugins/node.d.linux/ip_.in munin-2.0.65/plugins/node.d.linux/ip_.in ---- munin-2.0.65.orig/plugins/node.d.linux/ip_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/ip_.in 2021-01-04 17:53:09.715969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/ip_.in munin-2.0.69/plugins/node.d.linux/ip_.in +--- munin-2.0.69.orig/plugins/node.d.linux/ip_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/ip_.in 2022-08-27 15:12:36.162833029 +0200 @@ -128,14 +128,14 @@ # This is a fun hack to make the plugin ip6 compatible. # Suggested in ticket #439 by "jodal". @@ -689,9 +690,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/ip_.in munin-2.0.65/plugins/node -iptables -L "$OUTPUT" -v -n -x -w | awk "/$escaped_ip"'[ /]/ { print "out.value " $2; exit 0; }' +/usr/sbin/iptables -L "$INPUT" -v -n -x -w | awk "/$escaped_ip"'[ /]/ { print "in.value " $2; exit 0; }' +/usr/sbin/iptables -L "$OUTPUT" -v -n -x -w | awk "/$escaped_ip"'[ /]/ { print "out.value " $2; exit 0; }' -diff -ur munin-2.0.65.orig/plugins/node.d.linux/load.in munin-2.0.65/plugins/node.d.linux/load.in ---- munin-2.0.65.orig/plugins/node.d.linux/load.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/load.in 2021-01-04 17:53:09.715969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/load.in munin-2.0.69/plugins/node.d.linux/load.in +--- munin-2.0.69.orig/plugins/node.d.linux/load.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/load.in 2022-08-27 15:12:36.162833029 +0200 @@ -59,20 +59,20 @@ # one machine answer for several) @@ -730,9 +731,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/load.in munin-2.0.65/plugins/nod # Last, if run with the "config"-parameter, quit here (don't # display any data) -diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfs_client.in munin-2.0.65/plugins/node.d.linux/nfs_client.in ---- munin-2.0.65.orig/plugins/node.d.linux/nfs_client.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/nfs_client.in 2021-01-04 17:53:09.715969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/nfs_client.in munin-2.0.69/plugins/node.d.linux/nfs_client.in +--- munin-2.0.69.orig/plugins/node.d.linux/nfs_client.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/nfs_client.in 2022-08-27 15:12:36.162833029 +0200 @@ -31,7 +31,7 @@ proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit" @@ -816,9 +817,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfs_client.in munin-2.0.65/plugi + print "commit.value " nfs_commit }' $NFS - -diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfsd.in munin-2.0.65/plugins/node.d.linux/nfsd.in ---- munin-2.0.65.orig/plugins/node.d.linux/nfsd.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/nfsd.in 2021-01-04 17:53:09.716969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/nfsd.in munin-2.0.69/plugins/node.d.linux/nfsd.in +--- munin-2.0.69.orig/plugins/node.d.linux/nfsd.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/nfsd.in 2022-08-27 15:12:36.162833029 +0200 @@ -31,7 +31,7 @@ proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit" @@ -901,9 +902,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/nfsd.in munin-2.0.65/plugins/nod + print "pathconf.value " nfs_pathconf + print "commit.value " nfs_commit +}' $NFSD -diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.65/plugins/node.d.linux/vlan_inetuse_.in ---- munin-2.0.65.orig/plugins/node.d.linux/vlan_inetuse_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/vlan_inetuse_.in 2021-01-04 17:53:09.716969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.69/plugins/node.d.linux/vlan_inetuse_.in +--- munin-2.0.69.orig/plugins/node.d.linux/vlan_inetuse_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/vlan_inetuse_.in 2022-08-27 15:12:36.163833031 +0200 @@ -37,7 +37,7 @@ my %in_octets = (); my %out_octets = (); @@ -931,9 +932,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.65/pl if ($ARGV[0] and $ARGV[0] eq "config") { -diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.65/plugins/node.d.linux/vlan_linkuse_.in ---- munin-2.0.65.orig/plugins/node.d.linux/vlan_linkuse_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/vlan_linkuse_.in 2021-01-04 17:53:09.716969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.69/plugins/node.d.linux/vlan_linkuse_.in +--- munin-2.0.69.orig/plugins/node.d.linux/vlan_linkuse_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/vlan_linkuse_.in 2022-08-27 15:12:36.163833031 +0200 @@ -29,7 +29,7 @@ my %in_octets = (); my %out_octets = (); @@ -959,9 +960,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.65/pl -die "Error running iptables. Dying\n" if $?; +die "Error running /usr/sbin/iptables. Dying\n" if $?; # vim:syntax=perl -diff -ur munin-2.0.65.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.65/plugins/node.d.linux/vserver_resources.in ---- munin-2.0.65.orig/plugins/node.d.linux/vserver_resources.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/vserver_resources.in 2021-01-04 17:53:09.716969144 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.69/plugins/node.d.linux/vserver_resources.in +--- munin-2.0.69.orig/plugins/node.d.linux/vserver_resources.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/vserver_resources.in 2022-08-27 15:12:36.163833031 +0200 @@ -247,6 +247,12 @@ echo 'graph_vlabel ANON pages' echo 'graph_info Shows anonymous memory (human readable) used by each vserver.' diff --git a/munin-separate-configs.patch b/munin-separate-configs.patch index 5c124c2..b0d3162 100644 --- a/munin-separate-configs.patch +++ b/munin-separate-configs.patch @@ -1,6 +1,6 @@ -diff -ur munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.65/common/lib/Munin/Common/Defaults.pm ---- munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm 2021-01-04 18:03:15.208803396 +0100 -+++ munin-2.0.65/common/lib/Munin/Common/Defaults.pm 2021-01-04 18:04:00.437803396 +0100 +diff -ur munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.69/common/lib/Munin/Common/Defaults.pm +--- munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm 2022-08-27 15:17:33.865403125 +0200 ++++ munin-2.0.69/common/lib/Munin/Common/Defaults.pm 2022-08-27 15:18:27.509508002 +0200 @@ -16,7 +16,8 @@ our $DROPDOWNLIMIT = 1; @@ -11,9 +11,9 @@ diff -ur munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.65/comm our $MUNIN_BINDIR = ''; our $MUNIN_SBINDIR = ''; our $MUNIN_DOCDIR = ''; -diff -ur munin-2.0.65.orig/doc/installation/configuration.rst munin-2.0.65/doc/installation/configuration.rst ---- munin-2.0.65.orig/doc/installation/configuration.rst 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/doc/installation/configuration.rst 2021-01-04 18:04:00.437803396 +0100 +diff -ur munin-2.0.69.orig/doc/installation/configuration.rst munin-2.0.69/doc/installation/configuration.rst +--- munin-2.0.69.orig/doc/installation/configuration.rst 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/doc/installation/configuration.rst 2022-08-27 15:18:27.509508002 +0200 @@ -9,7 +9,7 @@ ------- @@ -32,9 +32,9 @@ diff -ur munin-2.0.65.orig/doc/installation/configuration.rst munin-2.0.65/doc/i [node.example.com] address 192.0.2.4 -diff -ur munin-2.0.65.orig/Makefile munin-2.0.65/Makefile ---- munin-2.0.65.orig/Makefile 2021-01-04 18:03:15.209803396 +0100 -+++ munin-2.0.65/Makefile 2021-01-04 18:04:00.437803396 +0100 +diff -ur munin-2.0.69.orig/Makefile munin-2.0.69/Makefile +--- munin-2.0.69.orig/Makefile 2022-08-27 15:17:33.866403127 +0200 ++++ munin-2.0.69/Makefile 2022-08-27 15:18:27.510508004 +0200 @@ -82,7 +82,7 @@ # a new config. Target _only_ suitable for maintainers. unconfig: @@ -150,9 +150,9 @@ diff -ur munin-2.0.65.orig/Makefile munin-2.0.65/Makefile cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/ $(SBINDIR)/munin-node-configure --suggest echo 'Done?' -diff -ur munin-2.0.65.orig/Makefile.config munin-2.0.65/Makefile.config ---- munin-2.0.65.orig/Makefile.config 2021-01-04 18:03:15.209803396 +0100 -+++ munin-2.0.65/Makefile.config 2021-01-04 18:04:00.438803396 +0100 +diff -ur munin-2.0.69.orig/Makefile.config munin-2.0.69/Makefile.config +--- munin-2.0.69.orig/Makefile.config 2022-08-27 15:17:33.866403127 +0200 ++++ munin-2.0.69/Makefile.config 2022-08-27 15:18:27.510508004 +0200 @@ -20,7 +20,8 @@ PREFIX = $(DESTDIR)/usr @@ -163,9 +163,9 @@ diff -ur munin-2.0.65.orig/Makefile.config munin-2.0.65/Makefile.config # Server only - where to put munin-cron BINDIR = $(PREFIX)/bin -diff -ur munin-2.0.65.orig/master/_bin/munin-cgi-graph.in munin-2.0.65/master/_bin/munin-cgi-graph.in ---- munin-2.0.65.orig/master/_bin/munin-cgi-graph.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/_bin/munin-cgi-graph.in 2021-01-04 18:04:00.438803396 +0100 +diff -ur munin-2.0.69.orig/master/_bin/munin-cgi-graph.in munin-2.0.69/master/_bin/munin-cgi-graph.in +--- munin-2.0.69.orig/master/_bin/munin-cgi-graph.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/_bin/munin-cgi-graph.in 2022-08-27 15:18:27.510508004 +0200 @@ -42,7 +42,7 @@ use Log::Log4perl qw( :easy ); @@ -175,9 +175,9 @@ diff -ur munin-2.0.65.orig/master/_bin/munin-cgi-graph.in munin-2.0.65/master/_b my %period = ( "day" => 300, "week" => 1800, -diff -ur munin-2.0.65.orig/master/_bin/munin-check.in munin-2.0.65/master/_bin/munin-check.in ---- munin-2.0.65.orig/master/_bin/munin-check.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/_bin/munin-check.in 2021-01-04 18:04:00.438803396 +0100 +diff -ur munin-2.0.69.orig/master/_bin/munin-check.in munin-2.0.69/master/_bin/munin-check.in +--- munin-2.0.69.orig/master/_bin/munin-check.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/_bin/munin-check.in 2022-08-27 15:18:27.510508004 +0200 @@ -162,7 +162,7 @@ norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@ norec=yes perm_ok @@PLUGSTATE@@ 775 @@ -187,9 +187,9 @@ diff -ur munin-2.0.65.orig/master/_bin/munin-check.in munin-2.0.65/master/_bin/m echo "Check done. Please note that this script only checks most things," echo "not all things." -diff -ur munin-2.0.65.orig/master/_bin/munin-graph.in munin-2.0.65/master/_bin/munin-graph.in ---- munin-2.0.65.orig/master/_bin/munin-graph.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/_bin/munin-graph.in 2021-01-04 18:04:00.438803396 +0100 +diff -ur munin-2.0.69.orig/master/_bin/munin-graph.in munin-2.0.69/master/_bin/munin-graph.in +--- munin-2.0.69.orig/master/_bin/munin-graph.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/_bin/munin-graph.in 2022-08-27 15:18:27.510508004 +0200 @@ -53,7 +53,7 @@ use Log::Log4perl qw( :easy ); @@ -199,9 +199,9 @@ diff -ur munin-2.0.65.orig/master/_bin/munin-graph.in munin-2.0.65/master/_bin/m my %period = ( "day" => 300, "week" => 1800, -diff -ur munin-2.0.65.orig/master/_bin/munin-limits.in munin-2.0.65/master/_bin/munin-limits.in ---- munin-2.0.65.orig/master/_bin/munin-limits.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/_bin/munin-limits.in 2021-01-04 18:04:00.438803396 +0100 +diff -ur munin-2.0.69.orig/master/_bin/munin-limits.in munin-2.0.69/master/_bin/munin-limits.in +--- munin-2.0.69.orig/master/_bin/munin-limits.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/_bin/munin-limits.in 2022-08-27 15:18:27.511508005 +0200 @@ -64,7 +64,7 @@ =item B<< --config >> @@ -220,9 +220,9 @@ diff -ur munin-2.0.65.orig/master/_bin/munin-limits.in munin-2.0.65/master/_bin/ @@DBDIR@@/* @@STATEDIR@@/* -diff -ur munin-2.0.65.orig/master/_bin/munin-update.in munin-2.0.65/master/_bin/munin-update.in ---- munin-2.0.65.orig/master/_bin/munin-update.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/_bin/munin-update.in 2021-01-04 18:04:00.439803396 +0100 +diff -ur munin-2.0.69.orig/master/_bin/munin-update.in munin-2.0.69/master/_bin/munin-update.in +--- munin-2.0.69.orig/master/_bin/munin-update.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/_bin/munin-update.in 2022-08-27 15:18:27.524508030 +0200 @@ -137,7 +137,7 @@ =item B<< --config_file= >> @@ -241,9 +241,9 @@ diff -ur munin-2.0.65.orig/master/_bin/munin-update.in munin-2.0.65/master/_bin/ @@DBDIR@@/* @@LOGDIR@@/munin-update @@STATEDIR@@/* -diff -ur munin-2.0.65.orig/master/doc/munin.conf.pod.in munin-2.0.65/master/doc/munin.conf.pod.in ---- munin-2.0.65.orig/master/doc/munin.conf.pod.in 2021-01-04 18:03:15.209803396 +0100 -+++ munin-2.0.65/master/doc/munin.conf.pod.in 2021-01-04 18:04:00.439803396 +0100 +diff -ur munin-2.0.69.orig/master/doc/munin.conf.pod.in munin-2.0.69/master/doc/munin.conf.pod.in +--- munin-2.0.69.orig/master/doc/munin.conf.pod.in 2022-08-27 15:17:33.866403127 +0200 ++++ munin-2.0.69/master/doc/munin.conf.pod.in 2022-08-27 15:18:27.524508030 +0200 @@ -27,7 +27,7 @@ [machine1.your.dom] address localhost @@ -253,7 +253,7 @@ diff -ur munin-2.0.65.orig/master/doc/munin.conf.pod.in munin-2.0.65/master/doc/ If your placement deviates from this norm, use the "--config EfileE"-option when running the munin-* programs. -@@ -162,20 +162,20 @@ +@@ -188,20 +188,20 @@ =item B This directive sets the location of the private key to be used for @@ -277,9 +277,9 @@ diff -ur munin-2.0.65.orig/master/doc/munin.conf.pod.in munin-2.0.65/master/doc/ =item B -diff -ur munin-2.0.65.orig/master/doc/munin-cron.pod.in munin-2.0.65/master/doc/munin-cron.pod.in ---- munin-2.0.65.orig/master/doc/munin-cron.pod.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/doc/munin-cron.pod.in 2021-01-04 18:04:00.439803396 +0100 +diff -ur munin-2.0.69.orig/master/doc/munin-cron.pod.in munin-2.0.69/master/doc/munin-cron.pod.in +--- munin-2.0.69.orig/master/doc/munin-cron.pod.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/doc/munin-cron.pod.in 2022-08-27 15:18:27.524508030 +0200 @@ -22,7 +22,7 @@ =item B<< --config >> @@ -289,9 +289,9 @@ diff -ur munin-2.0.65.orig/master/doc/munin-cron.pod.in munin-2.0.65/master/doc/ =back -diff -ur munin-2.0.65.orig/master/extras/munin-update_old.in munin-2.0.65/master/extras/munin-update_old.in ---- munin-2.0.65.orig/master/extras/munin-update_old.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/extras/munin-update_old.in 2021-01-04 18:04:00.439803396 +0100 +diff -ur munin-2.0.69.orig/master/extras/munin-update_old.in munin-2.0.69/master/extras/munin-update_old.in +--- munin-2.0.69.orig/master/extras/munin-update_old.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/extras/munin-update_old.in 2022-08-27 15:18:27.525508032 +0200 @@ -42,7 +42,7 @@ my $STATS; my $cli_do_fork; @@ -343,9 +343,9 @@ diff -ur munin-2.0.65.orig/master/extras/munin-update_old.in munin-2.0.65/master @@DBDIR@@/* @@LOGDIR@@/munin-update @@STATEDIR@@/* -diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Config.pm munin-2.0.65/master/lib/Munin/Master/Config.pm ---- munin-2.0.65.orig/master/lib/Munin/Master/Config.pm 2021-01-04 18:03:15.210803396 +0100 -+++ munin-2.0.65/master/lib/Munin/Master/Config.pm 2021-01-04 18:04:00.439803396 +0100 +diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Config.pm munin-2.0.69/master/lib/Munin/Master/Config.pm +--- munin-2.0.69.orig/master/lib/Munin/Master/Config.pm 2022-08-27 15:17:33.866403127 +0200 ++++ munin-2.0.69/master/lib/Munin/Master/Config.pm 2022-08-27 15:18:27.525508032 +0200 @@ -138,7 +138,7 @@ root_instance => 1, @@ -355,9 +355,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Config.pm munin-2.0.65/master dbdir => $Munin::Common::Defaults::MUNIN_DBDIR, debug => 0, fork => 1, -@@ -152,9 +152,9 @@ - rundir => $Munin::Common::Defaults::MUNIN_STATEDIR, - timeout => 180, +@@ -154,9 +154,9 @@ + timeout_fetch_one_node => 180, + timeout_fetch_all_nodes => 240, tls => 'disabled', - tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem", - tls_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem", @@ -368,9 +368,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Config.pm munin-2.0.65/master tls_verify_certificate => 0, tls_verify_depth => 5, tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR", -diff -ur munin-2.0.65.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.65/master/lib/Munin/Master/GraphOld.pm ---- munin-2.0.65.orig/master/lib/Munin/Master/GraphOld.pm 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/lib/Munin/Master/GraphOld.pm 2021-01-04 18:04:00.440803396 +0100 +diff -ur munin-2.0.69.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.69/master/lib/Munin/Master/GraphOld.pm +--- munin-2.0.69.orig/master/lib/Munin/Master/GraphOld.pm 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/lib/Munin/Master/GraphOld.pm 2022-08-27 15:18:27.525508032 +0200 @@ -98,7 +98,7 @@ my $skip_stats = 0; my $stdout = 0; @@ -380,9 +380,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.65/mast my $libdir = $Munin::Common::Defaults::MUNIN_LIBDIR; # Note: Nothing by default is more convenient and elliminates code while # for cgi graphing - but it breaks how munin-graph expected stuff to work. -diff -ur munin-2.0.65.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.65/master/lib/Munin/Master/HTMLOld.pm ---- munin-2.0.65.orig/master/lib/Munin/Master/HTMLOld.pm 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/lib/Munin/Master/HTMLOld.pm 2021-01-04 18:04:00.440803396 +0100 +diff -ur munin-2.0.69.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.69/master/lib/Munin/Master/HTMLOld.pm +--- munin-2.0.69.orig/master/lib/Munin/Master/HTMLOld.pm 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/lib/Munin/Master/HTMLOld.pm 2022-08-27 15:18:27.526508034 +0200 @@ -81,7 +81,7 @@ my @times = ("day", "week", "month", "year"); @@ -419,9 +419,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.65/maste @@DBDIR@@/datafile @@LOGDIR@@/munin-html @@HTMLDIR@@/* -diff -ur munin-2.0.65.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.65/master/lib/Munin/Master/LimitsOld.pm ---- munin-2.0.65.orig/master/lib/Munin/Master/LimitsOld.pm 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/lib/Munin/Master/LimitsOld.pm 2021-01-04 18:04:00.440803396 +0100 +diff -ur munin-2.0.69.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.69/master/lib/Munin/Master/LimitsOld.pm +--- munin-2.0.69.orig/master/lib/Munin/Master/LimitsOld.pm 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/lib/Munin/Master/LimitsOld.pm 2022-08-27 15:18:27.526508034 +0200 @@ -57,7 +57,7 @@ use Munin::Common::Defaults; @@ -440,9 +440,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.65/mas "; exit 0; -diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm munin-2.0.65/master/lib/Munin/Master/Utils.pm ---- munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm 2021-01-04 18:03:15.210803396 +0100 -+++ munin-2.0.65/master/lib/Munin/Master/Utils.pm 2021-01-04 18:04:00.440803396 +0100 +diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm munin-2.0.69/master/lib/Munin/Master/Utils.pm +--- munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm 2022-08-27 15:17:33.867403129 +0200 ++++ munin-2.0.69/master/lib/Munin/Master/Utils.pm 2022-08-27 15:18:27.526508034 +0200 @@ -112,7 +112,7 @@ }, }; @@ -452,9 +452,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm munin-2.0.65/master/ # Fields to copy when "aliasing" a field my @COPY_FIELDS = ("label", "draw", "type", "rrdfile", "fieldname", "info"); -diff -ur munin-2.0.65.orig/master/munin.conf.in munin-2.0.65/master/munin.conf.in ---- munin-2.0.65.orig/master/munin.conf.in 2021-01-04 18:03:15.210803396 +0100 -+++ munin-2.0.65/master/munin.conf.in 2021-01-04 18:04:00.440803396 +0100 +diff -ur munin-2.0.69.orig/master/munin.conf.in munin-2.0.69/master/munin.conf.in +--- munin-2.0.69.orig/master/munin.conf.in 2022-08-27 15:17:33.867403129 +0200 ++++ munin-2.0.69/master/munin.conf.in 2022-08-27 15:18:27.527508036 +0200 @@ -24,7 +24,7 @@ # cgitmpdir @@DBDIR@@/cgi-tmp @@ -464,9 +464,9 @@ diff -ur munin-2.0.65.orig/master/munin.conf.in munin-2.0.65/master/munin.conf.i # You can choose the time reference for "DERIVE" like graphs, and show # "per minute", "per hour" values instead of the default "per second" -diff -ur munin-2.0.65.orig/master/t/munin_master_config.t munin-2.0.65/master/t/munin_master_config.t ---- munin-2.0.65.orig/master/t/munin_master_config.t 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/t/munin_master_config.t 2021-01-04 18:04:00.440803396 +0100 +diff -ur munin-2.0.69.orig/master/t/munin_master_config.t munin-2.0.69/master/t/munin_master_config.t +--- munin-2.0.69.orig/master/t/munin_master_config.t 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/t/munin_master_config.t 2022-08-27 15:18:27.529508040 +0200 @@ -24,7 +24,7 @@ }, @@ -476,9 +476,9 @@ diff -ur munin-2.0.65.orig/master/t/munin_master_config.t munin-2.0.65/master/t/ dbdir => '/opt/munin/sandbox/var/opt/munin', debug => 0, fork => 1, -diff -ur munin-2.0.65.orig/master/www/munin-htaccess.in munin-2.0.65/master/www/munin-htaccess.in ---- munin-2.0.65.orig/master/www/munin-htaccess.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/www/munin-htaccess.in 2021-01-04 18:04:00.441803396 +0100 +diff -ur munin-2.0.69.orig/master/www/munin-htaccess.in munin-2.0.69/master/www/munin-htaccess.in +--- munin-2.0.69.orig/master/www/munin-htaccess.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/www/munin-htaccess.in 2022-08-27 15:18:27.529508040 +0200 @@ -9,7 +9,7 @@ # # @@ -488,9 +488,9 @@ diff -ur munin-2.0.65.orig/master/www/munin-htaccess.in munin-2.0.65/master/www/ AuthName "Munin" AuthType Basic require valid-user -diff -ur munin-2.0.65.orig/node/bin/munindoc munin-2.0.65/node/bin/munindoc ---- munin-2.0.65.orig/node/bin/munindoc 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/node/bin/munindoc 2021-01-04 18:04:00.441803396 +0100 +diff -ur munin-2.0.69.orig/node/bin/munindoc munin-2.0.69/node/bin/munindoc +--- munin-2.0.69.orig/node/bin/munindoc 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/node/bin/munindoc 2022-08-27 15:18:27.530508042 +0200 @@ -48,7 +48,7 @@ # Dirs in which to look for $plugin.pod and $plugin files. @@ -500,9 +500,9 @@ diff -ur munin-2.0.65.orig/node/bin/munindoc munin-2.0.65/node/bin/munindoc "$Munin::Common::Defaults::MUNIN_PERLLIB"); File::Find::find({wanted => \&wanted_pod}, @DIRS); -diff -ur munin-2.0.65.orig/node/doc/munin-node.conf.pod munin-2.0.65/node/doc/munin-node.conf.pod ---- munin-2.0.65.orig/node/doc/munin-node.conf.pod 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/node/doc/munin-node.conf.pod 2021-01-04 18:04:00.441803396 +0100 +diff -ur munin-2.0.69.orig/node/doc/munin-node.conf.pod munin-2.0.69/node/doc/munin-node.conf.pod +--- munin-2.0.69.orig/node/doc/munin-node.conf.pod 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/node/doc/munin-node.conf.pod 2022-08-27 15:18:27.530508042 +0200 @@ -91,20 +91,20 @@ =item B @@ -527,9 +527,9 @@ diff -ur munin-2.0.65.orig/node/doc/munin-node.conf.pod munin-2.0.65/node/doc/mu =item B -diff -ur munin-2.0.65.orig/node/extras/munin-node-simple.in munin-2.0.65/node/extras/munin-node-simple.in ---- munin-2.0.65.orig/node/extras/munin-node-simple.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/node/extras/munin-node-simple.in 2021-01-04 18:04:00.517803396 +0100 +diff -ur munin-2.0.69.orig/node/extras/munin-node-simple.in munin-2.0.69/node/extras/munin-node-simple.in +--- munin-2.0.69.orig/node/extras/munin-node-simple.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/node/extras/munin-node-simple.in 2022-08-27 15:18:27.530508042 +0200 @@ -28,8 +28,8 @@ $| = 1; @@ -541,9 +541,9 @@ diff -ur munin-2.0.65.orig/node/extras/munin-node-simple.in munin-2.0.65/node/ex my $version = "@@VERSION@@"; # Empty environment -diff -ur munin-2.0.65.orig/node/lib/Munin/Node/Config.pm munin-2.0.65/node/lib/Munin/Node/Config.pm ---- munin-2.0.65.orig/node/lib/Munin/Node/Config.pm 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/node/lib/Munin/Node/Config.pm 2021-01-04 18:04:00.517803396 +0100 +diff -ur munin-2.0.69.orig/node/lib/Munin/Node/Config.pm munin-2.0.69/node/lib/Munin/Node/Config.pm +--- munin-2.0.69.orig/node/lib/Munin/Node/Config.pm 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/node/lib/Munin/Node/Config.pm 2022-08-27 15:18:27.530508042 +0200 @@ -23,7 +23,7 @@ my ($class) = @_; @@ -553,9 +553,9 @@ diff -ur munin-2.0.65.orig/node/lib/Munin/Node/Config.pm munin-2.0.65/node/lib/M }, $class; return $instance; -diff -ur munin-2.0.65.orig/node/lib/Munin/Node/Server.pm munin-2.0.65/node/lib/Munin/Node/Server.pm ---- munin-2.0.65.orig/node/lib/Munin/Node/Server.pm 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/node/lib/Munin/Node/Server.pm 2021-01-04 18:04:00.517803396 +0100 +diff -ur munin-2.0.69.orig/node/lib/Munin/Node/Server.pm munin-2.0.69/node/lib/Munin/Node/Server.pm +--- munin-2.0.69.orig/node/lib/Munin/Node/Server.pm 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/node/lib/Munin/Node/Server.pm 2022-08-27 15:18:27.531508044 +0200 @@ -273,11 +273,11 @@ my $mode = $session->{tls_mode}; @@ -571,9 +571,9 @@ diff -ur munin-2.0.65.orig/node/lib/Munin/Node/Server.pm munin-2.0.65/node/lib/M my $tls_verify = $config->{tls_verify_certificate} || 0; my $tls_match = $config->{tls_match}; -diff -ur munin-2.0.65.orig/node/lib/Munin/Node/Service.pm munin-2.0.65/node/lib/Munin/Node/Service.pm ---- munin-2.0.65.orig/node/lib/Munin/Node/Service.pm 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/node/lib/Munin/Node/Service.pm 2021-01-04 18:04:00.517803396 +0100 +diff -ur munin-2.0.69.orig/node/lib/Munin/Node/Service.pm munin-2.0.69/node/lib/Munin/Node/Service.pm +--- munin-2.0.69.orig/node/lib/Munin/Node/Service.pm 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/node/lib/Munin/Node/Service.pm 2022-08-27 15:18:27.531508044 +0200 @@ -20,7 +20,7 @@ my ($class, %args) = @_; @@ -583,9 +583,9 @@ diff -ur munin-2.0.65.orig/node/lib/Munin/Node/Service.pm munin-2.0.65/node/lib/ $args{defuser} = getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER unless defined($args{defuser}); $args{defgroup} = getgrnam $Munin::Common::Defaults::MUNIN_GROUP unless defined($args{defgroup}); -diff -ur munin-2.0.65.orig/node/sbin/munin-node munin-2.0.65/node/sbin/munin-node ---- munin-2.0.65.orig/node/sbin/munin-node 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/node/sbin/munin-node 2021-01-04 18:04:00.517803396 +0100 +diff -ur munin-2.0.69.orig/node/sbin/munin-node munin-2.0.69/node/sbin/munin-node +--- munin-2.0.69.orig/node/sbin/munin-node 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/node/sbin/munin-node 2022-08-27 15:18:27.531508044 +0200 @@ -34,8 +34,8 @@ use Munin::Node::Server; @@ -619,9 +619,9 @@ diff -ur munin-2.0.65.orig/node/sbin/munin-node munin-2.0.65/node/sbin/munin-nod @@STATEDIR@@/munin-node.pid @@LOGDIR@@/munin-node.log -diff -ur munin-2.0.65.orig/node/sbin/munin-node-configure munin-2.0.65/node/sbin/munin-node-configure ---- munin-2.0.65.orig/node/sbin/munin-node-configure 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/node/sbin/munin-node-configure 2021-01-04 18:04:00.518803396 +0100 +diff -ur munin-2.0.69.orig/node/sbin/munin-node-configure munin-2.0.69/node/sbin/munin-node-configure +--- munin-2.0.69.orig/node/sbin/munin-node-configure 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/node/sbin/munin-node-configure 2022-08-27 15:18:27.531508044 +0200 @@ -76,9 +76,9 @@ sub parse_args @@ -667,9 +667,9 @@ diff -ur munin-2.0.65.orig/node/sbin/munin-node-configure munin-2.0.65/node/sbin @@LIBDIR@@/plugins/plugins.history @@LIBDIR@@/plugins/* -diff -ur munin-2.0.65.orig/node/sbin/munin-run munin-2.0.65/node/sbin/munin-run ---- munin-2.0.65.orig/node/sbin/munin-run 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/node/sbin/munin-run 2021-01-04 18:04:00.518803396 +0100 +diff -ur munin-2.0.69.orig/node/sbin/munin-run munin-2.0.69/node/sbin/munin-run +--- munin-2.0.69.orig/node/sbin/munin-run 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/node/sbin/munin-run 2022-08-27 15:18:27.532508046 +0200 @@ -21,7 +21,7 @@ my $services; @@ -687,8 +687,8 @@ diff -ur munin-2.0.65.orig/node/sbin/munin-run munin-2.0.65/node/sbin/munin-run + my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d"; my $sconffile; - my ($plugin, $arg); -@@ -433,15 +433,15 @@ + my ($plugin, $arg, @extra_args); +@@ -435,15 +435,15 @@ =item B<< --config >> @@ -707,7 +707,7 @@ diff -ur munin-2.0.65.orig/node/sbin/munin-run munin-2.0.65/node/sbin/munin-run =item B<< --sconffile >> -@@ -505,9 +505,9 @@ +@@ -507,9 +507,9 @@ =head1 FILES @@ -720,9 +720,9 @@ diff -ur munin-2.0.65.orig/node/sbin/munin-run munin-2.0.65/node/sbin/munin-run @@STATEDIR@@/munin-node.pid @@LOGDIR@@/munin-node.log -diff -ur munin-2.0.65.orig/plugins/node.d/exim_mailqueue.in munin-2.0.65/plugins/node.d/exim_mailqueue.in ---- munin-2.0.65.orig/plugins/node.d/exim_mailqueue.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/exim_mailqueue.in 2021-01-04 18:04:06.350803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/exim_mailqueue.in munin-2.0.69/plugins/node.d/exim_mailqueue.in +--- munin-2.0.69.orig/plugins/node.d/exim_mailqueue.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/exim_mailqueue.in 2022-08-27 15:18:27.532508046 +0200 @@ -17,7 +17,7 @@ [exim_*] user exim @@ -732,9 +732,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/exim_mailqueue.in munin-2.0.65/plugins if you need to override the defaults below: [exim_mailqueue] -diff -ur munin-2.0.65.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.65/plugins/node.d/ipmi_sensor_.in ---- munin-2.0.65.orig/plugins/node.d/ipmi_sensor_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/ipmi_sensor_.in 2021-01-04 18:04:06.351803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.69/plugins/node.d/ipmi_sensor_.in +--- munin-2.0.69.orig/plugins/node.d/ipmi_sensor_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/ipmi_sensor_.in 2022-08-27 15:18:27.532508046 +0200 @@ -17,7 +17,7 @@ ipmitool probably needs to be run as root, and it may take more than 10 seconds on some hosts. @@ -762,9 +762,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.65/plugins/n def normalize_sensor(name): -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_innodb.in munin-2.0.65/plugins/node.d/mysql_innodb.in ---- munin-2.0.65.orig/plugins/node.d/mysql_innodb.in 2021-01-04 17:53:09.641969144 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_innodb.in 2021-01-04 18:04:06.351803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_innodb.in munin-2.0.69/plugins/node.d/mysql_innodb.in +--- munin-2.0.69.orig/plugins/node.d/mysql_innodb.in 2022-08-27 15:12:36.156833017 +0200 ++++ munin-2.0.69/plugins/node.d/mysql_innodb.in 2022-08-27 15:18:27.533508047 +0200 @@ -34,7 +34,7 @@ =head1 CONFIGURATION @@ -774,9 +774,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mysql_innodb.in munin-2.0.65/plugins/n if you need to override the defaults below: [mysql_innodb] -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.65/plugins/node.d/mysql_isam_space_.in ---- munin-2.0.65.orig/plugins/node.d/mysql_isam_space_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_isam_space_.in 2021-01-04 18:04:06.351803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.69/plugins/node.d/mysql_isam_space_.in +--- munin-2.0.69.orig/plugins/node.d/mysql_isam_space_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/mysql_isam_space_.in 2022-08-27 15:18:27.533508047 +0200 @@ -8,7 +8,7 @@ =head1 CONFIGURATION @@ -786,9 +786,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.65/plug if you need to override the defaults below: [mysql_isam_space_*] -diff -ur munin-2.0.65.orig/plugins/node.d/mysql_threads.in munin-2.0.65/plugins/node.d/mysql_threads.in ---- munin-2.0.65.orig/plugins/node.d/mysql_threads.in 2021-01-04 17:53:09.641969144 +0100 -+++ munin-2.0.65/plugins/node.d/mysql_threads.in 2021-01-04 18:04:06.351803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/mysql_threads.in munin-2.0.69/plugins/node.d/mysql_threads.in +--- munin-2.0.69.orig/plugins/node.d/mysql_threads.in 2022-08-27 15:12:36.156833017 +0200 ++++ munin-2.0.69/plugins/node.d/mysql_threads.in 2022-08-27 15:18:27.533508047 +0200 @@ -9,7 +9,7 @@ =head1 CONFIGURATION @@ -798,9 +798,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/mysql_threads.in munin-2.0.65/plugins/ need to override the defaults below: [mysql_threads] -diff -ur munin-2.0.65.orig/plugins/node.d/named.in munin-2.0.65/plugins/node.d/named.in ---- munin-2.0.65.orig/plugins/node.d/named.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/named.in 2021-01-04 18:04:06.351803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/named.in munin-2.0.69/plugins/node.d/named.in +--- munin-2.0.69.orig/plugins/node.d/named.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/named.in 2022-08-27 15:18:27.533508047 +0200 @@ -34,7 +34,7 @@ =head1 CONFIGURATION @@ -810,9 +810,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/named.in munin-2.0.65/plugins/node.d/n if you need to override the defaults below: [named] -diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in ---- munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in 2021-01-04 17:55:34.045969144 +0100 -+++ munin-2.0.65/plugins/node.d/ntp_kernel_pll_freq.in 2021-01-04 18:04:06.352803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in +--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in 2022-08-27 15:12:36.157833019 +0200 ++++ munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in 2022-08-27 15:18:27.534508049 +0200 @@ -12,7 +12,7 @@ No configuration @@ -833,9 +833,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.65/pl else fcomp=0 fi -diff -ur munin-2.0.65.orig/plugins/node.d/postfix_mailstats.in munin-2.0.65/plugins/node.d/postfix_mailstats.in ---- munin-2.0.65.orig/plugins/node.d/postfix_mailstats.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/postfix_mailstats.in 2021-01-04 18:04:06.352803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/postfix_mailstats.in munin-2.0.69/plugins/node.d/postfix_mailstats.in +--- munin-2.0.69.orig/plugins/node.d/postfix_mailstats.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/postfix_mailstats.in 2022-08-27 15:18:27.534508049 +0200 @@ -8,7 +8,7 @@ =head1 CONFIGURATION @@ -845,9 +845,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/postfix_mailstats.in munin-2.0.65/plug if you need to override the defaults below: [postfix_mailstats] -diff -ur munin-2.0.65.orig/plugins/node.d/psu_.in munin-2.0.65/plugins/node.d/psu_.in ---- munin-2.0.65.orig/plugins/node.d/psu_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/psu_.in 2021-01-04 18:04:06.352803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/psu_.in munin-2.0.69/plugins/node.d/psu_.in +--- munin-2.0.69.orig/plugins/node.d/psu_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/psu_.in 2022-08-27 15:18:27.534508049 +0200 @@ -15,7 +15,7 @@ Example: @@ -857,9 +857,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/psu_.in munin-2.0.65/plugins/node.d/ps ...will monitor the user "foo" -diff -ur munin-2.0.65.orig/plugins/node.d/squeezebox_.in munin-2.0.65/plugins/node.d/squeezebox_.in ---- munin-2.0.65.orig/plugins/node.d/squeezebox_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/squeezebox_.in 2021-01-04 18:04:06.352803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/squeezebox_.in munin-2.0.69/plugins/node.d/squeezebox_.in +--- munin-2.0.69.orig/plugins/node.d/squeezebox_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/squeezebox_.in 2022-08-27 15:18:27.534508049 +0200 @@ -20,7 +20,7 @@ non-default configuration, please use the environment variables 'squeezebox_host' and 'squeezebox_port' to connect. Also, if your @@ -869,9 +869,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/squeezebox_.in munin-2.0.65/plugins/no Sample follows: -diff -ur munin-2.0.65.orig/plugins/node.d/varnish_.in munin-2.0.65/plugins/node.d/varnish_.in ---- munin-2.0.65.orig/plugins/node.d/varnish_.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d/varnish_.in 2021-01-04 18:04:06.414803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d/varnish_.in munin-2.0.69/plugins/node.d/varnish_.in +--- munin-2.0.69.orig/plugins/node.d/varnish_.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d/varnish_.in 2022-08-27 15:18:27.535508051 +0200 @@ -54,7 +54,7 @@ You can link them yourself with something like this: @@ -881,9 +881,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d/varnish_.in munin-2.0.65/plugins/node. =head1 INTERPRETATION -diff -ur munin-2.0.65.orig/plugins/node.d.cygwin/df.in munin-2.0.65/plugins/node.d.cygwin/df.in ---- munin-2.0.65.orig/plugins/node.d.cygwin/df.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.cygwin/df.in 2021-01-04 18:04:06.414803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.cygwin/df.in munin-2.0.69/plugins/node.d.cygwin/df.in +--- munin-2.0.69.orig/plugins/node.d.cygwin/df.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.cygwin/df.in 2022-08-27 15:18:27.535508051 +0200 @@ -13,7 +13,7 @@ =head1 USAGE @@ -893,9 +893,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.cygwin/df.in munin-2.0.65/plugins/node The plugin excludes per default the following special, read-only or dynamically allocating file systems from graphing: -diff -ur munin-2.0.65.orig/plugins/node.d.debug/if.in munin-2.0.65/plugins/node.d.debug/if.in ---- munin-2.0.65.orig/plugins/node.d.debug/if.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.debug/if.in 2021-01-04 18:04:06.414803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.debug/if.in munin-2.0.69/plugins/node.d.debug/if.in +--- munin-2.0.69.orig/plugins/node.d.debug/if.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.debug/if.in 2022-08-27 15:18:27.535508051 +0200 @@ -21,7 +21,7 @@ =head1 USAGE @@ -905,9 +905,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.debug/if.in munin-2.0.65/plugins/node. =head1 MAGIC MARKERS -diff -ur munin-2.0.65.orig/plugins/node.d.debug/tc.in munin-2.0.65/plugins/node.d.debug/tc.in ---- munin-2.0.65.orig/plugins/node.d.debug/tc.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.debug/tc.in 2021-01-04 18:04:06.415803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.debug/tc.in munin-2.0.69/plugins/node.d.debug/tc.in +--- munin-2.0.69.orig/plugins/node.d.debug/tc.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.debug/tc.in 2022-08-27 15:18:27.535508051 +0200 @@ -21,7 +21,7 @@ =head1 USAGE @@ -917,9 +917,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.debug/tc.in munin-2.0.65/plugins/node. =head1 MAGIC MARKERS -diff -ur munin-2.0.65.orig/plugins/node.d.linux/acpi.in munin-2.0.65/plugins/node.d.linux/acpi.in ---- munin-2.0.65.orig/plugins/node.d.linux/acpi.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/acpi.in 2021-01-04 18:04:06.415803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/acpi.in munin-2.0.69/plugins/node.d.linux/acpi.in +--- munin-2.0.69.orig/plugins/node.d.linux/acpi.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/acpi.in 2022-08-27 15:18:27.536508053 +0200 @@ -17,7 +17,7 @@ =head1 USAGE @@ -929,9 +929,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/acpi.in munin-2.0.65/plugins/nod =head1 INTERPRETATION -diff -ur munin-2.0.65.orig/plugins/node.d.linux/apt.in munin-2.0.65/plugins/node.d.linux/apt.in ---- munin-2.0.65.orig/plugins/node.d.linux/apt.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/apt.in 2021-01-04 18:04:06.415803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/apt.in munin-2.0.69/plugins/node.d.linux/apt.in +--- munin-2.0.69.orig/plugins/node.d.linux/apt.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/apt.in 2022-08-27 15:18:27.536508053 +0200 @@ -38,7 +38,7 @@ =head1 USAGE @@ -941,9 +941,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/apt.in munin-2.0.65/plugins/node =head1 NOTES -diff -ur munin-2.0.65.orig/plugins/node.d.linux/df.in munin-2.0.65/plugins/node.d.linux/df.in ---- munin-2.0.65.orig/plugins/node.d.linux/df.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/df.in 2021-01-04 18:04:06.415803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/df.in munin-2.0.69/plugins/node.d.linux/df.in +--- munin-2.0.69.orig/plugins/node.d.linux/df.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/df.in 2022-08-27 15:18:27.536508053 +0200 @@ -31,7 +31,7 @@ env.warning 92 env.critical 98 @@ -962,9 +962,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/df.in munin-2.0.65/plugins/node. =head1 MAGIC MARKERS -diff -ur munin-2.0.65.orig/plugins/node.d.linux/df_inode.in munin-2.0.65/plugins/node.d.linux/df_inode.in ---- munin-2.0.65.orig/plugins/node.d.linux/df_inode.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/df_inode.in 2021-01-04 18:04:06.415803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/df_inode.in munin-2.0.69/plugins/node.d.linux/df_inode.in +--- munin-2.0.69.orig/plugins/node.d.linux/df_inode.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/df_inode.in 2022-08-27 15:18:27.536508053 +0200 @@ -28,7 +28,7 @@ env.warning 92 env.critical 98 @@ -983,9 +983,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/df_inode.in munin-2.0.65/plugins =head1 MAGIC MARKERS -diff -ur munin-2.0.65.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.65/plugins/node.d.linux/fw_conntrack.in ---- munin-2.0.65.orig/plugins/node.d.linux/fw_conntrack.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/fw_conntrack.in 2021-01-04 18:04:06.415803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.69/plugins/node.d.linux/fw_conntrack.in +--- munin-2.0.69.orig/plugins/node.d.linux/fw_conntrack.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/fw_conntrack.in 2022-08-27 15:18:27.537508055 +0200 @@ -11,7 +11,7 @@ =head2 CONFIGURATION EXAMPLE @@ -995,9 +995,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.65/plu [fw_*] user root -diff -ur munin-2.0.65.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.65/plugins/node.d.linux/fw_forwarded_local.in ---- munin-2.0.65.orig/plugins/node.d.linux/fw_forwarded_local.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/fw_forwarded_local.in 2021-01-04 18:04:06.426803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.69/plugins/node.d.linux/fw_forwarded_local.in +--- munin-2.0.69.orig/plugins/node.d.linux/fw_forwarded_local.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/fw_forwarded_local.in 2022-08-27 15:18:27.537508055 +0200 @@ -10,7 +10,7 @@ =head2 CONFIGURATION EXAMPLE @@ -1007,9 +1007,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0. [fw_*] user root -diff -ur munin-2.0.65.orig/plugins/node.d.linux/fw_packets.in munin-2.0.65/plugins/node.d.linux/fw_packets.in ---- munin-2.0.65.orig/plugins/node.d.linux/fw_packets.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/fw_packets.in 2021-01-04 18:04:06.426803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/fw_packets.in munin-2.0.69/plugins/node.d.linux/fw_packets.in +--- munin-2.0.69.orig/plugins/node.d.linux/fw_packets.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/fw_packets.in 2022-08-27 15:18:27.537508055 +0200 @@ -14,7 +14,7 @@ =head1 CONFIGURATION EXAMPLE @@ -1019,9 +1019,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/fw_packets.in munin-2.0.65/plugi [fw*] user root -diff -ur munin-2.0.65.orig/plugins/node.d.linux/iostat.in munin-2.0.65/plugins/node.d.linux/iostat.in ---- munin-2.0.65.orig/plugins/node.d.linux/iostat.in 2021-01-04 17:53:09.715969144 +0100 -+++ munin-2.0.65/plugins/node.d.linux/iostat.in 2021-01-04 18:04:06.427803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/iostat.in munin-2.0.69/plugins/node.d.linux/iostat.in +--- munin-2.0.69.orig/plugins/node.d.linux/iostat.in 2022-08-27 15:16:13.861246722 +0200 ++++ munin-2.0.69/plugins/node.d.linux/iostat.in 2022-08-27 15:18:27.537508055 +0200 @@ -24,7 +24,7 @@ =head1 USAGE @@ -1031,9 +1031,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/iostat.in munin-2.0.65/plugins/n =head1 INTERPRETATION -diff -ur munin-2.0.65.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.65/plugins/node.d.linux/iostat_ios.in ---- munin-2.0.65.orig/plugins/node.d.linux/iostat_ios.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/iostat_ios.in 2021-01-04 18:04:06.427803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.69/plugins/node.d.linux/iostat_ios.in +--- munin-2.0.69.orig/plugins/node.d.linux/iostat_ios.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/iostat_ios.in 2022-08-27 15:18:27.538508057 +0200 @@ -15,7 +15,7 @@ =head1 USAGE @@ -1043,9 +1043,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.65/plugi =head1 INTERPRETATION -diff -ur munin-2.0.65.orig/plugins/node.d.linux/irqstats.in munin-2.0.65/plugins/node.d.linux/irqstats.in ---- munin-2.0.65.orig/plugins/node.d.linux/irqstats.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/plugins/node.d.linux/irqstats.in 2021-01-04 18:04:06.427803396 +0100 +diff -ur munin-2.0.69.orig/plugins/node.d.linux/irqstats.in munin-2.0.69/plugins/node.d.linux/irqstats.in +--- munin-2.0.69.orig/plugins/node.d.linux/irqstats.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/plugins/node.d.linux/irqstats.in 2022-08-27 15:18:27.538508057 +0200 @@ -18,7 +18,7 @@ =head1 USAGE @@ -1055,9 +1055,9 @@ diff -ur munin-2.0.65.orig/plugins/node.d.linux/irqstats.in munin-2.0.65/plugins =head1 INTERPRETATION -diff -ur munin-2.0.65.orig/resources/hpux-init.d_munin-node.in munin-2.0.65/resources/hpux-init.d_munin-node.in ---- munin-2.0.65.orig/resources/hpux-init.d_munin-node.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/resources/hpux-init.d_munin-node.in 2021-01-04 18:04:06.427803396 +0100 +diff -ur munin-2.0.69.orig/resources/hpux-init.d_munin-node.in munin-2.0.69/resources/hpux-init.d_munin-node.in +--- munin-2.0.69.orig/resources/hpux-init.d_munin-node.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/resources/hpux-init.d_munin-node.in 2022-08-27 15:18:27.538508057 +0200 @@ -6,7 +6,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin NAME=munin-node @@ -1067,9 +1067,9 @@ diff -ur munin-2.0.65.orig/resources/hpux-init.d_munin-node.in munin-2.0.65/reso RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE) PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE) MYCONF=/etc/rc.config.d/muninconf -diff -ur munin-2.0.65.orig/resources/linux-cron.d_munin-node.in munin-2.0.65/resources/linux-cron.d_munin-node.in ---- munin-2.0.65.orig/resources/linux-cron.d_munin-node.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/resources/linux-cron.d_munin-node.in 2021-01-04 18:04:06.427803396 +0100 +diff -ur munin-2.0.69.orig/resources/linux-cron.d_munin-node.in munin-2.0.69/resources/linux-cron.d_munin-node.in +--- munin-2.0.69.orig/resources/linux-cron.d_munin-node.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/resources/linux-cron.d_munin-node.in 2022-08-27 15:18:27.538508057 +0200 @@ -8,5 +8,5 @@ # an hour (12 invokations an hour, 1 in 12 chance that the update will # happen), but ensure that there will never be more than two hour (7200 @@ -1077,9 +1077,9 @@ diff -ur munin-2.0.65.orig/resources/linux-cron.d_munin-node.in munin-2.0.65/res -*/5 * * * * root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null +*/5 * * * * root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null -diff -ur munin-2.0.65.orig/t/Makefile.config munin-2.0.65/t/Makefile.config ---- munin-2.0.65.orig/t/Makefile.config 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/t/Makefile.config 2021-01-04 18:04:06.427803396 +0100 +diff -ur munin-2.0.69.orig/t/Makefile.config munin-2.0.69/t/Makefile.config +--- munin-2.0.69.orig/t/Makefile.config 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/t/Makefile.config 2022-08-27 15:18:27.539508059 +0200 @@ -9,7 +9,8 @@ PREFIX = $(PWD)/t/install diff --git a/munin-templatedir.patch b/munin-templatedir.patch index cfac964..e2d0874 100644 --- a/munin-templatedir.patch +++ b/munin-templatedir.patch @@ -1,6 +1,6 @@ -diff -ur munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.65/common/lib/Munin/Common/Defaults.pm ---- munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/common/lib/Munin/Common/Defaults.pm 2021-01-04 18:03:15.208803396 +0100 +diff -ur munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.69/common/lib/Munin/Common/Defaults.pm +--- munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/common/lib/Munin/Common/Defaults.pm 2022-08-27 15:17:33.865403125 +0200 @@ -30,6 +30,7 @@ our $MUNIN_MANDIR = ''; our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/"; @@ -9,9 +9,9 @@ diff -ur munin-2.0.65.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.65/comm our $MUNIN_USER = getpwuid $UID; our $MUNIN_GROUP = getgrgid $GID; our $MUNIN_PLUGINUSER = getpwuid $UID; -diff -ur munin-2.0.65.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.65/contrib/munin-every-services-all-boxes-build-html.in ---- munin-2.0.65.orig/contrib/munin-every-services-all-boxes-build-html.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/contrib/munin-every-services-all-boxes-build-html.in 2021-01-04 18:03:15.208803396 +0100 +diff -ur munin-2.0.69.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.69/contrib/munin-every-services-all-boxes-build-html.in +--- munin-2.0.69.orig/contrib/munin-every-services-all-boxes-build-html.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/contrib/munin-every-services-all-boxes-build-html.in 2022-08-27 15:17:33.865403125 +0200 @@ -23,7 +23,7 @@ chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes @@ -21,9 +21,9 @@ diff -ur munin-2.0.65.orig/contrib/munin-every-services-all-boxes-build-html.in
every services on all boxes -diff -ur munin-2.0.65.orig/Makefile munin-2.0.65/Makefile ---- munin-2.0.65.orig/Makefile 2021-01-04 17:51:54.921969144 +0100 -+++ munin-2.0.65/Makefile 2021-01-04 18:03:15.209803396 +0100 +diff -ur munin-2.0.69.orig/Makefile munin-2.0.69/Makefile +--- munin-2.0.69.orig/Makefile 2022-08-27 15:12:18.268799133 +0200 ++++ munin-2.0.69/Makefile 2022-08-27 15:17:33.866403127 +0200 @@ -101,9 +101,9 @@ $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) @@ -82,9 +82,9 @@ diff -ur munin-2.0.65.orig/Makefile munin-2.0.65/Makefile common/lib/Munin/Common/Defaults.pm >common/blib/lib/Munin/Common/Defaults.pm -diff -ur munin-2.0.65.orig/Makefile.config munin-2.0.65/Makefile.config ---- munin-2.0.65.orig/Makefile.config 2021-01-04 17:51:54.921969144 +0100 -+++ munin-2.0.65/Makefile.config 2021-01-04 18:03:15.209803396 +0100 +diff -ur munin-2.0.69.orig/Makefile.config munin-2.0.69/Makefile.config +--- munin-2.0.69.orig/Makefile.config 2022-08-27 15:12:18.268799133 +0200 ++++ munin-2.0.69/Makefile.config 2022-08-27 15:17:33.866403127 +0200 @@ -40,6 +40,7 @@ # Server only - Output directory HTMLDIR = $(DESTDIR)/var/lib/munin/html @@ -93,9 +93,9 @@ diff -ur munin-2.0.65.orig/Makefile.config munin-2.0.65/Makefile.config # Where to put internal data for master (RRD, internal files, ...) DBDIR = $(DESTDIR)/var/lib/munin/db -diff -ur munin-2.0.65.orig/master/doc/munin.conf.pod.in munin-2.0.65/master/doc/munin.conf.pod.in ---- munin-2.0.65.orig/master/doc/munin.conf.pod.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/doc/munin.conf.pod.in 2021-01-04 18:03:15.209803396 +0100 +diff -ur munin-2.0.69.orig/master/doc/munin.conf.pod.in munin-2.0.69/master/doc/munin.conf.pod.in +--- munin-2.0.69.orig/master/doc/munin.conf.pod.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/doc/munin.conf.pod.in 2022-08-27 15:17:33.866403127 +0200 @@ -70,7 +70,7 @@ Directory for files tracking munin's current running state. Required. @@ -105,10 +105,10 @@ diff -ur munin-2.0.65.orig/master/doc/munin.conf.pod.in munin-2.0.65/master/doc/ Directory for templates used to generate HTML pages. Required. -diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Config.pm munin-2.0.65/master/lib/Munin/Master/Config.pm ---- munin-2.0.65.orig/master/lib/Munin/Master/Config.pm 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/lib/Munin/Master/Config.pm 2021-01-04 18:03:15.210803396 +0100 -@@ -157,8 +157,8 @@ +diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Config.pm munin-2.0.69/master/lib/Munin/Master/Config.pm +--- munin-2.0.69.orig/master/lib/Munin/Master/Config.pm 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/lib/Munin/Master/Config.pm 2022-08-27 15:17:33.866403127 +0200 +@@ -159,8 +159,8 @@ tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem", tls_verify_certificate => 0, tls_verify_depth => 5, @@ -119,9 +119,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Config.pm munin-2.0.65/master cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp", ssh_command => "ssh", ssh_options => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no", -diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm munin-2.0.65/master/lib/Munin/Master/Utils.pm ---- munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/lib/Munin/Master/Utils.pm 2021-01-04 18:03:15.210803396 +0100 +diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm munin-2.0.69/master/lib/Munin/Master/Utils.pm +--- munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/lib/Munin/Master/Utils.pm 2022-08-27 15:17:33.867403129 +0200 @@ -999,8 +999,8 @@ $config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_STATEDIR; $config->{'dbdir'} ||= $Munin::Common::Defaults::MUNIN_DBDIR; @@ -133,9 +133,9 @@ diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Utils.pm munin-2.0.65/master/ $config->{'htmldir'} ||= $Munin::Common::Defaults::MUNIN_HTMLDIR; $config->{'spooldir'} ||= $Munin::Common::Defaults::MUNIN_SPOOLDIR; $config->{'#%#parent'} = undef; -diff -ur munin-2.0.65.orig/master/munin.conf.in munin-2.0.65/master/munin.conf.in ---- munin-2.0.65.orig/master/munin.conf.in 2020-10-28 22:36:02.000000000 +0100 -+++ munin-2.0.65/master/munin.conf.in 2021-01-04 18:03:15.210803396 +0100 +diff -ur munin-2.0.69.orig/master/munin.conf.in munin-2.0.69/master/munin.conf.in +--- munin-2.0.69.orig/master/munin.conf.in 2021-11-22 23:12:17.000000000 +0100 ++++ munin-2.0.69/master/munin.conf.in 2022-08-27 15:17:33.867403129 +0200 @@ -12,11 +12,11 @@ # Where to look for the HTML templates diff --git a/munin.spec b/munin.spec index 72200ac..2ce016b 100644 --- a/munin.spec +++ b/munin.spec @@ -4,12 +4,12 @@ Summary: Munin - the Linpro RRD data agent Summary(pl.UTF-8): Munin - agent danych RRD Linpro Name: munin -Version: 2.0.65 +Version: 2.0.69 Release: 1 License: GPL Group: Applications/WWW Source0: https://github.com/munin-monitoring/munin/archive/%{version}.tar.gz -# Source0-md5: 99d327c964c383e939fe64f84b2b370d +# Source0-md5: 27ca8aa541280e062195500f619e2a30 Source1: %{name}-node.init Source2: %{name}.cron Source3: %{name}-apache.conf -- 2.44.0