Hi ports@!
This is update for munin to version 2.0.14. It also regens patches and removes
swap plugin which isn't usable anymore.
Full changelog is here:
http://munin-monitoring.org/browser/munin/ChangeLog?rev=2.0.14
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 22 Mar 2013 15:00:29 -0000 1.31
+++ Makefile 16 May 2013 09:20:11 -0000
@@ -3,7 +3,7 @@
COMMENT-main = flexible network host monitoring, client
COMMENT-server =flexible network host monitoring, server
-V = 2.0.12
+V = 2.0.14
DISTNAME = munin-$V
PKGNAME-main = munin-node-$V
PKGNAME-server =munin-server-$V
@@ -74,6 +74,7 @@ post-extract:
${SUBST_CMD} -c ${SUBST_LIST}
chmod -R +x ${WRKSRC}/plugins/node.d.openbsd
rm ${WRKSRC}/plugins/node.d.openbsd/iostat.in # not yet ported
+ rm ${WRKSRC}/plugins/node.d.openbsd/swap.in # we have no in/out fields
# Fixup hardcoded paths in plugins to use TRUEPREFIX/LOCALBASE as appropriate,
# there are far too many to handle this via patches/SUBST_CMD, and this method
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/munin/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 22 Mar 2013 15:00:29 -0000 1.8
+++ distinfo 16 May 2013 09:20:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.12.tar.gz) = BkE5q2Ja+IT4fxtY9gCBVISLYuYTUu1ixiJkCR7CuAk=
-SIZE (munin-2.0.12.tar.gz) = 1331986
+SHA256 (munin-2.0.14.tar.gz) = dSbHpYLdHt48fnjisNn8GSQLKJtAL+6r5JXfHucLDb4=
+SIZE (munin-2.0.14.tar.gz) = 1333774
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile 18 Jan 2013 12:23:24 -0000 1.4
+++ patches/patch-Makefile 16 May 2013 09:20:11 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.4 2013/01/18 12:23:24 gonzalo Exp $
---- Makefile.orig Wed Jan 9 19:46:54 2013
-+++ Makefile Fri Jan 11 01:11:03 2013
+--- Makefile.orig Fri May 10 22:59:50 2013
++++ Makefile Thu May 16 13:04:00 2013
@@ -72,7 +72,6 @@ install-pre: Makefile Makefile.config
mkdir -p $(STATEDIR)
mkdir -p $(SPOOLDIR)
@@ -51,6 +51,6 @@ $OpenBSD: patch-Makefile,v 1.4 2013/01/1
--install_path bindoc=$(MANDIR)/man1 \
- --install_path libdoc=$(MANDIR)/man3 \
+ --install_path libdoc=$(MANDIR)/man3p \
-
+
test-%: %/Build
cd $* && $(PERL) Build test --verbose=0 || true
Index: patches/patch-node_munin-node_conf_in
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-node_munin-node_conf_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-node_munin-node_conf_in
--- patches/patch-node_munin-node_conf_in 12 Oct 2012 09:46:46 -0000
1.3
+++ patches/patch-node_munin-node_conf_in 16 May 2013 09:20:11 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-node_munin-node_conf_in,v 1.3 2012/10/12 09:46:46 kirby Exp $
---- node/munin-node.conf.in.orig Fri Aug 31 19:22:50 2012
-+++ node/munin-node.conf.in Sun Sep 30 23:02:45 2012
+--- node/munin-node.conf.in.orig Fri May 10 22:59:50 2013
++++ node/munin-node.conf.in Thu May 16 13:04:00 2013
@@ -10,7 +10,7 @@ background 1
setsid 1
@@ -8,5 +8,5 @@ $OpenBSD: patch-node_munin-node_conf_in,
-group root
+group wheel
-
- # Regexps for files to ignore
+ # This is the timeout for the whole transaction.
+ # Units are in sec. Default is 15 min
Index: patches/patch-node_sbin_munin-node
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-node_sbin_munin-node,v
retrieving revision 1.3
diff -u -p -r1.3 patch-node_sbin_munin-node
--- patches/patch-node_sbin_munin-node 18 Jan 2013 12:23:24 -0000 1.3
+++ patches/patch-node_sbin_munin-node 16 May 2013 09:20:11 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-node_sbin_munin-node,v 1.3 2013/01/18 12:23:24 gonzalo Exp $
---- node/sbin/munin-node.orig Wed Jan 9 19:46:54 2013
-+++ node/sbin/munin-node Fri Jan 11 01:08:03 2013
+--- node/sbin/munin-node.orig Fri May 10 22:59:50 2013
++++ node/sbin/munin-node Thu May 16 13:04:00 2013
@@ -53,6 +53,9 @@ sub main
$ENV{$key} =~ /^(.*)$/;
$ENV{$key} = $1;
@@ -9,5 +9,5 @@ $OpenBSD: patch-node_sbin_munin-node,v 1
+ # must not contain writable directories.
+ $ENV{PATH}='/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin';
- $0 =~ /([^\/]*)$/;
- $0 = $1;
+ parse_args();
+
Index: patches/patch-plugins_node_d_openbsd_swap_in
===================================================================
RCS file: patches/patch-plugins_node_d_openbsd_swap_in
diff -N patches/patch-plugins_node_d_openbsd_swap_in
--- patches/patch-plugins_node_d_openbsd_swap_in 12 Oct 2012 09:46:46
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-plugins_node_d_openbsd_swap_in,v 1.2 2012/10/12 09:46:46
kirby Exp $
---- plugins/node.d.openbsd/swap.in.orig Fri Aug 31 19:22:50 2012
-+++ plugins/node.d.openbsd/swap.in Sun Sep 30 23:19:21 2012
-@@ -16,8 +16,8 @@
-
-
- if [ "$1" = "autoconf" ]; then
-- if [ -x /sbin/sysctl ]; then
-- /sbin/sysctl vm.stats.vm.v_swappgsin > /dev/null
-+ if [ -x /usr/bin/vmstat ]; then
-+ /usr/bin/vmstat > /dev/null
- if [ $? = "0" ]; then
- echo yes
- exit 0
-@@ -51,8 +51,6 @@ if [ "$1" = "config" ]; then
- exit 0
- fi
-
-+/usr/bin/vmstat | /usr/bin/awk 'END { print "swap_in.value " $8
"\nswap_out.value " $9 }'
-+
- #awk '/swap/ { print "swap_in.value " $2 "\nswap_out.value " $3 }' <
/proc/stat
--echo -n 'swap_in.value '
--/sbin/sysctl -n vm.stats.vm.v_swappgsin
--echo -n 'swap_out.value '
--/sbin/sysctl -n vm.stats.vm.v_swappgsout
Index: patches/patch-plugins_node_d_squeezebox__in
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-plugins_node_d_squeezebox__in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-plugins_node_d_squeezebox__in
--- patches/patch-plugins_node_d_squeezebox__in 12 Oct 2012 09:46:46 -0000
1.2
+++ patches/patch-plugins_node_d_squeezebox__in 16 May 2013 09:20:11 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-plugins_node_d_squeezebo
seq -> jot (handily avoiding the need for bashisms)
correct nc path
---- plugins/node.d/squeezebox_.in.orig Fri Aug 31 19:22:50 2012
-+++ plugins/node.d/squeezebox_.in Sun Sep 30 23:28:46 2012
+--- plugins/node.d/squeezebox_.in.orig Fri May 10 22:59:50 2013
++++ plugins/node.d/squeezebox_.in Thu May 16 13:04:00 2013
@@ -1,5 +1,5 @@
#!@@BASH@@
-# -*- sh -*-
@@ -12,16 +12,16 @@ correct nc path
: <<=cut
-@@ -58,7 +58,7 @@ GPLv2
+@@ -59,7 +59,7 @@ GPLv2
HOST=${squeezecenter_host:-localhost}
PORT=${squeezecenter_port:-9090}
--NC=${netcat:-/bin/nc}
+-NC=${netcat:-nc}
+NC=${netcat:-/usr/bin/nc}
if [ "$1" = "autoconf" ]; then
if [ ! "which $NC 1>/dev/null 2>&1" ]; then
-@@ -145,7 +145,6 @@ if [ "$CMD" = "years" ]; then
+@@ -146,7 +146,6 @@ if [ "$CMD" = "years" ]; then
no_of_years=$(printf "%b" "years\nexit\n" | $NC $HOST $PORT | sed
's/%3A/:/g' | cut -d ':' -f 2)
years_array=$(printf "%b" "years 0 $no_of_years\nexit\n" | $NC $HOST
$PORT
| sed 's/%3A/:/g' | cut -d ' ' -f 4- | sed 's/year://g' | cut -d ' ' -f
-$no_of_years)
arr1=( `echo "$years_array" | tr -s ' ' ' '` )
@@ -29,7 +29,7 @@ correct nc path
if [ "$1" = "config" ]; then
echo "graph_title Number of years"
echo "graph_category Squeezebox"
-@@ -156,7 +155,7 @@ if [ "$CMD" = "years" ]; then
+@@ -157,7 +156,7 @@ if [ "$CMD" = "years" ]; then
printf "graph_order y"
echo $years_array | sed 's/ / y/g'
@@ -38,7 +38,7 @@ correct nc path
year=$(echo ${arr1[$i]})
if [ $year = 0 ]; then
echo y0.label No year
-@@ -171,7 +170,7 @@ if [ "$CMD" = "years" ]; then
+@@ -172,7 +171,7 @@ if [ "$CMD" = "years" ]; then
done
exit 0
fi
@@ -47,7 +47,7 @@ correct nc path
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
-@@ -181,8 +180,7 @@ elif [ "$CMD" = "signalstrength" -o "$CMD" = "mixer vo
+@@ -182,8 +181,7 @@ elif [ "$CMD" = "signalstrength" -o "$CMD" = "mixer vo
echo "graph_title $TITLE"
echo "graph_category Squeezebox"
COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT |
cut -d " " -f 3)
@@ -57,7 +57,7 @@ correct nc path
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')
-@@ -191,8 +189,7 @@ elif [ "$CMD" = "signalstrength" -o "$CMD" = "mixer vo
+@@ -192,8 +190,7 @@ elif [ "$CMD" = "signalstrength" -o "$CMD" = "mixer vo
exit 0
fi
COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut
-d " " -f 3)
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/munin/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-main
--- pkg/PLIST-main 22 Mar 2013 15:00:29 -0000 1.13
+++ pkg/PLIST-main 16 May 2013 09:20:11 -0000
@@ -254,7 +254,6 @@ libexec/munin/plugins/squid_objectsize
libexec/munin/plugins/squid_requests
libexec/munin/plugins/squid_traffic
libexec/munin/plugins/surfboard
-libexec/munin/plugins/swap
libexec/munin/plugins/sybase_space
libexec/munin/plugins/systat
libexec/munin/plugins/tomcat_
