diff options
Diffstat (limited to 'sysutils/munin-node/files')
-rw-r--r-- | sysutils/munin-node/files/patch-node__munin-node.conf.in (renamed from sysutils/munin-node/files/patch-munin-node.conf.in) | 10 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in (renamed from sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff) | 6 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in (renamed from sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff) | 4 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in | 4 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in | 8 | ||||
-rw-r--r-- | sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in | 12 |
6 files changed, 22 insertions, 22 deletions
diff --git a/sysutils/munin-node/files/patch-munin-node.conf.in b/sysutils/munin-node/files/patch-node__munin-node.conf.in index 8284ed61f943..10ab0fa8bb48 100644 --- a/sysutils/munin-node/files/patch-munin-node.conf.in +++ b/sysutils/munin-node/files/patch-node__munin-node.conf.in @@ -1,5 +1,5 @@ ---- ./node/munin-node.conf.in.orig 2011-02-17 00:25:32.000000000 +0100 -+++ ./node/munin-node.conf.in 2011-02-17 00:25:47.000000000 +0100 +--- node/munin-node.conf.in.orig 2013-07-19 16:30:03 UTC ++++ node/munin-node.conf.in @@ -10,7 +10,7 @@ setsid 1 @@ -7,9 +7,9 @@ -group root +group wheel - # Regexps for files to ignore - -@@ -22,6 +22,7 @@ + # This is the timeout for the whole transaction. + # Units are in sec. Default is 15 min +@@ -30,6 +30,7 @@ ignore_file \.dpkg-(tmp|new|old|dist)$ ignore_file \.rpm(save|new)$ ignore_file \.pod$ diff --git a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in index ff4aa9183927..addddd9e0bde 100644 --- a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff +++ b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in @@ -1,6 +1,6 @@ ---- plugins/node.d.freebsd/if_.in.orig 2009-12-30 13:55:55.000000000 +0100 -+++ plugins/node.d.freebsd/if_.in 2010-02-24 18:59:15.670282185 +0100 -@@ -81,9 +81,12 @@ +--- plugins/node.d.freebsd/if_.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d.freebsd/if_.in +@@ -83,9 +83,12 @@ if (NF == 10) { print "rbytes.value", $6; print "obytes.value", $9; diff --git a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in index 83b671655aaf..976422e790c0 100644 --- a/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff +++ b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in @@ -1,5 +1,5 @@ ---- plugins/node.d.freebsd/if_errcoll_.in.orig 2009-12-30 13:55:55.000000000 +0100 -+++ plugins/node.d.freebsd/if_errcoll_.in 2010-02-24 19:00:26.026407278 +0100 +--- plugins/node.d.freebsd/if_errcoll_.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d.freebsd/if_errcoll_.in @@ -59,9 +59,13 @@ print "ierrors.value", $5; print "oerrors.value", $8; diff --git a/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in index b63336f3243a..c0a973d87a4b 100644 --- a/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in +++ b/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in @@ -1,5 +1,5 @@ ---- ./plugins/node.d.freebsd/iostat.in.orig 2012-07-11 14:14:27.841196443 +0200 -+++ ./plugins/node.d.freebsd/iostat.in 2012-07-11 14:14:32.619552027 +0200 +--- plugins/node.d.freebsd/iostat.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d.freebsd/iostat.in @@ -56,13 +56,11 @@ for d in $drives; do echo "${d}_read.label ${d}" diff --git a/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in b/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in index ca6daea50fd7..13ce4b37db37 100644 --- a/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in +++ b/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in @@ -1,7 +1,7 @@ ---- plugins/node.d/hddtemp_smartctl.in.orig 2012-09-11 11:26:15.928249255 +0200 -+++ plugins/node.d/hddtemp_smartctl.in 2012-09-11 11:26:48.947249274 +0200 -@@ -151,7 +151,7 @@ - # without probing them. +--- plugins/node.d/hddtemp_smartctl.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d/hddtemp_smartctl.in +@@ -162,7 +162,7 @@ + } elsif ($^O eq 'freebsd') { opendir(DEV, '/dev'); - @drives = grep /^ad[0-9]+$/, readdir DEV; diff --git a/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in b/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in index afc73b8fd4f5..d602b6742cc7 100644 --- a/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in +++ b/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in @@ -1,6 +1,6 @@ ---- ./plugins/node.d/squeezebox_.in.orig 2012-08-14 17:19:40.000000000 +0200 -+++ ./plugins/node.d/squeezebox_.in 2012-08-27 13:55:40.573530762 +0200 -@@ -156,7 +156,7 @@ +--- plugins/node.d/squeezebox_.in.orig 2013-07-19 16:30:03 UTC ++++ plugins/node.d/squeezebox_.in +@@ -157,7 +157,7 @@ printf "graph_order y" echo $years_array | sed 's/ / y/g' @@ -9,7 +9,7 @@ year=$(echo ${arr1[$i]}) if [ $year = 0 ]; then echo y0.label No year -@@ -171,7 +171,7 @@ +@@ -172,7 +172,7 @@ done exit 0 fi @@ -18,7 +18,7 @@ year=$(echo ${arr1[$i]}) printf "y%s.value " ${year} printf "%b" "albums 0 0 year:${year}\nexit\n" | $NC $HOST $PORT | sed 's/%3A/:/g' | cut -d ':' -f 3 -@@ -182,7 +182,7 @@ +@@ -183,7 +183,7 @@ echo "graph_category Squeezebox" COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3) (( COUNT-- )) @@ -27,7 +27,7 @@ MAC=$(printf "%b" "player id $ID ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%3A/:/g') NAME=$(printf "%b" "player name $MAC ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%20/ /g') MAC2=$(echo $MAC | sed 's/://g; s/\./_/g') -@@ -192,7 +192,7 @@ +@@ -193,7 +193,7 @@ fi COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3) (( COUNT-- )) |