From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 8 Sep 2015 10:20:51 +0000 (+0000)
Subject: - updated to 2.0.25
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=2d33702d149025925783ae5d4339fd23e18dedac;p=packages%2Fmunin.git

- updated to 2.0.25
---

diff --git a/munin-Makefile.patch b/munin-Makefile.patch
index e808657..5fd9967 100644
--- a/munin-Makefile.patch
+++ b/munin-Makefile.patch
@@ -1,6 +1,7 @@
---- munin-1.4.0/Makefile~	2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0/Makefile	2009-11-30 14:33:15.977700738 +0100
-@@ -77,6 +77,7 @@
+diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
+--- munin-2.0.25.orig/Makefile	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/Makefile	2015-09-08 10:02:24.392593251 +0000
+@@ -81,6 +81,7 @@ install-master-prime: $(INFILES_MASTER)
  	mkdir -p $(CONFDIR)/munin-conf.d
  	mkdir -p $(LIBDIR)
  	mkdir -p $(BINDIR)
@@ -8,7 +9,7 @@
  	mkdir -p $(PERLLIB)
  	mkdir -p $(PERLLIB)/Munin/Master
  	mkdir -p $(HTMLDIR)
-@@ -99,8 +100,8 @@
+@@ -112,8 +113,8 @@ install-master-prime: $(INFILES_MASTER)
  	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
  	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
  
