munin-plugins-contrib-other.patch

   1 --- munin-plugins-muninexchange-20081128/plugins/ftp/vsftpd-rel~        2008-11-29 13:19:37.000000000 +0100
   2 +++ munin-plugins-muninexchange-20081128/plugins/ftp/vsftpd-rel 2008-11-29 21:04:06.000000000 +0100
   3 @@ -37,10 +37,10 @@
   4
   5  install_ok()
   6  {
   7 -    tempfile=$(which tempfile)
   8 +    mktemp=$(which mktemp)
   9      if [ ! -r ${LOGFILE} -o \
  10          -z "${LOGTAIL}" -o ! -x "${LOGTAIL}" -o \
  11 -        -z "${tempfile}" -o ! -x "${tempfile}" ]
  12 +        -z "${mktemp}" -o ! -x "${mktemp}" ]
  13      then
  14         return 1
  15      fi
  16 @@ -50,7 +50,7 @@
  17
  18  if [ "$1" = "autoconf" ]
  19  then
  20 -    tmpfile=`which tempfile`
  21 +    tmpfile=`which mktemp`
  22      if install_ok
  23      then
  24         echo yes
  25 @@ -82,7 +82,7 @@
  26  test install_ok || exit 1
  27
  28  touch -d now-5minutes+30seconds $PIVOT
  29 -TEMP=`tempfile`
  30 +TEMP=`mktemp`
  31  trap "rm -f ${PIVOT} ${TEMP}" INT EXIT
  32
  33  test -n "$TEMP" -a -w "$TEMP" || exit 1
  34 --- munin-plugins-muninexchange-20081128/plugins/nagios/nagiosstatus~   2008-11-29 13:19:37.000000000 +0100
  35 +++ munin-plugins-muninexchange-20081128/plugins/nagios/nagiosstatus    2008-11-30 01:16:55.000000000 +0100
  36 @@ -113,10 +113,10 @@
  37      if($type) {
  38         push(@{$values{$type}}, $_);
  39      }
  40 -    if(/^host \{/) {
  41 +    if(/^hoststatus \{/) {
  42         $type = "host";
  43      }
  44 -    if(/^service \{/) {
  45 +    if(/^servicestatus \{/) {
  46         $type = "service";
  47      }
  48  }
  49 --- munin-plugins-muninexchange-20110326/plugins/mail/clamav~   2011-03-29 11:24:10.645146427 +0200
  50 +++ munin-plugins-muninexchange-20110326/plugins/mail/clamav    2011-03-29 12:38:20.435562927 +0200
  51 @@ -1,7 +1,8 @@
  52  #!/bin/sh
  53  #%# family=manual
  54  #%# capabilities=autoconf
  55 -log=/var/log/clamav/clamd.log
  56 +
  57 +log=${logfile:-/var/log/clamav/clamd.log}
  58
  59  if [ "$1" = "autoconf" ]; then
  60          if [ -r $log ]; then