-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 @@
- #
- #
-
-+[*]
-+env.logtail /usr/bin/logtail
-+
- [mysql*]
- #env.mysqlopts -u someuser
-
-@@ -31,3 +34,128 @@ user root
-
- [postfix*]
- user root
-+env.logdir /var/log
-+env.logfile maillog
-+
-+[netstat]
-+group proc
-+
-+[amavis*]
-+user root
-+env.amavislog /var/log/maillog
-+env.logfile /var/log/maillog
-+
-+[courier*]
-+user root
-+env.logfile /var/log/maillog
-+
-+[mailman]
-+user mailman
-+group (mailman)
-+
-+[bind9_rndc]
-+group (named)
-+env.querystats /var/lib/named/named.stats
-+
-+[squid*]
-+group (squid)
-+#env.squidport 3128
-+#env.squiduser manager
-+#env.squidpasswd <SECRET>
-+
-+[fw*]
-+group proc
-+
-+[if*]
-+group proc
-+
-+[dhcpd3]
-+user root
-+env.leasefile /var/lib/dhcpd/dhcpd.leases
-+env.configfile /etc/dhcpd.conf
-+
-+[ip_*]
-+user root
-+
-+[munin*]
-+user munin
-+
-+[ping_*]
-+group adm
-+
-+[port_*]
-+group proc
-+
-+[processes]
-+group proc
-+
-+[ps_*]
-+group proc
-+
-+[psu_*]
-+group proc
-+
-+[nfs*]
-+group proc
-+
-+[entropy]
-+group proc
-+
-+[open_*]
-+group proc
-+
-+[nut*]
-+env.upsname SmartUPS
-+env.upshost 127.0.0.1
-+
-+[df*]
-+#user root # if you have mode 0000 /vservers dir
-+group proc
-+
-+# Sane defaults for plugins from MuninExchange
-+
-+[apache_smaps]
-+#user root # if you have kernel with grsecurity
-+group proc
-+env.pname httpd.prefork
-+env.puser http
-+
-+[dovecot]
-+user root
-+env.logfile /var/log/maillog
-+
-+[php_eaccelerator]
-+env.user admin
-+env.password eAccelerator
-+env.url http://127.0.0.1/eaccelerator/control.php
-+
-+[proftpd*]
-+user root
-+env.logfile /var/log/xferlog
-+
-+[vsftpd*]
-+user root
-+env.logfile /var/log/vsftpd.log
-+
-+[postgrey*]
-+user root
-+env.logfile /var/log/maillog
-+
-+[nagiosstatus]
-+user root
-+env.statuslog /var/lib/nagios/status.dat
-+
-+[freeradius]
-+user root
-+env.radius_log /var/log/freeradius/radius.log
-+
-+[ipmitool_sensor*]
-+user root
-+timeout 20
-+
-+[openvpn_clients]
-+user root
-+env.logfile /var/log/openvpn/status.log
-+
-+[cupsys_pages]
-+user root
-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 () {
-- cmd=`echo $MUNIN_MKTEMP | sed s/\\$1/$1/`
-- $cmd
-+ mktemp -p /tmp/ $1
- }