@@ -17,10 +18,11 @@
 +	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
  	$(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
- 	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
  	$(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
---- munin-1.4.0/Makefile.config~	2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0/Makefile.config	2009-11-30 14:32:28.827763277 +0100
+ 	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
+diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config
+--- munin-2.0.25.orig/Makefile.config	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/Makefile.config	2015-09-08 10:02:24.393593251 +0000
 @@ -17,10 +17,10 @@
  #
  # the base of the Munin installation.
@@ -34,7 +36,7 @@
  
  # Server only - where to put munin-cron
  BINDIR     = $(PREFIX)/bin
-@@ -32,31 +32,31 @@
+@@ -32,31 +32,31 @@ SBINDIR    = $(PREFIX)/sbin
  DOCDIR     = $(PREFIX)/doc
  
  # Where to put man pages
@@ -75,7 +77,7 @@
  
  # Location of PID files and other statefiles. On the server, must be
  # writable by the user "munin".
-@@ -98,7 +98,7 @@
+@@ -95,7 +95,7 @@ GOODSH     := $(shell PATH=`getconf PATH
  BASH       := /bin/bash
  
  # Server only - Where to install the perl libraries
@@ -84,7 +86,7 @@
  PERLLIB    = $(DESTDIR)$(PERLSITELIB)
  
  # Client only - Install plugins for this architecture
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ OSTYPE     := $(shell uname | LANG=C tr
  
  # How to figure out the hostname. (Only used in default configuration
  # files)
@@ -93,7 +95,7 @@
  
  # What is the safest way to create a tempfile.
  # Default is to figure it out by testing various methods.
-@@ -126,9 +126,9 @@
+@@ -129,9 +129,9 @@ CGIUSER := nobody
  # Which command to use to check if the USER and GROUP to run Munin as, exists.
  # These will work on most modern OSes:
  #
@@ -106,9 +108,9 @@
  
  # For OSX, comment out the previous two lines and comment in these
  #
-@@ -146,9 +146,9 @@
- #CHECKUSER  := $(shell pwget -n $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
- #CHECKGROUP := $(shell grget -n $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+@@ -153,9 +153,9 @@ CHECKGROUP := $(shell $(GETENT) group $(
+ #CHECKUSER  := $(shell id $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+ #CHECKGROUP := $(shell grep ^$(GROUP): /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
  
 -CHOWN      := chown
 -CHMOD      := chmod
diff --git a/munin-plugins.patch b/munin-plugins.patch
index 2fade3f..05a1cea 100644
--- a/munin-plugins.patch
+++ b/munin-plugins.patch
@@ -1,6 +1,6 @@
-diff -urN munin-2.0.17/dists/tarball/plugins.conf munin-2.0.17-plugins/dists/tarball/plugins.conf
---- munin-2.0.17/dists/tarball/plugins.conf	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/dists/tarball/plugins.conf	2013-08-17 13:18:51.817585940 +0200
+diff -urNp munin-2.0.25.orig/dists/tarball/plugins.conf munin-2.0.25/dists/tarball/plugins.conf
+--- munin-2.0.25.orig/dists/tarball/plugins.conf	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/dists/tarball/plugins.conf	2015-09-08 10:05:48.873593251 +0000
 @@ -14,6 +14,9 @@
  #
  #
@@ -11,7 +11,7 @@ diff -urN munin-2.0.17/dists/tarball/plugins.conf munin-2.0.17-plugins/dists/tar
  [mysql*]
  #env.mysqlopts -u someuser
  
-@@ -31,3 +34,128 @@
+@@ -31,3 +34,128 @@ user root
  
  [postfix*]
  user root
@@ -140,10 +140,10 @@ diff -urN munin-2.0.17/dists/tarball/plugins.conf munin-2.0.17-plugins/dists/tar
 +
 +[cupsys_pages]
 +user root
-diff -urN munin-2.0.17/plugins/node.d/amavis.in munin-2.0.17-plugins/plugins/node.d/amavis.in
---- munin-2.0.17/plugins/node.d/amavis.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/amavis.in	2013-08-17 13:18:51.820919315 +0200
-@@ -77,13 +77,12 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/amavis.in munin-2.0.25/plugins/node.d/amavis.in
+--- munin-2.0.25.orig/plugins/node.d/amavis.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/amavis.in	2015-09-08 10:05:48.874593251 +0000
+@@ -77,13 +77,12 @@ GPLv2
  =cut
  
  mktempfile () {
@@ -159,7 +159,7 @@ diff -urN munin-2.0.17/plugins/node.d/amavis.in munin-2.0.17-plugins/plugins/nod
  
  if [ "$1" = "autoconf" ]; then
          if [ -f "${AMAVIS_LOG}" -a -n "${LOGTAIL}" -a -x "${LOGTAIL}" ] ; then
-@@ -106,7 +105,7 @@
+@@ -106,7 +105,7 @@ fi
  
  if [ "$1" = "config" ]; then
  	echo 'graph_title Amavis filter statistics'
@@ -168,7 +168,7 @@ diff -urN munin-2.0.17/plugins/node.d/amavis.in munin-2.0.17-plugins/plugins/nod
  	echo 'graph_category antivirus'
  	echo 'virus.label virus'
  	echo 'virus.info Number of viruses caught in email'
-@@ -124,7 +123,7 @@
+@@ -124,7 +123,7 @@ virus=U
  spamm=U
  spams=U
  
@@ -177,10 +177,10 @@ diff -urN munin-2.0.17/plugins/node.d/amavis.in munin-2.0.17-plugins/plugins/nod
  
  if [ -n "$TEMP_FILE" -a -f "$TEMP_FILE" ]
  then
-diff -urN munin-2.0.17/plugins/node.d/apache_accesses.in munin-2.0.17-plugins/plugins/node.d/apache_accesses.in
---- munin-2.0.17/plugins/node.d/apache_accesses.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/apache_accesses.in	2013-08-17 13:18:51.817585940 +0200
-@@ -89,6 +89,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/apache_accesses.in munin-2.0.25/plugins/node.d/apache_accesses.in
+--- munin-2.0.25.orig/plugins/node.d/apache_accesses.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/apache_accesses.in	2015-09-08 10:05:48.875593251 +0000
+@@ -89,6 +89,7 @@ if (! eval "require LWP::UserAgent;")
  
  my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
  my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
@@ -188,7 +188,7 @@ diff -urN munin-2.0.17/plugins/node.d/apache_accesses.in munin-2.0.17-plugins/pl
  
  if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
  {
-@@ -129,7 +130,11 @@
+@@ -129,7 +130,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
  
  if ( defined $ARGV[0] and $ARGV[0] eq "config" )
  {
@@ -201,10 +201,10 @@ diff -urN munin-2.0.17/plugins/node.d/apache_accesses.in munin-2.0.17-plugins/pl
  	print "graph_args --base 1000\n";
  	print "graph_vlabel accesses / \${graph_period}\n";
  	print "graph_category apache\n";
-diff -urN munin-2.0.17/plugins/node.d/apache_processes.in munin-2.0.17-plugins/plugins/node.d/apache_processes.in
---- munin-2.0.17/plugins/node.d/apache_processes.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/apache_processes.in	2013-08-17 13:18:51.817585940 +0200
-@@ -96,6 +96,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/apache_processes.in munin-2.0.25/plugins/node.d/apache_processes.in
+--- munin-2.0.25.orig/plugins/node.d/apache_processes.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/apache_processes.in	2015-09-08 10:05:48.876593251 +0000
+@@ -96,6 +96,7 @@ if (! eval "require LWP::UserAgent;")
  
  my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
  my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
@@ -212,7 +212,7 @@ diff -urN munin-2.0.17/plugins/node.d/apache_processes.in munin-2.0.17-plugins/p
  my $SHOWFREE = !exists $ENV{'showfree'} || $ENV{'showfree'};
  
  if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
-@@ -136,7 +137,11 @@
+@@ -136,7 +137,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
  
  if ( defined $ARGV[0] and $ARGV[0] eq "config" )
  {
@@ -225,10 +225,10 @@ diff -urN munin-2.0.17/plugins/node.d/apache_processes.in munin-2.0.17-plugins/p
          print "graph_args --base 1000 -l 0\n";
  		print "graph_category apache\n";
  	print "graph_order ";
-diff -urN munin-2.0.17/plugins/node.d/apache_volume.in munin-2.0.17-plugins/plugins/node.d/apache_volume.in
---- munin-2.0.17/plugins/node.d/apache_volume.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/apache_volume.in	2013-08-17 13:18:51.817585940 +0200
-@@ -89,6 +89,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/apache_volume.in munin-2.0.25/plugins/node.d/apache_volume.in
+--- munin-2.0.25.orig/plugins/node.d/apache_volume.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/apache_volume.in	2015-09-08 10:05:48.876593251 +0000
+@@ -89,6 +89,7 @@ if (! eval "require LWP::UserAgent;")
  
  my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
  my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
@@ -236,7 +236,7 @@ diff -urN munin-2.0.17/plugins/node.d/apache_volume.in munin-2.0.17-plugins/plug
  
  if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
  {
-@@ -129,7 +130,11 @@
+@@ -129,7 +130,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
  
  if ( defined $ARGV[0] and $ARGV[0] eq "config" )
  {
@@ -249,10 +249,10 @@ diff -urN munin-2.0.17/plugins/node.d/apache_volume.in munin-2.0.17-plugins/plug
  	print "graph_args --base 1000\n";
  	print "graph_vlabel bytes per \${graph_period}\n";
  	print "graph_category apache\n";
-diff -urN munin-2.0.17/plugins/node.d/bind9.in munin-2.0.17-plugins/plugins/node.d/bind9.in
---- munin-2.0.17/plugins/node.d/bind9.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/bind9.in	2013-08-17 13:18:51.820919315 +0200
-@@ -53,7 +53,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/bind9.in munin-2.0.25/plugins/node.d/bind9.in
+--- munin-2.0.25.orig/plugins/node.d/bind9.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/bind9.in	2015-09-08 10:05:48.877593251 +0000
+@@ -53,7 +53,7 @@ GPLv2
  use strict;
  
  my $QUERYLOG = $ENV{logfile} || '/var/log/bind9/query.log';
@@ -261,7 +261,7 @@ diff -urN munin-2.0.17/plugins/node.d/bind9.in munin-2.0.17-plugins/plugins/node
  
  my $OTHER=0;
  my %IN;
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ sub get_state {
          open(Q, ">", $STATEFILE);
          close(Q);
      }
@@ -270,10 +270,10 @@ diff -urN munin-2.0.17/plugins/node.d/bind9.in munin-2.0.17-plugins/plugins/node
      while (<Q>) {
          chomp;
          my ($q,$n) = split(/\s+/,$_,2);
-diff -urN munin-2.0.17/plugins/node.d/courier_.in munin-2.0.17-plugins/plugins/node.d/courier_.in
---- munin-2.0.17/plugins/node.d/courier_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/courier_.in	2013-08-17 13:18:51.817585940 +0200
-@@ -55,7 +55,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/courier_.in munin-2.0.25/plugins/node.d/courier_.in
+--- munin-2.0.25.orig/plugins/node.d/courier_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/courier_.in	2015-09-08 10:05:48.877593251 +0000
+@@ -55,7 +55,7 @@ Unknown
  COURIER_LOG=${logfile:-/var/log/mail.log}
  SERVICE=${service:-`basename $0 | sed 's/^courier_//g'`}
  OFFSET_FILE=${MUNIN_PLUGSTATE}/courier_${SERVICE}.offset
@@ -282,10 +282,10 @@ diff -urN munin-2.0.17/plugins/node.d/courier_.in munin-2.0.17-plugins/plugins/n
  
  mktempfile () {
  @@MKTEMP@@
-diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailstats.in munin-2.0.17-plugins/plugins/node.d/courier_mta_mailstats.in
---- munin-2.0.17/plugins/node.d/courier_mta_mailstats.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/courier_mta_mailstats.in	2013-08-17 13:18:51.817585940 +0200
-@@ -108,7 +108,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.25/plugins/node.d/courier_mta_mailstats.in
+--- munin-2.0.25.orig/plugins/node.d/courier_mta_mailstats.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/courier_mta_mailstats.in	2015-09-08 10:05:48.878593251 +0000
+@@ -108,7 +108,9 @@ if(!defined $pos) {
  
  if($startsize < $pos) {
      # Log rotated
@@ -296,10 +296,10 @@ diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailstats.in munin-2.0.17-plug
      $pos = 0;
  }
  
-diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in munin-2.0.17-plugins/plugins/node.d/courier_mta_mailvolume.in
---- munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/courier_mta_mailvolume.in	2013-08-17 13:18:51.817585940 +0200
-@@ -98,7 +98,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.25/plugins/node.d/courier_mta_mailvolume.in
+--- munin-2.0.25.orig/plugins/node.d/courier_mta_mailvolume.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/courier_mta_mailvolume.in	2015-09-08 10:05:48.878593251 +0000
+@@ -98,7 +98,9 @@ if(!defined $pos) {
  
  if($startsize < $pos) {
      # Log rotated
@@ -310,10 +310,10 @@ diff -urN munin-2.0.17/plugins/node.d/courier_mta_mailvolume.in munin-2.0.17-plu
      $pos = 0;
  }
  
-diff -urN munin-2.0.17/plugins/node.d/cupsys_pages.in munin-2.0.17-plugins/plugins/node.d/cupsys_pages.in
---- munin-2.0.17/plugins/node.d/cupsys_pages.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/cupsys_pages.in	2013-08-17 13:18:51.817585940 +0200
-@@ -100,7 +100,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/cupsys_pages.in munin-2.0.25/plugins/node.d/cupsys_pages.in
+--- munin-2.0.25.orig/plugins/node.d/cupsys_pages.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/cupsys_pages.in	2015-09-08 10:05:48.878593251 +0000
+@@ -100,7 +100,9 @@ if (!defined $pos) {
  }
  if ($startsize < $pos) {
      # Log rotated
@@ -324,7 +324,7 @@ diff -urN munin-2.0.17/plugins/node.d/cupsys_pages.in munin-2.0.17-plugins/plugi
      $pos = 0;
  }
  
-@@ -146,7 +148,7 @@
+@@ -146,7 +148,7 @@ sub parselogfile {
      while (tell(LOGFILE) < $stop) {
  	my $line = <LOGFILE>;
  	chomp ($line);
@@ -333,9 +333,9 @@ diff -urN munin-2.0.17/plugins/node.d/cupsys_pages.in munin-2.0.17-plugins/plugi
  	    if(!defined($printers{$1}) && keys(%printers) < $MAXLABEL) {
  		$printers{$1} += int($2)*int($3);
  	    } elsif(defined($printers{$1})) {
-diff -urN munin-2.0.17/plugins/node.d/foldingathome_rank.in munin-2.0.17-plugins/plugins/node.d/foldingathome_rank.in
---- munin-2.0.17/plugins/node.d/foldingathome_rank.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/foldingathome_rank.in	2013-08-17 13:18:51.820919315 +0200
+diff -urNp munin-2.0.25.orig/plugins/node.d/foldingathome_rank.in munin-2.0.25/plugins/node.d/foldingathome_rank.in
+--- munin-2.0.25.orig/plugins/node.d/foldingathome_rank.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/foldingathome_rank.in	2015-09-08 10:05:48.879593251 +0000
 @@ -13,7 +13,7 @@
  #%# family=contrib
  #%# capabilities=autoconf
@@ -345,10 +345,10 @@ diff -urN munin-2.0.17/plugins/node.d/foldingathome_rank.in munin-2.0.17-plugins
  
  if [ "$1" = "autoconf" ]; then
      # No real check of anything
-diff -urN munin-2.0.17/plugins/node.d/mailman.in munin-2.0.17-plugins/plugins/node.d/mailman.in
---- munin-2.0.17/plugins/node.d/mailman.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mailman.in	2013-08-17 13:18:51.817585940 +0200
-@@ -38,7 +38,13 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mailman.in munin-2.0.25/plugins/node.d/mailman.in
+--- munin-2.0.25.orig/plugins/node.d/mailman.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mailman.in	2015-09-08 10:05:48.879593251 +0000
+@@ -38,7 +38,13 @@ $members = 0;
  # System paths
  $logfile = $ENV{'logfile'} || "/var/log/mailman/post";
  $libdir  = $ENV{'libdir'}  || "/var/lib/mailman";
@@ -363,7 +363,7 @@ diff -urN munin-2.0.17/plugins/node.d/mailman.in munin-2.0.17-plugins/plugins/no
  
  if (-f "$logfile.0")
  {
-@@ -94,7 +100,9 @@
+@@ -94,7 +100,9 @@ if(!defined $pos) {
      $startsize = 0;
  } elsif($startsize < $pos) {
      # Log rotated
@@ -374,10 +374,10 @@ diff -urN munin-2.0.17/plugins/node.d/mailman.in munin-2.0.17-plugins/plugins/no
      $pos = 0;
  }
  
-diff -urN munin-2.0.17/plugins/node.d/mysql_.in munin-2.0.17-plugins/plugins/node.d/mysql_.in
---- munin-2.0.17/plugins/node.d/mysql_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mysql_.in	2013-08-17 13:18:51.820919315 +0200
-@@ -39,6 +39,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_.in munin-2.0.25/plugins/node.d/mysql_.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_.in	2015-09-08 10:05:48.881593251 +0000
+@@ -39,6 +39,7 @@ Non-default example:
      env.mysqlconnection DBI:mysql:mysql;host=127.0.0.1;port=3306
      env.mysqluser root
      env.mysqlpassword geheim
@@ -385,7 +385,7 @@ diff -urN munin-2.0.17/plugins/node.d/mysql_.in munin-2.0.17-plugins/plugins/nod
      env.cachenamespace munin_mysql_pri
    [mysql2_*]
      env.mysqlconnection DBI:mysql:mysql;host=127.0.0.1;port=13306
-@@ -156,6 +157,7 @@
+@@ -156,6 +157,7 @@ my %config = (
      'user'       => $ENV{'mysqluser'}       || 'root',
      'password'   => $ENV{'mysqlpassword'}   || '',
      'cache_namespace' => $ENV{'cachenamespace'} || 'munin_mysql',
@@ -393,7 +393,7 @@ diff -urN munin-2.0.17/plugins/node.d/mysql_.in munin-2.0.17-plugins/plugins/nod
  );
  
  
-@@ -927,8 +929,10 @@
+@@ -927,8 +929,10 @@ sub update_data {
  
      update_variables($dbh);
      update_innodb($dbh);
@@ -406,39 +406,39 @@ diff -urN munin-2.0.17/plugins/node.d/mysql_.in munin-2.0.17-plugins/plugins/nod
  
      $shared_memory_cache->set('data', $data);
  }
-diff -urN munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-plugins/plugins/node.d/mysql_innodb.in
---- munin-2.0.17/plugins/node.d/mysql_innodb.in	2013-08-17 13:19:03.501062149 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mysql_innodb.in	2013-08-17 13:18:51.994254767 +0200
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_innodb.in munin-2.0.25/plugins/node.d/mysql_innodb.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_innodb.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_innodb.in	2015-09-08 10:05:48.881593251 +0000
 @@ -1,4 +1,4 @@
 -#!@@GOODSH@@
 +#!@@BASH@@
  
  : << =cut
  
-diff -urN munin-2.0.17/plugins/node.d/mysql_slowqueries.in munin-2.0.17-plugins/plugins/node.d/mysql_slowqueries.in
---- munin-2.0.17/plugins/node.d/mysql_slowqueries.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mysql_slowqueries.in	2013-08-17 13:18:51.817585940 +0200
-@@ -64,5 +64,5 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.25/plugins/node.d/mysql_slowqueries.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_slowqueries.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_slowqueries.in	2015-09-08 10:05:48.882593251 +0000
+@@ -64,5 +64,5 @@ if [ "$1" = "config" ]; then
  	exit 0
  fi
  
 -/usr/bin/printf "queries.value "
 +/bin/printf "queries.value "
  ($MYSQLADMIN $MYSQLOPTS status 2>/dev/null || echo a a a a a a a a U) | awk '{print $9}'
-diff -urN munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-plugins/plugins/node.d/mysql_threads.in
---- munin-2.0.17/plugins/node.d/mysql_threads.in	2013-08-17 13:19:03.501062149 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/mysql_threads.in	2013-08-17 13:18:51.994254767 +0200
-@@ -74,5 +74,5 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_threads.in munin-2.0.25/plugins/node.d/mysql_threads.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_threads.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_threads.in	2015-09-08 10:05:48.882593251 +0000
+@@ -74,5 +74,5 @@ if [ "$1" = "config" ]; then
  	exit 0
  fi
  
 -/usr/bin/printf "threads.value "
 +/bin/printf "threads.value "
  ($MYSQLADMIN $MYSQLOPTS status 2>/dev/null || echo 'a a a U') | awk '{print $4}'
-diff -urN munin-2.0.17/plugins/node.d/ntp_.in munin-2.0.17-plugins/plugins/node.d/ntp_.in
---- munin-2.0.17/plugins/node.d/ntp_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_.in	2013-08-17 13:18:51.817585940 +0200
-@@ -57,26 +57,26 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_.in munin-2.0.25/plugins/node.d/ntp_.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_.in	2015-09-08 10:05:48.883593251 +0000
+@@ -57,26 +57,26 @@ use Net::DNS;
  use Net::IP;
  
  if ($ARGV[0] and $ARGV[0] eq "autoconf") {
@@ -471,7 +471,7 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_.in munin-2.0.17-plugins/plugins/node.
                          $peerinfo =~ s/\R/ /g;
                          my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
                          print $peer_addr, "\n" unless $peer_addr eq "0.0.0.0";
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ my $srcadr;
  my $delay;
  my $offset;
  my $jitter;
@@ -480,10 +480,10 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_.in munin-2.0.17-plugins/plugins/node.
  
  foreach my $line (@associations) {
          if ($line =~ m/^\s*\d+/) {
-diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_err.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_err.in
---- munin-2.0.17/plugins/node.d/ntp_kernel_err.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_err.in	2013-08-17 13:18:51.820919315 +0200
-@@ -32,7 +32,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.25/plugins/node.d/ntp_kernel_err.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_kernel_err.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_kernel_err.in	2015-09-08 10:05:48.884593251 +0000
+@@ -32,7 +32,7 @@ EOF
  export PATH=/usr/local/sbin:$PATH
  
  if [ "$1" = "autoconf" ]; then
@@ -492,7 +492,7 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_err.in munin-2.0.17-plugins/plu
      awk 'BEGIN { ev=1; }
           /^estimated error:/ { ev=0; }
           END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -51,11 +51,11 @@
+@@ -51,11 +51,11 @@ fi
  
  printf 'ntp_err.value '
  
@@ -507,10 +507,10 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_err.in munin-2.0.17-plugins/plu
  fi
  
  $cmd -c kerninfo | awk '/^estimated error:/ { print $3 }'
-diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_freq.in
---- munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in	2013-08-17 13:19:03.501062149 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_freq.in	2013-08-17 13:18:51.994254767 +0200
-@@ -39,7 +39,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in	2015-09-08 10:05:48.884593251 +0000
+@@ -39,7 +39,7 @@ EOF
  export PATH=/usr/local/sbin:$PATH
  
  if [ "$1" = "autoconf" ]; then
@@ -519,7 +519,7 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-plugin
      awk 'BEGIN { ev=1; }
           /^pll frequency:/ { ev=0; }
           END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -65,11 +65,11 @@
+@@ -65,11 +65,11 @@ fi
  
  printf 'ntp_pll_freq.value '
  
@@ -534,10 +534,10 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-plugin
  fi
  
  $cmd -c kerninfo | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
-diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_off.in
---- munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_kernel_pll_off.in	2013-08-17 13:18:51.820919315 +0200
-@@ -32,7 +32,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.25/plugins/node.d/ntp_kernel_pll_off.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_off.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_kernel_pll_off.in	2015-09-08 10:05:48.885593251 +0000
+@@ -32,7 +32,7 @@ EOF
  export PATH=/usr/local/sbin:$PATH
  
  if [ "$1" = "autoconf" ]; then
@@ -546,7 +546,7 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.17-plugins
      awk 'BEGIN { ev=1; }
           /^pll offset:/ { ev=0; }
           END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
-@@ -51,11 +51,11 @@
+@@ -51,11 +51,11 @@ fi
  
  printf 'ntp_pll_off.value '
  
@@ -561,10 +561,10 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.17-plugins
  fi
  
  $cmd -c kerninfo | awk '/^pll offset:/ { print $3 }'
-diff -urN munin-2.0.17/plugins/node.d/ntp_offset.in munin-2.0.17-plugins/plugins/node.d/ntp_offset.in
---- munin-2.0.17/plugins/node.d/ntp_offset.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_offset.in	2013-08-17 13:18:51.820919315 +0200
-@@ -38,9 +38,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_offset.in munin-2.0.25/plugins/node.d/ntp_offset.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_offset.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_offset.in	2015-09-08 10:05:48.885593251 +0000
+@@ -38,9 +38,9 @@ Loosely based on ntp_ plugin, but rework
  =cut
  
  do_autoconf () {
@@ -576,7 +576,7 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_offset.in munin-2.0.17-plugins/plugins
  	0)
              echo 'no (unable to list peers)'
  	    exit 0
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ do_autoconf () {
  }
  
  do_config () {
@@ -585,7 +585,7 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_offset.in munin-2.0.17-plugins/plugins
  
      set - $syspeer
  
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ EOF
  
  do_ () {
      # Fetch operation
@@ -594,10 +594,10 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_offset.in munin-2.0.17-plugins/plugins
  
      set - $syspeer
  
-diff -urN munin-2.0.17/plugins/node.d/ntp_states.in munin-2.0.17-plugins/plugins/node.d/ntp_states.in
---- munin-2.0.17/plugins/node.d/ntp_states.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/ntp_states.in	2013-08-17 13:18:51.820919315 +0200
-@@ -72,10 +72,10 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_states.in munin-2.0.25/plugins/node.d/ntp_states.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_states.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_states.in	2015-09-08 10:05:48.886593251 +0000
+@@ -72,10 +72,10 @@ sub make_hash {
  #  1 63933  931a   yes   yes  none   outlyer    sys_peer  1
  #  2 63934  943a   yes   yes  none candidate    sys_peer  3
  
@@ -610,7 +610,7 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_states.in munin-2.0.17-plugins/plugins
                          $peerinfo =~ s/\s//g;
                          my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
  
-@@ -125,17 +125,17 @@
+@@ -125,17 +125,17 @@ sub make_names {
  }
  
  if ($ARGV[0] and $ARGV[0] eq "autoconf") {
@@ -632,10 +632,10 @@ diff -urN munin-2.0.17/plugins/node.d/ntp_states.in munin-2.0.17-plugins/plugins
                  exit 0;
          }
  }
-diff -urN munin-2.0.17/plugins/node.d/nut_misc.in munin-2.0.17-plugins/plugins/node.d/nut_misc.in
---- munin-2.0.17/plugins/node.d/nut_misc.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/nut_misc.in	2013-08-17 13:18:51.820919315 +0200
-@@ -38,7 +38,8 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/nut_misc.in munin-2.0.25/plugins/node.d/nut_misc.in
+--- munin-2.0.25.orig/plugins/node.d/nut_misc.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/nut_misc.in	2015-09-08 10:05:48.886593251 +0000
+@@ -38,7 +38,8 @@ use strict;
  my %status;
  
  my %config = (
@@ -645,7 +645,7 @@ diff -urN munin-2.0.17/plugins/node.d/nut_misc.in munin-2.0.17-plugins/plugins/n
  	upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
  );
  
-@@ -48,11 +49,6 @@
+@@ -48,11 +49,6 @@ my %graph =  (
  				type => 'GAUGE',
  				draw => 'LINE2'
  			 },
@@ -657,7 +657,7 @@ diff -urN munin-2.0.17/plugins/node.d/nut_misc.in munin-2.0.17-plugins/plugins/n
  	'battery_runtime' => {
  				label => 'runtime - min',
  				type => 'GAUGE',
-@@ -76,7 +72,12 @@
+@@ -76,7 +72,12 @@ my %graph =  (
  );
  
  if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) {
@@ -671,7 +671,7 @@ diff -urN munin-2.0.17/plugins/node.d/nut_misc.in munin-2.0.17-plugins/plugins/n
  	#print "graph_args -l 110\n";
  	#print "graph_vlabel Misc\n";
  	foreach my $key (keys %graph) {
-@@ -89,7 +90,7 @@
+@@ -89,7 +90,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq 'c
  }
  
  sub fetch_values {
@@ -680,10 +680,10 @@ diff -urN munin-2.0.17/plugins/node.d/nut_misc.in munin-2.0.17-plugins/plugins/n
  	while ($data =~ /([a-z.]+): (.+)\b/g) {
  		my $label = $1;
  		my $value = $2;
-diff -urN munin-2.0.17/plugins/node.d/nut_volts.in munin-2.0.17-plugins/plugins/node.d/nut_volts.in
---- munin-2.0.17/plugins/node.d/nut_volts.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/nut_volts.in	2013-08-17 13:18:51.820919315 +0200
-@@ -14,7 +14,8 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/nut_volts.in munin-2.0.25/plugins/node.d/nut_volts.in
+--- munin-2.0.25.orig/plugins/node.d/nut_volts.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/nut_volts.in	2015-09-08 10:05:48.887593251 +0000
+@@ -14,7 +14,8 @@ use strict;
  my %status;
  
  my %config = (
@@ -693,7 +693,7 @@ diff -urN munin-2.0.17/plugins/node.d/nut_volts.in munin-2.0.17-plugins/plugins/
  	upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
  );
  
-@@ -24,16 +25,6 @@
+@@ -24,16 +25,6 @@ my %graph =  (
  				type => 'GAUGE',
  				draw => 'LINE2'
  			 },
@@ -710,7 +710,7 @@ diff -urN munin-2.0.17/plugins/node.d/nut_volts.in munin-2.0.17-plugins/plugins/
  	'output_voltage' => {
  				label => 'output',
  				type => 'GAUGE',
-@@ -42,7 +33,12 @@
+@@ -42,7 +33,12 @@ my %graph =  (
  );
  
  if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) {
@@ -724,7 +724,7 @@ diff -urN munin-2.0.17/plugins/node.d/nut_volts.in munin-2.0.17-plugins/plugins/
  	print "graph_args -l 115\n";
  	print "graph_vlabel Volts\n";
  	foreach my $key (keys %graph) {
-@@ -55,7 +51,7 @@
+@@ -55,7 +51,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq 'c
  }
  
  sub fetch_values {
@@ -733,10 +733,10 @@ diff -urN munin-2.0.17/plugins/node.d/nut_volts.in munin-2.0.17-plugins/plugins/
  	while ($data =~ /([a-z.]+): (.+)\b/g) {
  		my $label = $1;
  		my $value = $2;
-diff -urN munin-2.0.17/plugins/node.d/perdition.in munin-2.0.17-plugins/plugins/node.d/perdition.in
---- munin-2.0.17/plugins/node.d/perdition.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/perdition.in	2013-08-17 13:18:51.820919315 +0200
-@@ -56,7 +56,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/perdition.in munin-2.0.25/plugins/node.d/perdition.in
+--- munin-2.0.25.orig/plugins/node.d/perdition.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/perdition.in	2015-09-08 10:05:48.887593251 +0000
+@@ -56,7 +56,7 @@ mktempfile () {
  # Set the location of the perdition logs
  PERDITION_LOG=${logfile:-/var/log/perdition.log}
  OFFSET_FILE=${MUNIN_PLUGSTATE}/perdition.offset
@@ -745,10 +745,10 @@ diff -urN munin-2.0.17/plugins/node.d/perdition.in munin-2.0.17-plugins/plugins/
  
  case $1 in
      autoconf|detect)
-diff -urN munin-2.0.17/plugins/node.d/pop_stats.in munin-2.0.17-plugins/plugins/node.d/pop_stats.in
---- munin-2.0.17/plugins/node.d/pop_stats.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/pop_stats.in	2013-08-17 13:18:51.820919315 +0200
-@@ -68,7 +68,9 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/pop_stats.in munin-2.0.25/plugins/node.d/pop_stats.in
+--- munin-2.0.25.orig/plugins/node.d/pop_stats.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/pop_stats.in	2015-09-08 10:05:48.888593251 +0000
+@@ -68,7 +68,9 @@ if (!defined $pos)
  if ($startsize < $pos)
  {
  	# Log rotated
@@ -759,10 +759,10 @@ diff -urN munin-2.0.17/plugins/node.d/pop_stats.in munin-2.0.17-plugins/plugins/
  	$pos = 0;
  }
  
-diff -urN munin-2.0.17/plugins/node.d/postgres_scans_.in munin-2.0.17-plugins/plugins/node.d/postgres_scans_.in
---- munin-2.0.17/plugins/node.d/postgres_scans_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/postgres_scans_.in	2013-08-17 13:18:51.820919315 +0200
-@@ -65,7 +65,6 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/postgres_scans_.in munin-2.0.25/plugins/node.d/postgres_scans_.in
+--- munin-2.0.25.orig/plugins/node.d/postgres_scans_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/postgres_scans_.in	2015-09-08 10:05:48.888593251 +0000
+@@ -65,7 +65,6 @@ my $pg = Munin::Plugin::Pgsql->new(
      vlabel   => 'Scans / sec',
      basequery =>
          "SELECT COALESCE(sum(seq_scan),0) AS sequential, COALESCE(sum(idx_scan),0) AS index FROM pg_stat_user_tables",
@@ -770,10 +770,10 @@ diff -urN munin-2.0.17/plugins/node.d/postgres_scans_.in munin-2.0.17-plugins/pl
      pivotquery    => 1,
      configquery =>
          "VALUES ('sequential','Sequential scans'), ('index','Index scans')",
-diff -urN munin-2.0.17/plugins/node.d/postgres_tuples_.in munin-2.0.17-plugins/plugins/node.d/postgres_tuples_.in
---- munin-2.0.17/plugins/node.d/postgres_tuples_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/postgres_tuples_.in	2013-08-17 13:18:51.820919315 +0200
-@@ -74,7 +74,6 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/postgres_tuples_.in munin-2.0.25/plugins/node.d/postgres_tuples_.in
+--- munin-2.0.25.orig/plugins/node.d/postgres_tuples_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/postgres_tuples_.in	2015-09-08 10:05:48.889593251 +0000
+@@ -74,7 +74,6 @@ my $pg = Munin::Plugin::Pgsql->new(
                  . " COALESCE(sum(n_tup_del),0) AS deleted FROM pg_stat_user_tables",
          ],
      ],
@@ -781,10 +781,10 @@ diff -urN munin-2.0.17/plugins/node.d/postgres_tuples_.in munin-2.0.17-plugins/p
      pivotquery    => 1,
      configquery   => [
          "VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted'),"
-diff -urN munin-2.0.17/plugins/node.d/slapd_.in munin-2.0.17-plugins/plugins/node.d/slapd_.in
---- munin-2.0.17/plugins/node.d/slapd_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d/slapd_.in	2013-08-17 13:18:51.820919315 +0200
-@@ -37,7 +37,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/slapd_.in munin-2.0.25/plugins/node.d/slapd_.in
+--- munin-2.0.25.orig/plugins/node.d/slapd_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/slapd_.in	2015-09-08 10:05:48.890593251 +0000
+@@ -37,7 +37,7 @@ use vars qw ( $config $param $act $scope
  
  # Change these to reflect your LDAP ACL. The given DN must have
  # read access to the Monitor branch.
@@ -793,22 +793,10 @@ diff -urN munin-2.0.17/plugins/node.d/slapd_.in munin-2.0.17-plugins/plugins/nod
  my $server = ($ENV{'server'} || 'localhost');
  my $userdn = ($ENV{'binddn'} || '');
  my $userpw = ($ENV{'bindpw'} || '');
-diff -urN munin-2.0.17/plugins/node.d.linux/files_.in munin-2.0.17-plugins/plugins/node.d.linux/files_.in
---- munin-2.0.17/plugins/node.d.linux/files_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/files_.in	2013-08-17 13:18:51.820919315 +0200
-@@ -14,7 +14,7 @@
- #%# capabilities=autoconf
- 
- PROC=${0##*/files_}
--TMPFILE="$MUNIN_PLUGSTATE/munin-files_${PROC}.state"
-+TMPFILE="@@PLUGSTATE@@/munin-files_${PROC}.state"
- 
- if [ "$1" = "autoconf" ]; then
- 	if [ -x /usr/sbin/lsof ]; then
-diff -urN munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-plugins/plugins/node.d.linux/iostat.in
---- munin-2.0.17/plugins/node.d.linux/iostat.in	2013-08-17 13:19:03.504395523 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/iostat.in	2013-08-17 13:18:51.994254767 +0200
-@@ -173,7 +173,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat.in munin-2.0.25/plugins/node.d.linux/iostat.in
+--- munin-2.0.25.orig/plugins/node.d.linux/iostat.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/iostat.in	2015-09-08 10:05:55.475593251 +0000
+@@ -173,7 +173,7 @@ sub fetch_detailed() {
  		if ($tmpnam =~ /\d+$/ and !$include_numbered) {
  		    # Special case for devices like cXdXpX,
  		    # like the cciss driver
@@ -817,10 +805,10 @@ diff -urN munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-plugins/plugi
  		}
  		next unless grep { $_ } @fields;
  
-diff -urN munin-2.0.17/plugins/node.d.linux/ip_.in munin-2.0.17-plugins/plugins/node.d.linux/ip_.in
---- munin-2.0.17/plugins/node.d.linux/ip_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/ip_.in	2013-08-17 13:18:51.820919315 +0200
-@@ -127,14 +127,18 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/ip_.in munin-2.0.25/plugins/node.d.linux/ip_.in
+--- munin-2.0.25.orig/plugins/node.d.linux/ip_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/ip_.in	2015-09-08 10:05:55.476593251 +0000
+@@ -127,14 +127,18 @@ case $IP in
          # This is a fun hack to make the plugin ip6 compatible.
          # Suggested in ticket #439 by "jodal".
          eval 'iptables() {
@@ -841,7 +829,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/ip_.in munin-2.0.17-plugins/plugins/
              echo "no (could not run iptables as user $(whoami))"
              exit 0
          else
-@@ -147,10 +151,10 @@
+@@ -147,10 +151,10 @@ if [[ "$1" == "autoconf" ]]; then
      fi
  fi
  
@@ -856,7 +844,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/ip_.in munin-2.0.17-plugins/plugins/
      fi
      exit 0
  fi
-@@ -183,5 +187,5 @@
+@@ -183,5 +187,5 @@ fi;
  
  # Escape .'s so they don't match _everything_?
  IP=$(echo $IP | sed 's~\.~\\.~g')
@@ -864,10 +852,10 @@ diff -urN munin-2.0.17/plugins/node.d.linux/ip_.in munin-2.0.17-plugins/plugins/
 -iptables -L ${OUTPUT} -v -n -x  | awk "/$IP"'[ /]/ { print "out.value " $2; exit 0; }'
 +/usr/sbin/iptables -L ${INPUT} -v -n -x   | awk "/$IP"'[ \/]/ { print "in.value " $2; exit 0; }'
 +/usr/sbin/iptables -L ${OUTPUT} -v -n -x  | awk "/$IP"'[ \/]/ { print "out.value " $2; exit 0; }'
-diff -urN munin-2.0.17/plugins/node.d.linux/load.in munin-2.0.17-plugins/plugins/node.d.linux/load.in
---- munin-2.0.17/plugins/node.d.linux/load.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/load.in	2013-08-17 13:18:51.820919315 +0200
-@@ -59,20 +59,20 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/load.in munin-2.0.25/plugins/node.d.linux/load.in
+--- munin-2.0.25.orig/plugins/node.d.linux/load.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/load.in	2015-09-08 10:05:55.476593251 +0000
+@@ -59,20 +59,20 @@ if [ "$1" = "config" ]; then
          # one machine answer for several)
  
          # The title of the graph
@@ -894,7 +882,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/load.in munin-2.0.17-plugins/plugins
          # These two read the environment for warning values for the field
          # "load".  If "load_warning" or "warning" aren't set in the
          # environment, no warning levels are set.  Likewise for "load_critical"
-@@ -82,8 +82,8 @@
+@@ -82,8 +82,8 @@ if [ "$1" = "config" ]; then
          # This one is purely to add an explanation to the web page. The first
          # one is for the graph itself, while the second one is for the field
          # "load".
@@ -905,10 +893,10 @@ diff -urN munin-2.0.17/plugins/node.d.linux/load.in munin-2.0.17-plugins/plugins
  
          # Last, if run with the "config"-parameter, quit here (don't
          # display any data)
-diff -urN munin-2.0.17/plugins/node.d.linux/nfs_client.in munin-2.0.17-plugins/plugins/node.d.linux/nfs_client.in
---- munin-2.0.17/plugins/node.d.linux/nfs_client.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/nfs_client.in	2013-08-17 13:18:51.820919315 +0200
-@@ -31,7 +31,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/nfs_client.in munin-2.0.25/plugins/node.d.linux/nfs_client.in
+--- munin-2.0.25.orig/plugins/node.d.linux/nfs_client.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/nfs_client.in	2015-09-08 10:05:55.477593251 +0000
+@@ -31,7 +31,7 @@ NFS=/proc/net/rpc/nfs
  proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit"
  
  if [ "$1" = "autoconf" ]; then
@@ -917,7 +905,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/nfs_client.in munin-2.0.17-plugins/p
  		echo yes
  		exit 0
  	else
-@@ -51,11 +51,66 @@
+@@ -51,11 +51,66 @@ if [ "$1" = "config" ]; then
  	exit 0
  fi
  
@@ -991,10 +979,10 @@ diff -urN munin-2.0.17/plugins/node.d.linux/nfs_client.in munin-2.0.17-plugins/p
 +	print "commit.value " nfs_commit
  }' $NFS
 -
-diff -urN munin-2.0.17/plugins/node.d.linux/nfsd.in munin-2.0.17-plugins/plugins/node.d.linux/nfsd.in
---- munin-2.0.17/plugins/node.d.linux/nfsd.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/nfsd.in	2013-08-17 13:18:51.820919315 +0200
-@@ -31,7 +31,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/nfsd.in munin-2.0.25/plugins/node.d.linux/nfsd.in
+--- munin-2.0.25.orig/plugins/node.d.linux/nfsd.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/nfsd.in	2015-09-08 10:05:55.477593251 +0000
+@@ -31,7 +31,7 @@ NFSD=/proc/net/rpc/nfsd
  proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit"
  
  if [ "$1" = "autoconf" ]; then
@@ -1003,7 +991,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/nfsd.in munin-2.0.17-plugins/plugins
  		echo yes
  		exit 0
  	else
-@@ -51,9 +51,66 @@
+@@ -51,9 +51,66 @@ if [ "$1" = "config" ]; then
  	exit 0
  fi
  
@@ -1076,10 +1064,10 @@ diff -urN munin-2.0.17/plugins/node.d.linux/nfsd.in munin-2.0.17-plugins/plugins
 +	print "pathconf.value " nfs_pathconf
 +	print "commit.value " nfs_commit
 +}' $NFSD
-diff -urN munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.17-plugins/plugins/node.d.linux/vlan_inetuse_.in
---- munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/vlan_inetuse_.in	2013-08-17 13:18:51.820919315 +0200
-@@ -37,8 +37,8 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.25/plugins/node.d.linux/vlan_inetuse_.in
+--- munin-2.0.25.orig/plugins/node.d.linux/vlan_inetuse_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/vlan_inetuse_.in	2015-09-08 10:05:55.477593251 +0000
+@@ -37,8 +37,8 @@ my %contraries = ("dpt" => "spt", "spt"
  my %in_octets = ();
  my %out_octets = ();
  
@@ -1090,7 +1078,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.17-plugin
  while (<IN>)
  {
  	if (/^\s*\d+\s+(\d+)  +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -49,10 +49,10 @@
+@@ -49,10 +49,10 @@ while (<IN>)
  	}
  }
  close IN;
@@ -1104,7 +1092,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.17-plugin
  while (<IN>)
  {
  	if (/^\s*\d+\s+(\d+)  +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ while (<IN>)
  	}
  }
  close IN;
@@ -1113,10 +1101,10 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.17-plugin
  
  if ($ARGV[0] and $ARGV[0] eq "config")
  {
-diff -urN munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.17-plugins/plugins/node.d.linux/vlan_linkuse_.in
---- munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/vlan_linkuse_.in	2013-08-17 13:18:51.820919315 +0200
-@@ -29,8 +29,8 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.25/plugins/node.d.linux/vlan_linkuse_.in
+--- munin-2.0.25.orig/plugins/node.d.linux/vlan_linkuse_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/vlan_linkuse_.in	2015-09-08 10:05:55.477593251 +0000
+@@ -29,8 +29,8 @@ my %contraries = ("dpt" => "spt", "spt"
  my %in_octets = ();
  my %out_octets = ();
  
@@ -1127,7 +1115,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.17-plugin
  while (<IN>)
  {
  	if (/^\s*\d+\s+(\d+)  +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -58,10 +58,10 @@
+@@ -58,10 +58,10 @@ while (<IN>)
  	}
  }
  close IN;
@@ -1141,17 +1129,17 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.17-plugin
  while (<IN>)
  {
  	if (/^\s*\d+\s+(\d+)  +([a-z]+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+(?:\s+|)(.+|)$/)
-@@ -84,5 +84,5 @@
+@@ -84,5 +84,5 @@ while (<IN>)
  	}
  }
  close IN;
 -die "Error running iptables. Dying\n" if $?;
 +die "Error running /usr/sbin/iptables. Dying\n" if $?;
  # vim:syntax=perl
-diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-plugins/plugins/node.d.linux/vserver_resources.in
---- munin-2.0.17/plugins/node.d.linux/vserver_resources.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-plugins/plugins/node.d.linux/vserver_resources.in	2013-08-17 13:18:51.820919315 +0200
-@@ -245,6 +245,12 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.25/plugins/node.d.linux/vserver_resources.in
+--- munin-2.0.25.orig/plugins/node.d.linux/vserver_resources.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/vserver_resources.in	2015-09-08 10:05:55.478593251 +0000
+@@ -245,6 +245,12 @@ if [ "$1" = "config" ]; then
  	    echo 'graph_vlabel ANON pages'
  	    echo 'graph_info Shows anonymous memory (human readable) used by each vserver.'
  	    ;;
@@ -1164,7 +1152,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-pl
  	FILES)
  	    echo 'graph_title Files used by vserver'
  	    echo 'graph_args --base 1024k -l 0'
-@@ -281,6 +287,30 @@
+@@ -281,6 +287,30 @@ if [ "$1" = "config" ]; then
  	    echo 'graph_vlabel SHM pages'
  	    echo 'graph_info Shows shared memory (human readable) used by each vserver.'
  	    ;;
@@ -1195,7 +1183,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-pl
  	*)
  	    echo "$RESOURCE not defined."
  	    exit 1
-@@ -299,53 +329,108 @@
+@@ -299,53 +329,108 @@ if [ "$1" = "config" ]; then
  
  	case "$RESOURCE" in
  	    PROC)
@@ -1331,7 +1319,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-pl
  		;;
  	    *)
  		echo "$RESOURCE not defined."
-@@ -356,7 +441,7 @@
+@@ -356,7 +441,7 @@ if [ "$1" = "config" ]; then
  	if [ ! -z "$LIMITS" -a "$LIMITS" = 1 ]; then
  	    LIMIT=`cat /proc/virtual/$xid/limit | grep $RESOURCE | cut -f4`
  	    if [ ${LIMIT:-0} -gt 0 ]; then
@@ -1340,7 +1328,7 @@ diff -urN munin-2.0.17/plugins/node.d.linux/vserver_resources.in munin-2.0.17-pl
  	    fi
  	fi
      done
-@@ -367,8 +452,15 @@
+@@ -367,8 +452,15 @@ fi
  for xid in $XIDS ; do
      LABEL=`cat /proc/virtual/$xid/$NAMELOC |grep NodeName |cut -f2`
      NAME=`echo $LABEL | cut -d. -f1 |  tr '-' '_'`
diff --git a/munin-separate-configs.patch b/munin-separate-configs.patch
index e5da670..b247733 100644
--- a/munin-separate-configs.patch
+++ b/munin-separate-configs.patch
@@ -1,7 +1,7 @@
-diff -ur munin-2.0.17/common/lib/Munin/Common/Defaults.pm munin-2.0.17-sep/common/lib/Munin/Common/Defaults.pm
---- munin-2.0.17/common/lib/Munin/Common/Defaults.pm	2013-08-17 12:26:06.386624187 +0200
-+++ munin-2.0.17-sep/common/lib/Munin/Common/Defaults.pm	2013-08-17 12:19:22.386149494 +0200
-@@ -18,7 +18,8 @@
+diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm	2015-09-08 10:12:45.000000000 +0000
++++ munin-2.0.25/common/lib/Munin/Common/Defaults.pm	2015-09-08 10:13:31.731593251 +0000
+@@ -18,7 +18,8 @@ my $COMPONENT_ROOT = dirname(__FILE__) .
  our $DROPDOWNLIMIT     = 1;
  
  our $MUNIN_PREFIX     = '';
@@ -11,11 +11,10 @@ diff -ur munin-2.0.17/common/lib/Munin/Common/Defaults.pm munin-2.0.17-sep/commo
  our $MUNIN_BINDIR     = '';
  our $MUNIN_SBINDIR    = '';
  our $MUNIN_DOCDIR     = '';
-Only in munin-2.0.17/common/lib/Munin/Common: Defaults.pm.orig
-diff -ur munin-2.0.17/doc/installation/configuration.rst munin-2.0.17-sep/doc/installation/configuration.rst
---- munin-2.0.17/doc/installation/configuration.rst	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/doc/installation/configuration.rst	2013-08-17 12:23:16.773630125 +0200
-@@ -9,7 +9,7 @@
+diff -urNp munin-2.0.25.orig/doc/installation/configuration.rst munin-2.0.25/doc/installation/configuration.rst
+--- munin-2.0.25.orig/doc/installation/configuration.rst	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/doc/installation/configuration.rst	2015-09-08 10:13:31.732593251 +0000
+@@ -9,7 +9,7 @@ Plugins
  -------
  
  Decide which plugins to use. The munin node runs all plugins present
@@ -24,7 +23,7 @@ diff -ur munin-2.0.17/doc/installation/configuration.rst munin-2.0.17-sep/doc/in
  
  The quick auto-plug-and-play solution:
  
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ Master
  Add some nodes
  --------------
  
@@ -33,10 +32,10 @@ diff -ur munin-2.0.17/doc/installation/configuration.rst munin-2.0.17-sep/doc/in
  
  [node.example.com]
    address 192.0.2.4
-diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
---- munin-2.0.17/Makefile	2013-08-17 12:26:06.386624187 +0200
-+++ munin-2.0.17-sep/Makefile	2013-08-17 12:19:22.386149494 +0200
-@@ -56,7 +56,7 @@
+diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
+--- munin-2.0.25.orig/Makefile	2015-09-08 10:12:45.000000000 +0000
++++ munin-2.0.25/Makefile	2015-09-08 10:13:31.733593251 +0000
+@@ -56,7 +56,7 @@ uninstall:
  # a new config.  Target _only_ suitable for maintainers.
  unconfig:
  	rm -f $(HTMLDIR)/.htaccess
@@ -45,7 +44,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  
  tags:
  	-rm -f TAGS
-@@ -71,14 +71,15 @@
+@@ -71,14 +71,15 @@ install-pre: Makefile Makefile.config
  	mkdir -p $(LOGDIR)
  	mkdir -p $(STATEDIR)
  	mkdir -p $(SPOOLDIR)
@@ -63,7 +62,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  	mkdir -p $(LIBDIR)
  	mkdir -p $(BINDIR)
  	mkdir -p $(SBINDIR)
-@@ -111,7 +112,7 @@
+@@ -111,7 +112,7 @@ install-master-prime: $(INFILES_MASTER)
  	$(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
  
  	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
@@ -72,7 +71,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  
  	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
  	$(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
-@@ -140,14 +141,14 @@
+@@ -140,14 +141,14 @@ endif
  install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
  	@$(CHECKGROUP)
  
@@ -90,7 +89,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  
  	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
  	    if test -f "$$p" ; then                            \
-@@ -184,7 +185,7 @@
+@@ -184,7 +185,7 @@ install-async:
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre
@@ -99,7 +98,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  
  
  install-common-prime: build-common install-common
-@@ -220,7 +221,8 @@
+@@ -220,7 +221,8 @@ build/%: %.in
  	@echo "$< -> $@"
  	@mkdir -p build/`dirname $<`
  	@sed -e 's|@@PREFIX@@|$(PREFIX)|g'                      \
@@ -109,7 +108,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
               -e 's|@@BINDIR@@|$(BINDIR)|g'                      \
               -e 's|@@SBINDIR@@|$(SBINDIR)|g'                    \
               -e 's|@@DOCDIR@@|$(DOCDIR)|g'                      \
-@@ -261,7 +263,8 @@
+@@ -301,7 +303,8 @@ build-common-pre: common/Build
  common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre
  	rm -f common/blib/lib/Munin/Common/Defaults.pm
  	$(PERL) -pe 's{(PREFIX     \s+=\s).*}{\1q{$(PREFIX)};}x;   \
@@ -119,7 +118,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
                    s{(BINDIR     \s+=\s).*}{\1q{$(BINDIR)};}x;      \
                    s{(SBINDIR    \s+=\s).*}{\1q{$(SBINDIR)};}x;     \
                    s{(DOCDIR     \s+=\s).*}{\1q{$(DOCDIR)};}x;      \
-@@ -388,7 +391,7 @@
+@@ -428,7 +431,7 @@ old-test: t/*.t
  	$(MAKE) $@ CONFIG=t/Makefile.config
  else
  test_plugins = id_default id_root env
@@ -128,7 +127,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  	@for test in t/*.t; do \
  		echo -n "$$test: "; \
  		PERL5LIB=$(PERLLIB) $(PERL) $$test;\
-@@ -396,10 +399,10 @@
+@@ -436,10 +439,10 @@ old-test: t/*.t t/install $(addprefix $(
  endif
  
  node-monkeywrench: install-node
@@ -141,9 +140,9 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  	cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
  	$(SBINDIR)/munin-node-configure --suggest
  	echo 'Done?'
-diff -ur munin-2.0.17/Makefile.config munin-2.0.17-sep/Makefile.config
---- munin-2.0.17/Makefile.config	2013-08-17 12:26:06.386624187 +0200
-+++ munin-2.0.17-sep/Makefile.config	2013-08-17 12:19:22.386149494 +0200
+diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config
+--- munin-2.0.25.orig/Makefile.config	2015-09-08 10:12:45.000000000 +0000
++++ munin-2.0.25/Makefile.config	2015-09-08 10:13:31.733593251 +0000
 @@ -20,7 +20,8 @@
  PREFIX     = $(DESTDIR)/usr
  
@@ -154,12 +153,10 @@ diff -ur munin-2.0.17/Makefile.config munin-2.0.17-sep/Makefile.config
  
  # Server only - where to put munin-cron
  BINDIR     = $(PREFIX)/bin
-Only in munin-2.0.17: Makefile.config.orig
-Only in munin-2.0.17: Makefile.orig
-diff -ur munin-2.0.17/master/_bin/munin-cgi-graph.in munin-2.0.17-sep/master/_bin/munin-cgi-graph.in
---- munin-2.0.17/master/_bin/munin-cgi-graph.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-cgi-graph.in	2013-08-17 12:19:22.386149494 +0200
-@@ -44,7 +44,7 @@
+diff -urNp munin-2.0.25.orig/master/_bin/munin-cgi-graph.in munin-2.0.25/master/_bin/munin-cgi-graph.in
+--- munin-2.0.25.orig/master/_bin/munin-cgi-graph.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/_bin/munin-cgi-graph.in	2015-09-08 10:13:31.734593251 +0000
+@@ -44,7 +44,7 @@ use Munin::Master::Logger;
  use Log::Log4perl qw( :easy );
  
  my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
@@ -168,10 +165,10 @@ diff -ur munin-2.0.17/master/_bin/munin-cgi-graph.in munin-2.0.17-sep/master/_bi
  
  my %period  = ( "day"   => 300,
  		"week"  => 1800,
-diff -ur munin-2.0.17/master/_bin/munin-check.in munin-2.0.17-sep/master/_bin/munin-check.in
---- munin-2.0.17/master/_bin/munin-check.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-check.in	2013-08-17 12:19:22.386149494 +0200
-@@ -163,7 +163,7 @@
+diff -urNp munin-2.0.25.orig/master/_bin/munin-check.in munin-2.0.25/master/_bin/munin-check.in
+--- munin-2.0.25.orig/master/_bin/munin-check.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/_bin/munin-check.in	2015-09-08 10:13:31.734593251 +0000
+@@ -163,7 +163,7 @@ done
  norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
  norec=yes perm_ok @@PLUGSTATE@@ 775
  
@@ -180,10 +177,10 @@ diff -ur munin-2.0.17/master/_bin/munin-check.in munin-2.0.17-sep/master/_bin/mu
  
  echo "Check done.  Please note that this script only checks most things,"
  echo "not all things."
-diff -ur munin-2.0.17/master/_bin/munin-graph.in munin-2.0.17-sep/master/_bin/munin-graph.in
---- munin-2.0.17/master/_bin/munin-graph.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-graph.in	2013-08-17 12:19:22.386149494 +0200
-@@ -51,7 +51,7 @@
+diff -urNp munin-2.0.25.orig/master/_bin/munin-graph.in munin-2.0.25/master/_bin/munin-graph.in
+--- munin-2.0.25.orig/master/_bin/munin-graph.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/_bin/munin-graph.in	2015-09-08 10:13:31.735593251 +0000
+@@ -51,7 +51,7 @@ use Munin::Master::Logger;
  use Log::Log4perl qw( :easy );
  
  my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
@@ -192,10 +189,10 @@ diff -ur munin-2.0.17/master/_bin/munin-graph.in munin-2.0.17-sep/master/_bin/mu
  
  my %period  = ( "day"   => 300,
  		"week"  => 1800,
-diff -ur munin-2.0.17/master/_bin/munin-limits.in munin-2.0.17-sep/master/_bin/munin-limits.in
---- munin-2.0.17/master/_bin/munin-limits.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-limits.in	2013-08-17 12:19:22.386149494 +0200
-@@ -66,7 +66,7 @@
+diff -urNp munin-2.0.25.orig/master/_bin/munin-limits.in munin-2.0.25/master/_bin/munin-limits.in
+--- munin-2.0.25.orig/master/_bin/munin-limits.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/_bin/munin-limits.in	2015-09-08 10:13:31.735593251 +0000
+@@ -66,7 +66,7 @@ Limit contacts to those of E<lt>contact<
  
  =item B<< --config <file> >>
  
@@ -204,7 +201,7 @@ diff -ur munin-2.0.17/master/_bin/munin-limits.in munin-2.0.17-sep/master/_bin/m
  
  =item B<< --always-send <severity list> >>
  
-@@ -114,7 +114,7 @@
+@@ -114,7 +114,7 @@ configuration file contains the necessar
  
  =head1 FILES
  
@@ -213,10 +210,10 @@ diff -ur munin-2.0.17/master/_bin/munin-limits.in munin-2.0.17-sep/master/_bin/m
  	@@DBDIR@@/*
  	@@STATEDIR@@/*
  
-diff -ur munin-2.0.17/master/_bin/munin-update.in munin-2.0.17-sep/master/_bin/munin-update.in
---- munin-2.0.17/master/_bin/munin-update.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-update.in	2013-08-17 12:19:22.386149494 +0200
-@@ -139,7 +139,7 @@
+diff -urNp munin-2.0.25.orig/master/_bin/munin-update.in munin-2.0.25/master/_bin/munin-update.in
+--- munin-2.0.25.orig/master/_bin/munin-update.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/_bin/munin-update.in	2015-09-08 10:13:31.735593251 +0000
+@@ -139,7 +139,7 @@ munin-update [options]
  
  =item B<< --config_file=<file> >>
  
@@ -225,7 +222,7 @@ diff -ur munin-2.0.17/master/_bin/munin-update.in munin-2.0.17-sep/master/_bin/m
  
  =item B<< --[no]debug >>
  
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ and the directories to store them in.
  
  =head1 FILES
  
@@ -234,10 +231,10 @@ diff -ur munin-2.0.17/master/_bin/munin-update.in munin-2.0.17-sep/master/_bin/m
  	@@DBDIR@@/*
  	@@LOGDIR@@/munin-update
  	@@STATEDIR@@/*
-diff -ur munin-2.0.17/master/doc/munin.conf.pod.in munin-2.0.17-sep/master/doc/munin.conf.pod.in
---- munin-2.0.17/master/doc/munin.conf.pod.in	2013-08-17 12:26:06.386624187 +0200
-+++ munin-2.0.17-sep/master/doc/munin.conf.pod.in	2013-08-17 12:19:22.386149494 +0200
-@@ -27,7 +27,7 @@
+diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/doc/munin.conf.pod.in
+--- munin-2.0.25.orig/master/doc/munin.conf.pod.in	2015-09-08 10:12:45.000000000 +0000
++++ munin-2.0.25/master/doc/munin.conf.pod.in	2015-09-08 10:13:31.736593251 +0000
+@@ -27,7 +27,7 @@ something like:
  	[machine1.your.dom]
  		address localhost
  
@@ -246,7 +243,7 @@ diff -ur munin-2.0.17/master/doc/munin.conf.pod.in munin-2.0.17-sep/master/doc/m
  If your placement deviates from this norm, use the "--config
  E<lt>fileE<gt>"-option when running the munin-* programs.
  
-@@ -149,20 +149,20 @@
+@@ -149,20 +149,20 @@ is C<no>.  Affects: munin-update.
  =item B<tls_private_key> <value>
  
  This directive sets the location of the private key to be used for
@@ -270,11 +267,10 @@ diff -ur munin-2.0.17/master/doc/munin.conf.pod.in munin-2.0.17-sep/master/doc/m
  
  =item B<tls_verify_depth> <value>
  
-Only in munin-2.0.17/master/doc: munin.conf.pod.in.orig
-diff -ur munin-2.0.17/master/doc/munin-cron.pod.in munin-2.0.17-sep/master/doc/munin-cron.pod.in
---- munin-2.0.17/master/doc/munin-cron.pod.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/doc/munin-cron.pod.in	2013-08-17 12:19:22.386149494 +0200
-@@ -22,7 +22,7 @@
+diff -urNp munin-2.0.25.orig/master/doc/munin-cron.pod.in munin-2.0.25/master/doc/munin-cron.pod.in
+--- munin-2.0.25.orig/master/doc/munin-cron.pod.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/doc/munin-cron.pod.in	2015-09-08 10:13:31.736593251 +0000
+@@ -22,7 +22,7 @@ Limit hosts to E<lt>hostE<gt>. Multiple
  
  =item B<< --config <file> >>
  
@@ -283,10 +279,10 @@ diff -ur munin-2.0.17/master/doc/munin-cron.pod.in munin-2.0.17-sep/master/doc/m
  
  =back
  
-diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/extras/munin-update_old.in
---- munin-2.0.17/master/extras/munin-update_old.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/extras/munin-update_old.in	2013-08-17 12:19:22.386149494 +0200
-@@ -43,7 +43,7 @@
+diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/master/extras/munin-update_old.in
+--- munin-2.0.25.orig/master/extras/munin-update_old.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/extras/munin-update_old.in	2015-09-08 10:13:31.736593251 +0000
+@@ -43,7 +43,7 @@ my $DEBUG=0;
  my $STATS;
  my $cli_do_fork;
  my $cli_timeout;
@@ -295,7 +291,7 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
  my $config;
  my $do_fork = 1;
  my $serversocket  = "munin-server-socket.$$";
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ Options:
      --host <host>	Limit graphed hosts to <host>. Multiple --host options
      			may be supplied.
      --config <file>	Use <file> as configuration file. 
@@ -304,7 +300,7 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
      --[no]debug		View debug messages. [--nodebug]
      --[no]fork		Don't fork one instance for each host. [--fork]
      --timeout=<seconds>	TCP timeout when talking to clients. [$timeout]
-@@ -752,11 +752,11 @@
+@@ -752,11 +752,11 @@ sub run_starttls_if_required {
  	my $ca_cert;
  	my $tls_verify;
          $key = $cert = munin_get ($config, "tls_pem");
@@ -319,7 +315,7 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
             unless defined $ca_cert;
          $tls_verify=&munin_get ($config, "tls_verify_certificate", "no");
          $depth=&munin_get ($config, "tls_verify_depth", 5);
-@@ -1088,7 +1088,7 @@
+@@ -1088,7 +1088,7 @@ Limit fetched data to those from E<lt>ho
  
  =item B<< --config <file> >>
  
@@ -328,7 +324,7 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
  
  =item B<< --help >>
  
-@@ -1124,7 +1124,7 @@
+@@ -1124,7 +1124,7 @@ and the directories to store them in.
  
  =head1 FILES
  
@@ -337,10 +333,10 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
  	@@DBDIR@@/*
  	@@LOGDIR@@/munin-update
  	@@STATEDIR@@/*
-diff -ur munin-2.0.17/master/lib/Munin/Master/Config.pm munin-2.0.17-sep/master/lib/Munin/Master/Config.pm
---- munin-2.0.17/master/lib/Munin/Master/Config.pm	2013-08-17 12:26:06.476625774 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/Config.pm	2013-08-17 12:19:22.386149494 +0200
-@@ -139,7 +139,7 @@
+diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/master/lib/Munin/Master/Config.pm
+--- munin-2.0.25.orig/master/lib/Munin/Master/Config.pm	2015-09-08 10:12:45.000000000 +0000
++++ munin-2.0.25/master/lib/Munin/Master/Config.pm	2015-09-08 10:13:31.737593251 +0000
+@@ -140,7 +140,7 @@ my %booleans = map {$_ => 1} qw(
  	    root_instance => 1, 
  
  	    config      => bless ( {
@@ -349,7 +345,7 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/Config.pm munin-2.0.17-sep/master/
  		dbdir            => $Munin::Common::Defaults::MUNIN_DBDIR,
  		debug            => 0,
  		fork             => 1,
-@@ -153,9 +153,9 @@
+@@ -154,9 +154,9 @@ my %booleans = map {$_ => 1} qw(
  		rundir           => $Munin::Common::Defaults::MUNIN_STATEDIR,
  		timeout          => 180,
  		tls              => 'disabled',
@@ -362,11 +358,10 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/Config.pm munin-2.0.17-sep/master/
  		tls_verify_certificate => 0,
  		tls_verify_depth => 5,
  		tmpldir          => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
-Only in munin-2.0.17/master/lib/Munin/Master: Config.pm.orig
-diff -ur munin-2.0.17/master/lib/Munin/Master/GraphOld.pm munin-2.0.17-sep/master/lib/Munin/Master/GraphOld.pm
---- munin-2.0.17/master/lib/Munin/Master/GraphOld.pm	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/GraphOld.pm	2013-08-17 12:19:22.386149494 +0200
-@@ -90,7 +90,7 @@
+diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.25/master/lib/Munin/Master/GraphOld.pm
+--- munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/lib/Munin/Master/GraphOld.pm	2015-09-08 10:13:31.738593251 +0000
+@@ -92,7 +92,7 @@ my $skip_locking   = 0;
  my $skip_stats     = 0;
  my $stdout         = 0;
  my $force_run_as_root = 0;
@@ -375,10 +370,10 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/GraphOld.pm munin-2.0.17-sep/maste
  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.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master/lib/Munin/Master/HTMLOld.pm
---- munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/HTMLOld.pm	2013-08-17 12:19:22.389482886 +0200
-@@ -81,7 +81,7 @@
+diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm
+--- munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm	2015-09-08 10:13:31.738593251 +0000
+@@ -83,7 +83,7 @@ use Log::Log4perl qw( :easy );
  my @times = ("day", "week", "month", "year");
  
  my $DEBUG      = 0;
@@ -387,7 +382,7 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master
  my $do_usage   = 0;
  my $do_version = 0;
  my $stdout     = 0;
-@@ -857,7 +857,7 @@
+@@ -859,7 +859,7 @@ Options:
      --service <service>	Compatibility. No effect.
      --host <host>	Compatibility. No effect.
      --config <file>	Use <file> as configuration file. 
@@ -396,7 +391,7 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master
  
  ";
      exit 0;
-@@ -892,7 +892,7 @@
+@@ -894,7 +894,7 @@ Compatibility. No effect.
  
  =item B<< --config <file> >>
  
@@ -405,7 +400,7 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master
  
  =item B<< --help >>
  
-@@ -915,7 +915,7 @@
+@@ -917,7 +917,7 @@ Munin-html creates the html pages.
  
  =head1 FILES
  
@@ -414,10 +409,10 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master
  	@@DBDIR@@/datafile
  	@@LOGDIR@@/munin-html
  	@@HTMLDIR@@/*
-diff -ur munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm munin-2.0.17-sep/master/lib/Munin/Master/LimitsOld.pm
---- munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/LimitsOld.pm	2013-08-17 12:19:22.389482886 +0200
-@@ -52,7 +52,7 @@
+diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm
+--- munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm	2015-09-08 10:13:31.739593251 +0000
+@@ -52,7 +52,7 @@ use Munin::Master::Utils;
  use Munin::Common::Defaults;
  
  my $DEBUG          = 0;
@@ -426,7 +421,7 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm munin-2.0.17-sep/mast
  my $do_usage       = 0;
  my $do_version     = 0;
  my @limit_hosts    = ();
-@@ -230,7 +230,7 @@
+@@ -230,7 +230,7 @@ Options:
      --contact <contact>	Limit notified contacts to <contact>. Multiple 
      			--contact options may be supplied.
      --config <file>	Use <file> as configuration file. 
@@ -435,11 +430,10 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm munin-2.0.17-sep/mast
  
  ";
      exit 0;
-Only in munin-2.0.17/master/lib/Munin/Master: Node.pm.orig
-diff -ur munin-2.0.17/master/lib/Munin/Master/Utils.pm munin-2.0.17-sep/master/lib/Munin/Master/Utils.pm
---- munin-2.0.17/master/lib/Munin/Master/Utils.pm	2013-08-17 12:26:06.476625774 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/Utils.pm	2013-08-17 12:19:22.389482886 +0200
-@@ -115,7 +115,7 @@
+diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm	2015-09-08 10:12:45.000000000 +0000
++++ munin-2.0.25/master/lib/Munin/Master/Utils.pm	2015-09-08 10:13:31.740593251 +0000
+@@ -115,7 +115,7 @@ my $config_parts = {
  	},
  };
  
@@ -448,10 +442,9 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/Utils.pm munin-2.0.17-sep/master/l
  
  # Fields to copy when "aliasing" a field
  my @COPY_FIELDS    = ("label", "draw", "type", "rrdfile", "fieldname", "info");
-Only in munin-2.0.17/master/lib/Munin/Master: Utils.pm.orig
-diff -ur munin-2.0.17/master/munin.conf.in munin-2.0.17-sep/master/munin.conf.in
---- munin-2.0.17/master/munin.conf.in	2013-08-17 12:26:06.476625774 +0200
-+++ munin-2.0.17-sep/master/munin.conf.in	2013-08-17 12:19:22.389482886 +0200
+diff -urNp munin-2.0.25.orig/master/munin.conf.in munin-2.0.25/master/munin.conf.in
+--- munin-2.0.25.orig/master/munin.conf.in	2015-09-08 10:12:45.000000000 +0000
++++ munin-2.0.25/master/munin.conf.in	2015-09-08 10:13:31.740593251 +0000
 @@ -24,7 +24,7 @@
  # cgitmpdir @@DBDIR@@/cgi-tmp
  
@@ -461,11 +454,10 @@ diff -ur munin-2.0.17/master/munin.conf.in munin-2.0.17-sep/master/munin.conf.in
  
  # You can choose the time reference for "DERIVE" like graphs, and show
  # "per minute", "per hour" values instead of the default "per second"
-Only in munin-2.0.17/master: munin.conf.in.orig
-diff -ur munin-2.0.17/master/t/munin_master_config.t munin-2.0.17-sep/master/t/munin_master_config.t
---- munin-2.0.17/master/t/munin_master_config.t	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/t/munin_master_config.t	2013-08-17 12:23:31.933897977 +0200
-@@ -24,7 +24,7 @@
+diff -urNp munin-2.0.25.orig/master/t/munin_master_config.t munin-2.0.25/master/t/munin_master_config.t
+--- munin-2.0.25.orig/master/t/munin_master_config.t	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/t/munin_master_config.t	2015-09-08 10:13:31.741593251 +0000
+@@ -24,7 +24,7 @@ my $fasit = {
      },
  
      config => {
@@ -474,9 +466,9 @@ diff -ur munin-2.0.17/master/t/munin_master_config.t munin-2.0.17-sep/master/t/m
          dbdir           => '/opt/munin/sandbox/var/opt/munin',
          debug           => 0,
          fork            => 1,
-diff -ur munin-2.0.17/master/www/munin-htaccess.in munin-2.0.17-sep/master/www/munin-htaccess.in
---- munin-2.0.17/master/www/munin-htaccess.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/www/munin-htaccess.in	2013-08-17 12:19:22.389482886 +0200
+diff -urNp munin-2.0.25.orig/master/www/munin-htaccess.in munin-2.0.25/master/www/munin-htaccess.in
+--- munin-2.0.25.orig/master/www/munin-htaccess.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/www/munin-htaccess.in	2015-09-08 10:13:31.741593251 +0000
 @@ -9,7 +9,7 @@
  # 
  # <directory @@HTMLDIR@@>
@@ -486,10 +478,10 @@ diff -ur munin-2.0.17/master/www/munin-htaccess.in munin-2.0.17-sep/master/www/m
  AuthName "Munin"
  AuthType Basic
  require valid-user
-diff -ur munin-2.0.17/node/bin/munindoc munin-2.0.17-sep/node/bin/munindoc
---- munin-2.0.17/node/bin/munindoc	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/bin/munindoc	2013-08-17 12:19:22.389482886 +0200
-@@ -48,7 +48,7 @@
+diff -urNp munin-2.0.25.orig/node/bin/munindoc munin-2.0.25/node/bin/munindoc
+--- munin-2.0.25.orig/node/bin/munindoc	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/bin/munindoc	2015-09-08 10:13:31.742593251 +0000
+@@ -48,7 +48,7 @@ my $plugin_re = quotemeta($plugin);
  
  # Dirs in which to look for $plugin.pod and $plugin files.
  my @DIRS = ("$Munin::Common::Defaults::MUNIN_LIBDIR/plugins",
@@ -498,10 +490,10 @@ diff -ur munin-2.0.17/node/bin/munindoc munin-2.0.17-sep/node/bin/munindoc
              "$Munin::Common::Defaults::MUNIN_PERLLIB");
  
  File::Find::find({wanted => \&wanted_pod}, @DIRS);
-diff -ur munin-2.0.17/node/doc/munin-node.conf.pod munin-2.0.17-sep/node/doc/munin-node.conf.pod
---- munin-2.0.17/node/doc/munin-node.conf.pod	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/doc/munin-node.conf.pod	2013-08-17 12:24:04.784478220 +0200
-@@ -91,20 +91,20 @@
+diff -urNp munin-2.0.25.orig/node/doc/munin-node.conf.pod munin-2.0.25/node/doc/munin-node.conf.pod
+--- munin-2.0.25.orig/node/doc/munin-node.conf.pod	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/doc/munin-node.conf.pod	2015-09-08 10:13:31.742593251 +0000
+@@ -91,20 +91,20 @@ is C<no>.
  =item B<tls_private_key> <value>
  
  This directive sets the location of the private key to be used for
@@ -525,10 +517,10 @@ diff -ur munin-2.0.17/node/doc/munin-node.conf.pod munin-2.0.17-sep/node/doc/mun
  
  =item B<tls_verify_depth> <value>
  
-diff -ur munin-2.0.17/node/extras/munin-node-simple.in munin-2.0.17-sep/node/extras/munin-node-simple.in
---- munin-2.0.17/node/extras/munin-node-simple.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/extras/munin-node-simple.in	2013-08-17 12:19:22.389482886 +0200
-@@ -28,8 +28,8 @@
+diff -urNp munin-2.0.25.orig/node/extras/munin-node-simple.in munin-2.0.25/node/extras/munin-node-simple.in
+--- munin-2.0.25.orig/node/extras/munin-node-simple.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/extras/munin-node-simple.in	2015-09-08 10:13:31.742593251 +0000
+@@ -28,8 +28,8 @@ use strict;
  
  $| = 1;
  
@@ -539,10 +531,10 @@ diff -ur munin-2.0.17/node/extras/munin-node-simple.in munin-2.0.17-sep/node/ext
  my $version   = "@@VERSION@@";
  
  # Empty environment
-diff -ur munin-2.0.17/node/lib/Munin/Node/Config.pm munin-2.0.17-sep/node/lib/Munin/Node/Config.pm
---- munin-2.0.17/node/lib/Munin/Node/Config.pm	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/lib/Munin/Node/Config.pm	2013-08-17 12:19:22.389482886 +0200
-@@ -25,7 +25,7 @@
+diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Config.pm munin-2.0.25/node/lib/Munin/Node/Config.pm
+--- munin-2.0.25.orig/node/lib/Munin/Node/Config.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/lib/Munin/Node/Config.pm	2015-09-08 10:13:31.743593251 +0000
+@@ -25,7 +25,7 @@ my %booleans = map {$_ => 1} qw(
          my ($class) = @_;
  
          $instance ||= bless {
@@ -551,10 +543,10 @@ diff -ur munin-2.0.17/node/lib/Munin/Node/Config.pm munin-2.0.17-sep/node/lib/Mu
          }, $class;
  
          return $instance;
-diff -ur munin-2.0.17/node/lib/Munin/Node/Server.pm munin-2.0.17-sep/node/lib/Munin/Node/Server.pm
---- munin-2.0.17/node/lib/Munin/Node/Server.pm	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/lib/Munin/Node/Server.pm	2013-08-17 12:19:22.389482886 +0200
-@@ -263,11 +263,11 @@
+diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Server.pm munin-2.0.25/node/lib/Munin/Node/Server.pm
+--- munin-2.0.25.orig/node/lib/Munin/Node/Server.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/lib/Munin/Node/Server.pm	2015-09-08 10:13:31.744593251 +0000
+@@ -263,11 +263,11 @@ sub _process_starttls_command {
      my $mode = $session->{tls_mode};
  
      my $key        = $config->{tls_private_key}
@@ -569,10 +561,10 @@ diff -ur munin-2.0.17/node/lib/Munin/Node/Server.pm munin-2.0.17-sep/node/lib/Mu
      my $tls_verify = $config->{tls_verify_certificate}
                    || 0;
      my $tls_match  = $config->{tls_match};
-diff -ur munin-2.0.17/node/lib/Munin/Node/Service.pm munin-2.0.17-sep/node/lib/Munin/Node/Service.pm
---- munin-2.0.17/node/lib/Munin/Node/Service.pm	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/lib/Munin/Node/Service.pm	2013-08-17 12:24:22.264786886 +0200
-@@ -22,7 +22,7 @@
+diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Service.pm munin-2.0.25/node/lib/Munin/Node/Service.pm
+--- munin-2.0.25.orig/node/lib/Munin/Node/Service.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/lib/Munin/Node/Service.pm	2015-09-08 10:13:31.744593251 +0000
+@@ -22,7 +22,7 @@ sub new
      my ($class, %args) = @_;
  
      # Set defaults
@@ -581,10 +573,10 @@ diff -ur munin-2.0.17/node/lib/Munin/Node/Service.pm munin-2.0.17-sep/node/lib/M
  
      $args{defuser}  ||= getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER;
      $args{defgroup} ||= getgrnam $Munin::Common::Defaults::MUNIN_GROUP;
-diff -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
---- munin-2.0.17/node/sbin/munin-node	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/sbin/munin-node	2013-08-17 12:19:22.389482886 +0200
-@@ -36,8 +36,8 @@
+diff -urNp munin-2.0.25.orig/node/sbin/munin-node munin-2.0.25/node/sbin/munin-node
+--- munin-2.0.25.orig/node/sbin/munin-node	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/sbin/munin-node	2015-09-08 10:13:31.745593251 +0000
+@@ -36,8 +36,8 @@ use Munin::Node::Service;
  use Munin::Node::Server;
  
  my $servicedir;
@@ -595,7 +587,7 @@ diff -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
  my $DEBUG    = 0;
  my $PIDEBUG  = 0;
  my $paranoia = 0;
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ and returning the output they produce.
  
  =item B<< --config <configfile> >>
  
@@ -604,7 +596,7 @@ diff -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
  
  =item B< --[no]paranoia >
  
-@@ -187,9 +187,9 @@
+@@ -187,9 +187,9 @@ may enable debugging. [--nopidebug]
  
  =head1 FILES
  
@@ -617,10 +609,10 @@ diff -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
-diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/munin-node-configure
---- munin-2.0.17/node/sbin/munin-node-configure	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/sbin/munin-node-configure	2013-08-17 12:19:22.489484658 +0200
-@@ -76,9 +76,9 @@
+diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sbin/munin-node-configure
+--- munin-2.0.25.orig/node/sbin/munin-node-configure	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/sbin/munin-node-configure	2015-09-08 10:13:31.745593251 +0000
+@@ -76,9 +76,9 @@ sub main
  
  sub parse_args
  {
@@ -633,7 +625,7 @@ diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/
  	my $libdir     = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
  
  	my $debug = 0;
-@@ -492,15 +492,15 @@
+@@ -492,15 +492,15 @@ may enable debugging.
  
  =item B<< --config <file> >>
  
@@ -652,7 +644,7 @@ diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/
  
  =item B<< --libdir <dir> >>
  
-@@ -648,9 +648,9 @@
+@@ -648,9 +648,9 @@ not this works with any particular devic
  
  =head1 FILES
  
@@ -665,10 +657,10 @@ diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/
      @@LIBDIR@@/plugins/plugins.history
      @@LIBDIR@@/plugins/*
  
-diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
---- munin-2.0.17/node/sbin/munin-run	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/sbin/munin-run	2013-08-17 12:19:22.489484658 +0200
-@@ -35,7 +35,7 @@
+diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-run
+--- munin-2.0.25.orig/node/sbin/munin-run	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/sbin/munin-run	2015-09-08 10:13:31.746593251 +0000
+@@ -35,7 +35,7 @@ use Munin::Node::Service;
  
  my $services;
  my $servicedir;
@@ -677,7 +669,7 @@ diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
  my $DEBUG    = 0;
  my $PIDEBUG  = 0;
  my $paranoia = 0;
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ sub main
  sub parse_args
  {
      # Default configuration values
@@ -686,7 +678,7 @@ diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
      my $sconffile;
  
      my ($plugin, $arg);
-@@ -189,15 +189,15 @@
+@@ -189,15 +189,15 @@ as they are under munin-node.
  
  =item B<< --config <configfile> >>
  
@@ -705,7 +697,7 @@ diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
  
  =item B<< --sconffile <file> >>
  
-@@ -230,9 +230,9 @@
+@@ -230,9 +230,9 @@ Show version information.
  
  =head1 FILES
  
@@ -718,10 +710,10 @@ diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
-diff -ur munin-2.0.17/node/sbin/munin-sched munin-2.0.17-sep/node/sbin/munin-sched
---- munin-2.0.17/node/sbin/munin-sched	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/sbin/munin-sched	2013-08-17 12:24:54.562023692 +0200
-@@ -34,8 +34,8 @@
+diff -urNp munin-2.0.25.orig/node/sbin/munin-sched munin-2.0.25/node/sbin/munin-sched
+--- munin-2.0.25.orig/node/sbin/munin-sched	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/node/sbin/munin-sched	2015-09-08 10:13:31.747593251 +0000
+@@ -34,8 +34,8 @@ use Munin::Node::Config;
  use Munin::Node::ProxySpooler;
  
  my $servicedir;
@@ -732,7 +724,7 @@ diff -ur munin-2.0.17/node/sbin/munin-sched munin-2.0.17-sep/node/sbin/munin-sch
  my $spooldir = $Munin::Common::Defaults::MUNIN_SPOOLDIR;
  
  my ($host, $port);
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ and returning the output they produce.
  
  =item B<< --config <configfile> >>
  
@@ -741,7 +733,7 @@ diff -ur munin-2.0.17/node/sbin/munin-sched munin-2.0.17-sep/node/sbin/munin-sch
  
  =item B< --[no]paranoia >
  
-@@ -182,9 +182,9 @@
+@@ -182,9 +182,9 @@ View debug messages.  This can be very v
  
  =head1 FILES
  
@@ -754,10 +746,10 @@ diff -ur munin-2.0.17/node/sbin/munin-sched munin-2.0.17-sep/node/sbin/munin-sch
      @@STATEDIR@@/munin-sched.pid
      @@LOGDIR@@/munin-sched.log
  
-diff -ur munin-2.0.17/plugins/node.d/exim_mailqueue.in munin-2.0.17-sep/plugins/node.d/exim_mailqueue.in
---- munin-2.0.17/plugins/node.d/exim_mailqueue.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/exim_mailqueue.in	2013-08-17 12:19:22.489484658 +0200
-@@ -15,7 +15,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in munin-2.0.25/plugins/node.d/exim_mailqueue.in
+--- munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/exim_mailqueue.in	2015-09-08 10:13:31.747593251 +0000
+@@ -15,7 +15,7 @@ examine the queue directories.  This is
    [exim_*]
      user exim
  
@@ -766,10 +758,10 @@ diff -ur munin-2.0.17/plugins/node.d/exim_mailqueue.in munin-2.0.17-sep/plugins/
  if you need to override the defaults below:
  
    [exim_mailqueue]
-diff -ur munin-2.0.17/plugins/node.d/ipmi_sensor_.in munin-2.0.17-sep/plugins/node.d/ipmi_sensor_.in
---- munin-2.0.17/plugins/node.d/ipmi_sensor_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/ipmi_sensor_.in	2013-08-17 12:19:22.489484658 +0200
-@@ -17,7 +17,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.25/plugins/node.d/ipmi_sensor_.in
+--- munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ipmi_sensor_.in	2015-09-08 10:13:31.747593251 +0000
+@@ -17,7 +17,7 @@ Inspired by code written by Peter Palfra
  ipmitool probably needs to be run as root, and it may take more than
  10 seconds on some hosts.
  
@@ -778,7 +770,7 @@ diff -ur munin-2.0.17/plugins/node.d/ipmi_sensor_.in munin-2.0.17-sep/plugins/no
  
   [ipmi_sensor_*]
    user root
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ with this program; if not, write to the
  
  =head1 BUGS
  
@@ -787,8 +779,8 @@ diff -ur munin-2.0.17/plugins/node.d/ipmi_sensor_.in munin-2.0.17-sep/plugins/no
  variables.
  
  =head1 MAGIC MARKERS
-@@ -72,7 +72,7 @@
- CACHEDIR = os.environ['MUNIN_PLUGSTATE']
+@@ -72,7 +72,7 @@ import re
+ CACHEDIR = environ['MUNIN_PLUGSTATE']
  CACHEFILE = "plugin-ipmi_sensor.cache"
  CACHEAGE = 120
 -CONFIG = '@@CONFDIR@@/ipmi'
@@ -796,10 +788,10 @@ diff -ur munin-2.0.17/plugins/node.d/ipmi_sensor_.in munin-2.0.17-sep/plugins/no
  
  
  
-diff -ur munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-sep/plugins/node.d/mysql_innodb.in
---- munin-2.0.17/plugins/node.d/mysql_innodb.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/mysql_innodb.in	2013-08-17 12:19:22.489484658 +0200
-@@ -34,7 +34,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_innodb.in munin-2.0.25/plugins/node.d/mysql_innodb.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_innodb.in	2015-09-08 10:05:48.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_innodb.in	2015-09-08 10:13:31.748593251 +0000
+@@ -34,7 +34,7 @@ the default INNODB tablespace, do the fo
  
  =head1 CONFIGURATION
  
@@ -808,10 +800,10 @@ diff -ur munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-sep/plugins/no
  if you need to override the defaults below:
  
   [mysql_innodb]
-diff -ur munin-2.0.17/plugins/node.d/mysql_isam_space_.in munin-2.0.17-sep/plugins/node.d/mysql_isam_space_.in
---- munin-2.0.17/plugins/node.d/mysql_isam_space_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/mysql_isam_space_.in	2013-08-17 12:19:22.489484658 +0200
-@@ -8,7 +8,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.25/plugins/node.d/mysql_isam_space_.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_isam_space_.in	2015-09-08 10:13:31.748593251 +0000
+@@ -8,7 +8,7 @@ on isam and myisam tables on a mysql ser
  
  =head1 CONFIGURATION
  
@@ -820,10 +812,10 @@ diff -ur munin-2.0.17/plugins/node.d/mysql_isam_space_.in munin-2.0.17-sep/plugi
  if you need to override the defaults below:
  
   [mysql_isam_space_*]
-diff -ur munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-sep/plugins/node.d/mysql_threads.in
---- munin-2.0.17/plugins/node.d/mysql_threads.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/mysql_threads.in	2013-08-17 12:19:22.489484658 +0200
-@@ -9,7 +9,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_threads.in munin-2.0.25/plugins/node.d/mysql_threads.in
+--- munin-2.0.25.orig/plugins/node.d/mysql_threads.in	2015-09-08 10:05:48.000000000 +0000
++++ munin-2.0.25/plugins/node.d/mysql_threads.in	2015-09-08 10:13:31.748593251 +0000
+@@ -9,7 +9,7 @@ mysql_threads - Plugin to monitor the nu
  
  =head1 CONFIGURATION
  
@@ -832,10 +824,10 @@ diff -ur munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-sep/plugins/n
  need to override the defaults below:
  
   [mysql_threads]
-diff -ur munin-2.0.17/plugins/node.d/named.in munin-2.0.17-sep/plugins/node.d/named.in
---- munin-2.0.17/plugins/node.d/named.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/named.in	2013-08-17 12:19:22.489484658 +0200
-@@ -34,7 +34,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/named.in munin-2.0.25/plugins/node.d/named.in
+--- munin-2.0.25.orig/plugins/node.d/named.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/named.in	2015-09-08 10:13:31.749593251 +0000
+@@ -34,7 +34,7 @@ restrictions on the log file.
  
  =head1 CONFIGURATION
  
@@ -844,10 +836,10 @@ diff -ur munin-2.0.17/plugins/node.d/named.in munin-2.0.17-sep/plugins/node.d/na
  if you need to override the defaults below:
  
   [named]
-diff -ur munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-sep/plugins/node.d/ntp_kernel_pll_freq.in
---- munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/ntp_kernel_pll_freq.in	2013-08-17 12:19:22.489484658 +0200
-@@ -12,7 +12,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in
+--- munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in	2015-09-08 10:05:48.000000000 +0000
++++ munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in	2015-09-08 10:13:31.749593251 +0000
+@@ -12,7 +12,7 @@ the NTP status
  
  No configuration
  
@@ -856,7 +848,7 @@ diff -ur munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-sep/plu
  should contain a number to be added to the frequency read by ntpdc.
  
  =head1 AUTHORS
-@@ -46,8 +46,8 @@
+@@ -46,8 +46,8 @@ if [ "$1" = "autoconf" ]; then
      exit 0
  fi
  
@@ -867,10 +859,10 @@ diff -ur munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-sep/plu
  else
      fcomp=0
  fi
-diff -ur munin-2.0.17/plugins/node.d/postfix_mailstats.in munin-2.0.17-sep/plugins/node.d/postfix_mailstats.in
---- munin-2.0.17/plugins/node.d/postfix_mailstats.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/postfix_mailstats.in	2013-08-17 12:19:22.489484658 +0200
-@@ -8,7 +8,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in munin-2.0.25/plugins/node.d/postfix_mailstats.in
+--- munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/postfix_mailstats.in	2015-09-08 10:13:31.749593251 +0000
+@@ -8,7 +8,7 @@ rejected by postfix
  
  =head1 CONFIGURATION
  
@@ -879,10 +871,10 @@ diff -ur munin-2.0.17/plugins/node.d/postfix_mailstats.in munin-2.0.17-sep/plugi
  if you need to override the defaults below:
  
   [postfix_mailstats]
-diff -ur munin-2.0.17/plugins/node.d/psu_.in munin-2.0.17-sep/plugins/node.d/psu_.in
---- munin-2.0.17/plugins/node.d/psu_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/psu_.in	2013-08-17 12:19:22.489484658 +0200
-@@ -15,7 +15,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/psu_.in munin-2.0.25/plugins/node.d/psu_.in
+--- munin-2.0.25.orig/plugins/node.d/psu_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/psu_.in	2015-09-08 10:13:31.750593251 +0000
+@@ -15,7 +15,7 @@ we wish to graph.
  
  Example:
  
@@ -891,10 +883,10 @@ diff -ur munin-2.0.17/plugins/node.d/psu_.in munin-2.0.17-sep/plugins/node.d/psu
  
  ...will monitor the user "foo"
  
-diff -ur munin-2.0.17/plugins/node.d/squeezebox_.in munin-2.0.17-sep/plugins/node.d/squeezebox_.in
---- munin-2.0.17/plugins/node.d/squeezebox_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/squeezebox_.in	2013-08-17 12:19:22.489484658 +0200
-@@ -20,7 +20,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/squeezebox_.in munin-2.0.25/plugins/node.d/squeezebox_.in
+--- munin-2.0.25.orig/plugins/node.d/squeezebox_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/squeezebox_.in	2015-09-08 10:13:31.750593251 +0000
+@@ -20,7 +20,7 @@ SqueezeCenter. If the plugin is run from
  non-default configuration, please use the environment variables
  'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
  nc(1) binary is not called "nc", or not the one in $PATH, please define it
@@ -903,10 +895,10 @@ diff -ur munin-2.0.17/plugins/node.d/squeezebox_.in munin-2.0.17-sep/plugins/nod
  
  Sample follows:
  
-diff -ur munin-2.0.17/plugins/node.d/varnish_.in munin-2.0.17-sep/plugins/node.d/varnish_.in
---- munin-2.0.17/plugins/node.d/varnish_.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/varnish_.in	2013-08-17 12:19:22.492818051 +0200
-@@ -54,7 +54,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d/varnish_.in munin-2.0.25/plugins/node.d/varnish_.in
+--- munin-2.0.25.orig/plugins/node.d/varnish_.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d/varnish_.in	2015-09-08 10:13:31.750593251 +0000
+@@ -54,7 +54,7 @@ session, session_herd
  You can link them yourself with something like this:
  
    ln -s @@LIBDIR@@/plugins/varnish_ \
@@ -915,10 +907,10 @@ diff -ur munin-2.0.17/plugins/node.d/varnish_.in munin-2.0.17-sep/plugins/node.d
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/plugins/node.d.cygwin/df.in munin-2.0.17-sep/plugins/node.d.cygwin/df.in
---- munin-2.0.17/plugins/node.d.cygwin/df.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.cygwin/df.in	2013-08-17 12:25:08.005594281 +0200
-@@ -13,7 +13,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.cygwin/df.in munin-2.0.25/plugins/node.d.cygwin/df.in
+--- munin-2.0.25.orig/plugins/node.d.cygwin/df.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.cygwin/df.in	2015-09-08 10:13:31.751593251 +0000
+@@ -13,7 +13,7 @@ Cygwin 1.7.x or higher systems with core
  
  =head1 USAGE
  
@@ -927,10 +919,10 @@ diff -ur munin-2.0.17/plugins/node.d.cygwin/df.in munin-2.0.17-sep/plugins/node.
  
  The plugin excludes per default the following special, read-only or
  dynamically allocating file systems from graphing:
-diff -ur munin-2.0.17/plugins/node.d.debug/if.in munin-2.0.17-sep/plugins/node.d.debug/if.in
---- munin-2.0.17/plugins/node.d.debug/if.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.debug/if.in	2013-08-17 12:25:17.379093018 +0200
-@@ -21,7 +21,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.debug/if.in munin-2.0.25/plugins/node.d.debug/if.in
+--- munin-2.0.25.orig/plugins/node.d.debug/if.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.debug/if.in	2015-09-08 10:13:31.751593251 +0000
+@@ -21,7 +21,7 @@ variable.  For example:
  
  =head1 USAGE
  
@@ -939,10 +931,10 @@ diff -ur munin-2.0.17/plugins/node.d.debug/if.in munin-2.0.17-sep/plugins/node.d
  
  =head1 MAGIC MARKERS
  
-diff -ur munin-2.0.17/plugins/node.d.debug/tc.in munin-2.0.17-sep/plugins/node.d.debug/tc.in
---- munin-2.0.17/plugins/node.d.debug/tc.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.debug/tc.in	2013-08-17 12:25:26.375918427 +0200
-@@ -21,7 +21,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.debug/tc.in munin-2.0.25/plugins/node.d.debug/tc.in
+--- munin-2.0.25.orig/plugins/node.d.debug/tc.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.debug/tc.in	2015-09-08 10:13:31.751593251 +0000
+@@ -21,7 +21,7 @@ For example:
  
  =head1 USAGE
  
@@ -951,10 +943,10 @@ diff -ur munin-2.0.17/plugins/node.d.debug/tc.in munin-2.0.17-sep/plugins/node.d
  
  =head1 MAGIC MARKERS
  
-diff -ur munin-2.0.17/plugins/node.d.linux/acpi.in munin-2.0.17-sep/plugins/node.d.linux/acpi.in
---- munin-2.0.17/plugins/node.d.linux/acpi.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/acpi.in	2013-08-17 12:19:22.492818051 +0200
-@@ -17,7 +17,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/acpi.in munin-2.0.25/plugins/node.d.linux/acpi.in
+--- munin-2.0.25.orig/plugins/node.d.linux/acpi.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/acpi.in	2015-09-08 10:13:31.751593251 +0000
+@@ -17,7 +17,7 @@ Load the 'thermal_zone' kernel module an
  
  =head1 USAGE
  
@@ -963,10 +955,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/acpi.in munin-2.0.17-sep/plugins/node
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/plugins/node.d.linux/apt.in munin-2.0.17-sep/plugins/node.d.linux/apt.in
---- munin-2.0.17/plugins/node.d.linux/apt.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/apt.in	2013-08-17 12:19:22.492818051 +0200
-@@ -38,7 +38,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/apt.in munin-2.0.25/plugins/node.d.linux/apt.in
+--- munin-2.0.25.orig/plugins/node.d.linux/apt.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/apt.in	2015-09-08 10:13:31.752593251 +0000
+@@ -38,7 +38,7 @@ Remember to randomize when these cronjob
  
  =head1 USAGE
  
@@ -975,10 +967,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/apt.in munin-2.0.17-sep/plugins/node.
  
  =head1 NOTES
  
-diff -ur munin-2.0.17/plugins/node.d.linux/df.in munin-2.0.17-sep/plugins/node.d.linux/df.in
---- munin-2.0.17/plugins/node.d.linux/df.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/df.in	2013-08-17 12:19:22.492818051 +0200
-@@ -28,7 +28,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df.in munin-2.0.25/plugins/node.d.linux/df.in
+--- munin-2.0.25.orig/plugins/node.d.linux/df.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/df.in	2015-09-08 10:13:31.752593251 +0000
+@@ -28,7 +28,7 @@ This configuration snipplet is an exampl
      env.warning 92
      env.critical 98
  
@@ -987,7 +979,7 @@ diff -ur munin-2.0.17/plugins/node.d.linux/df.in munin-2.0.17-sep/plugins/node.d
  
  You may specify filesystem specific warning and critical levels:
  
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ RE will not be included.
  
  =head1 USAGE
  
@@ -996,10 +988,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/df.in munin-2.0.17-sep/plugins/node.d
  
  =head1 MAGIC MARKERS
  
-diff -ur munin-2.0.17/plugins/node.d.linux/df_inode.in munin-2.0.17-sep/plugins/node.d.linux/df_inode.in
---- munin-2.0.17/plugins/node.d.linux/df_inode.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/df_inode.in	2013-08-17 12:25:37.609449943 +0200
-@@ -28,7 +28,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df_inode.in munin-2.0.25/plugins/node.d.linux/df_inode.in
+--- munin-2.0.25.orig/plugins/node.d.linux/df_inode.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/df_inode.in	2015-09-08 10:13:31.752593251 +0000
+@@ -28,7 +28,7 @@ This configuration snipplet is an exampl
      env.warning 92
      env.critical 98
  
@@ -1008,7 +1000,7 @@ diff -ur munin-2.0.17/plugins/node.d.linux/df_inode.in munin-2.0.17-sep/plugins/
  
  You may specify filesystem specific warning and critical levels:
  
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ RE will not be included.
  
  =head1 USAGE
  
@@ -1017,10 +1009,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/df_inode.in munin-2.0.17-sep/plugins/
  
  =head1 MAGIC MARKERS
  
-diff -ur munin-2.0.17/plugins/node.d.linux/fw_conntrack.in munin-2.0.17-sep/plugins/node.d.linux/fw_conntrack.in
---- munin-2.0.17/plugins/node.d.linux/fw_conntrack.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/fw_conntrack.in	2013-08-17 12:19:22.492818051 +0200
-@@ -11,7 +11,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.25/plugins/node.d.linux/fw_conntrack.in
+--- munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/fw_conntrack.in	2015-09-08 10:13:31.753593251 +0000
+@@ -11,7 +11,7 @@ This plugin must run with root privilege
  
  =head2 CONFIGURATION EXAMPLE
  
@@ -1029,10 +1021,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/fw_conntrack.in munin-2.0.17-sep/plug
  
   [fw_*]
    user root
-diff -ur munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.17-sep/plugins/node.d.linux/fw_forwarded_local.in
---- munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/fw_forwarded_local.in	2013-08-17 12:19:22.492818051 +0200
-@@ -10,7 +10,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.25/plugins/node.d.linux/fw_forwarded_local.in
+--- munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/fw_forwarded_local.in	2015-09-08 10:13:31.753593251 +0000
+@@ -10,7 +10,7 @@ This plugin must run with root privilege
  
  =head2 CONFIGURATION EXAMPLE
  
@@ -1041,10 +1033,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.17-se
  
   [fw_*]
    user root
-diff -ur munin-2.0.17/plugins/node.d.linux/fw_packets.in munin-2.0.17-sep/plugins/node.d.linux/fw_packets.in
---- munin-2.0.17/plugins/node.d.linux/fw_packets.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/fw_packets.in	2013-08-17 12:19:22.492818051 +0200
-@@ -11,7 +11,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in munin-2.0.25/plugins/node.d.linux/fw_packets.in
+--- munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/fw_packets.in	2015-09-08 10:13:31.754593251 +0000
+@@ -11,7 +11,7 @@ This plugin must run with root privilege
  
  =head1 CONFIGURATION EXAMPLE
  
@@ -1053,10 +1045,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/fw_packets.in munin-2.0.17-sep/plugin
  
   [fw*]
    user root
-diff -ur munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-sep/plugins/node.d.linux/iostat.in
---- munin-2.0.17/plugins/node.d.linux/iostat.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/iostat.in	2013-08-17 12:19:22.492818051 +0200
-@@ -24,7 +24,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat.in munin-2.0.25/plugins/node.d.linux/iostat.in
+--- munin-2.0.25.orig/plugins/node.d.linux/iostat.in	2015-09-08 10:05:55.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/iostat.in	2015-09-08 10:13:31.754593251 +0000
+@@ -24,7 +24,7 @@ guest OS/dom-U IO-traffic originates in.
  
  =head1 USAGE
  
@@ -1065,10 +1057,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-sep/plugins/no
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/plugins/node.d.linux/iostat_ios.in munin-2.0.17-sep/plugins/node.d.linux/iostat_ios.in
---- munin-2.0.17/plugins/node.d.linux/iostat_ios.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/iostat_ios.in	2013-08-17 12:19:22.492818051 +0200
-@@ -15,7 +15,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.25/plugins/node.d.linux/iostat_ios.in
+--- munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/iostat_ios.in	2015-09-08 10:13:31.754593251 +0000
+@@ -15,7 +15,7 @@ None needed
  
  =head1 USAGE
  
@@ -1077,10 +1069,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/iostat_ios.in munin-2.0.17-sep/plugin
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/plugins/node.d.linux/irqstats.in munin-2.0.17-sep/plugins/node.d.linux/irqstats.in
---- munin-2.0.17/plugins/node.d.linux/irqstats.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/irqstats.in	2013-08-17 12:19:22.492818051 +0200
-@@ -15,7 +15,7 @@
+diff -urNp munin-2.0.25.orig/plugins/node.d.linux/irqstats.in munin-2.0.25/plugins/node.d.linux/irqstats.in
+--- munin-2.0.25.orig/plugins/node.d.linux/irqstats.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/plugins/node.d.linux/irqstats.in	2015-09-08 10:13:31.754593251 +0000
+@@ -15,7 +15,7 @@ None needed
  
  =head1 USAGE
  
@@ -1089,9 +1081,9 @@ diff -ur munin-2.0.17/plugins/node.d.linux/irqstats.in munin-2.0.17-sep/plugins/
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/resources/hpux-init.d_munin-node.in munin-2.0.17-sep/resources/hpux-init.d_munin-node.in
---- munin-2.0.17/resources/hpux-init.d_munin-node.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/resources/hpux-init.d_munin-node.in	2013-08-17 12:19:22.492818051 +0200
+diff -urNp munin-2.0.25.orig/resources/hpux-init.d_munin-node.in munin-2.0.25/resources/hpux-init.d_munin-node.in
+--- munin-2.0.25.orig/resources/hpux-init.d_munin-node.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/resources/hpux-init.d_munin-node.in	2015-09-08 10:13:31.755593251 +0000
 @@ -6,7 +6,7 @@
  PATH=/sbin:/bin:/usr/sbin:/usr/bin
  NAME=munin-node
@@ -1101,19 +1093,19 @@ diff -ur munin-2.0.17/resources/hpux-init.d_munin-node.in munin-2.0.17-sep/resou
  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.17/resources/linux-cron.d_munin-node.in munin-2.0.17-sep/resources/linux-cron.d_munin-node.in
---- munin-2.0.17/resources/linux-cron.d_munin-node.in	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/resources/linux-cron.d_munin-node.in	2013-08-17 12:19:22.492818051 +0200
-@@ -8,5 +8,5 @@
+diff -urNp munin-2.0.25.orig/resources/linux-cron.d_munin-node.in munin-2.0.25/resources/linux-cron.d_munin-node.in
+--- munin-2.0.25.orig/resources/linux-cron.d_munin-node.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/resources/linux-cron.d_munin-node.in	2015-09-08 10:13:31.755593251 +0000
+@@ -8,5 +8,5 @@ MAILTO=root
  # 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
  # seconds) interval between updates..
 -*/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.17/t/Makefile.config munin-2.0.17-sep/t/Makefile.config
---- munin-2.0.17/t/Makefile.config	2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/t/Makefile.config	2013-08-17 12:19:22.492818051 +0200
+diff -urNp munin-2.0.25.orig/t/Makefile.config munin-2.0.25/t/Makefile.config
+--- munin-2.0.25.orig/t/Makefile.config	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/t/Makefile.config	2015-09-08 10:13:31.755593251 +0000
 @@ -9,7 +9,8 @@
  PREFIX     = $(PWD)/t/install
  
diff --git a/munin-templatedir.patch b/munin-templatedir.patch
index eb94020..905fd6d 100644
--- a/munin-templatedir.patch
+++ b/munin-templatedir.patch
@@ -1,7 +1,7 @@
-diff -ur munin-1.4.0/common/lib/Munin/Common/Defaults.pm munin-1.4.0.template/common/lib/Munin/Common/Defaults.pm
---- munin-1.4.0/common/lib/Munin/Common/Defaults.pm	2009-11-27 12:17:16.000000000 +0100
-+++ munin-1.4.0.template/common/lib/Munin/Common/Defaults.pm	2009-11-30 15:53:32.281661475 +0100
-@@ -30,6 +30,7 @@
+diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/common/lib/Munin/Common/Defaults.pm	2015-09-08 10:12:45.556593251 +0000
+@@ -32,6 +32,7 @@ our $MUNIN_SPOOLDIR   = '';
  our $MUNIN_MANDIR     = '';
  our $MUNIN_LOGDIR     = "$COMPONENT_ROOT/log/";
  our $MUNIN_STATEDIR   = ''; 
@@ -9,10 +9,10 @@ diff -ur munin-1.4.0/common/lib/Munin/Common/Defaults.pm munin-1.4.0.template/co
  our $MUNIN_USER       = getpwuid $UID;
  our $MUNIN_GROUP      = getgrgid $GID;
  our $MUNIN_PLUGINUSER = getpwuid $UID;
-diff -ur munin-1.4.0/contrib/munin-every-services-all-boxes-build-html.in munin-1.4.0.template/contrib/munin-every-services-all-boxes-build-html.in
---- munin-1.4.0/contrib/munin-every-services-all-boxes-build-html.in	2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.template/contrib/munin-every-services-all-boxes-build-html.in	2009-11-30 15:31:14.400724600 +0100
-@@ -23,7 +23,7 @@
+diff -urNp munin-2.0.25.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.25/contrib/munin-every-services-all-boxes-build-html.in
+--- munin-2.0.25.orig/contrib/munin-every-services-all-boxes-build-html.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/contrib/munin-every-services-all-boxes-build-html.in	2015-09-08 10:12:45.898593251 +0000
+@@ -23,7 +23,7 @@ optional for find : -mtime -30 ; will ig
  
    chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes
  
@@ -21,11 +21,11 @@ diff -ur munin-1.4.0/contrib/munin-every-services-all-boxes-build-html.in munin-
  
   <div class="box">
      <a href=every-services-all-boxes>every services on all boxes</a>
-diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile
---- munin-1.4.0/Makefile	2009-11-30 15:56:58.665729798 +0100
-+++ munin-1.4.0.template/Makefile	2009-11-30 15:43:56.093673451 +0100
-@@ -72,9 +72,9 @@
- 	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
+diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
+--- munin-2.0.25.orig/Makefile	2015-09-08 10:02:24.000000000 +0000
++++ munin-2.0.25/Makefile	2015-09-08 10:12:45.899593251 +0000
+@@ -75,9 +75,9 @@ install-pre: Makefile Makefile.config
+ 	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
  
  install-master-prime: $(INFILES_MASTER) install-pre install-master
 -	mkdir -p $(CONFDIR)/templates
@@ -37,8 +37,8 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile
  	mkdir -p $(CONFDIR)/munin-conf.d
  	mkdir -p $(LIBDIR)
  	mkdir -p $(BINDIR)
-@@ -87,15 +87,15 @@
- 	$(CHMOD) 0755 $(DBDIR)
+@@ -96,15 +96,15 @@ install-master-prime: $(INFILES_MASTER)
+ 	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
  
  	for p in master/www/*.tmpl ;  do \
 -		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
@@ -55,8 +55,8 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile
 +		$(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/partial/ ; \
  	done
  
- 	$(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
-@@ -217,6 +217,7 @@
+ 	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
+@@ -249,6 +249,7 @@ build/%: %.in
               -e 's|@@GOODSH@@|$(GOODSH)|g'                      \
               -e 's|@@BASH@@|$(BASH)|g'                          \
               -e 's|@@HASSETR@@|$(HASSETR)|g'                    \
@@ -64,7 +64,7 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile
               $< > $@;
  
  
-@@ -255,7 +256,8 @@
+@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm
                    s{(PLUGINUSER	\s+=\s).*}{\1q{$(PLUGINUSER)};}x;  \
                    s{(GOODSH	\s+=\s).*}{\1q{$(GOODSH)};}x;      \
                    s{(BASH	\s+=\s).*}{\1q{$(BASH)};}x;        \
@@ -74,21 +74,21 @@ diff -ur munin-1.4.0/Makefile munin-1.4.0.template/Makefile
                    $< > $@
  
  build-doc: build-doc-stamp Makefile Makefile.config
-diff -ur munin-1.4.0/Makefile.config munin-1.4.0.template/Makefile.config
---- munin-1.4.0/Makefile.config	2009-11-30 15:56:58.665729798 +0100
-+++ munin-1.4.0.template/Makefile.config	2009-11-30 15:44:54.459859861 +0100
-@@ -40,6 +40,7 @@
+diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config
+--- munin-2.0.25.orig/Makefile.config	2015-09-08 10:02:24.000000000 +0000
++++ munin-2.0.25/Makefile.config	2015-09-08 10:12:45.899593251 +0000
+@@ -40,6 +40,7 @@ LIBDIR     = $(PREFIX)/share/munin
  # Server only - Output directory
  HTMLDIR    = $(DESTDIR)/var/lib/munin/html
  CGIDIR     = $(LIBDIR)/cgi
 +TEMPLATEDIR= $(DESTDIR)/etc/webapps/munin/templates
  
- # Server only - spool directory for data gathered from nodes by
- # munin-gather - experimental.  Place on ramdisk to make munin
-diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.template/master/doc/munin.conf.pod.in
---- munin-1.4.0/master/doc/munin.conf.pod.in	2009-11-27 12:17:16.000000000 +0100
-+++ munin-1.4.0.template/master/doc/munin.conf.pod.in	2009-11-30 15:51:40.016661676 +0100
-@@ -68,7 +68,7 @@
+ # Where to put internal data for master (RRD, internal files, ...)
+ DBDIR      = $(DESTDIR)/var/lib/munin/db
+diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/doc/munin.conf.pod.in
+--- munin-2.0.25.orig/master/doc/munin.conf.pod.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/doc/munin.conf.pod.in	2015-09-08 10:12:45.899593251 +0000
+@@ -70,7 +70,7 @@ Directory for HTML pages and graphs.  Re
  
  Directory for files tracking munin's current running state.  Required.
  
@@ -97,10 +97,10 @@ diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.template/master/do
  
  Directory for templates used to generate HTML pages.  Required.
  
-diff -ur munin-1.4.0/master/lib/Munin/Master/Config.pm munin-1.4.0.template/master/lib/Munin/Master/Config.pm
---- munin-1.4.0/master/lib/Munin/Master/Config.pm	2009-11-27 12:17:17.000000000 +0100
-+++ munin-1.4.0.template/master/lib/Munin/Master/Config.pm	2009-11-30 15:50:50.533791958 +0100
-@@ -156,8 +156,8 @@
+diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/master/lib/Munin/Master/Config.pm
+--- munin-2.0.25.orig/master/lib/Munin/Master/Config.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/lib/Munin/Master/Config.pm	2015-09-08 10:12:45.900593251 +0000
+@@ -159,8 +159,8 @@ my %booleans = map {$_ => 1} qw(
  		tls_private_key  => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
  		tls_verify_certificate => 0,
  		tls_verify_depth => 5,
@@ -111,10 +111,10 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/Config.pm munin-1.4.0.template/mast
  	        cgitmpdir        => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp",
  	    }, $class ),
  
-diff -ur munin-1.4.0/master/lib/Munin/Master/Utils.pm munin-1.4.0.template/master/lib/Munin/Master/Utils.pm
---- munin-1.4.0/master/lib/Munin/Master/Utils.pm	2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.template/master/lib/Munin/Master/Utils.pm	2009-11-30 15:49:47.135724128 +0100
-@@ -273,8 +273,8 @@
+diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/lib/Munin/Master/Utils.pm	2015-09-08 10:12:45.901593251 +0000
+@@ -1018,8 +1018,8 @@ sub munin_readconfig_base {
      $config->{'rundir'}        ||= $Munin::Common::Defaults::MUNIN_STATEDIR;
      $config->{'dbdir'}         ||= $Munin::Common::Defaults::MUNIN_DBDIR;
      $config->{'logdir'}        ||= $Munin::Common::Defaults::MUNIN_LOGDIR;
@@ -123,12 +123,12 @@ diff -ur munin-1.4.0/master/lib/Munin/Master/Utils.pm munin-1.4.0.template/maste
 +    $config->{'tmpldir'}       ||= "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR";
 +    $config->{'staticdir'}     ||= "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR/static/";
      $config->{'htmldir'}       ||= $Munin::Common::Defaults::MUNIN_HTMLDIR;
-     $config->{'spooldir'}      ||= $Munin::Common::Defaults::MUNIN_SSPOOLDIR;
+     $config->{'spooldir'}      ||= $Munin::Common::Defaults::MUNIN_SPOOLDIR;
      $config->{'#%#parent'}     = undef;
-diff -ur munin-1.4.0/master/munin.conf.in munin-1.4.0.template/master/munin.conf.in
---- munin-1.4.0/master/munin.conf.in	2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0.template/master/munin.conf.in	2009-11-30 15:47:40.690849769 +0100
-@@ -11,11 +11,11 @@
+diff -urNp munin-2.0.25.orig/master/munin.conf.in munin-2.0.25/master/munin.conf.in
+--- munin-2.0.25.orig/master/munin.conf.in	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/munin.conf.in	2015-09-08 10:12:45.901593251 +0000
+@@ -12,11 +12,11 @@
  
  # Where to look for the HTML templates
  #
diff --git a/munin-timeout.patch b/munin-timeout.patch
index 992190e..3df9cf2 100644
--- a/munin-timeout.patch
+++ b/munin-timeout.patch
@@ -1,6 +1,7 @@
---- munin-1.4.0/master/lib/Munin/Master/Node.pm~	2009-11-27 12:17:17.000000000 +0100
-+++ munin-1.4.0/master/lib/Munin/Master/Node.pm	2009-12-01 17:33:33.041187499 +0100
-@@ -27,7 +27,7 @@
+diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Node.pm munin-2.0.25/master/lib/Munin/Master/Node.pm
+--- munin-2.0.25.orig/master/lib/Munin/Master/Node.pm	2014-11-24 21:46:24.000000000 +0000
++++ munin-2.0.25/master/lib/Munin/Master/Node.pm	2015-09-08 10:14:27.201593251 +0000
+@@ -37,7 +37,7 @@ sub new {
          pid     => undef,
          writer  => undef,
          master_capabilities => "multigraph dirtyconfig",
diff --git a/munin.spec b/munin.spec
index c50f9a3..8fe90b5 100644
--- a/munin.spec
+++ b/munin.spec
@@ -9,12 +9,12 @@
 Summary:	Munin - the Linpro RRD data agent
 Summary(pl.UTF-8):	Munin - agent danych RRD Linpro
 Name:		munin
-Version:	2.0.19
-Release:	4
+Version:	2.0.25
+Release:	1
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://downloads.sourceforge.net/munin/%{name}-%{version}.tar.gz
-# Source0-md5:	ab27d477052c0f5da4ed81edb7f95f1b
+# Source0-md5:	b418a667ce42665557329a7ac3bd1b93
 Source1:	%{name}-node.init
 Source2:	%{name}.cron
 Source3:	%{name}-apache.conf