Index: head/sysutils/munin-common/distinfo =================================================================== --- head/sysutils/munin-common/distinfo (revision 465590) +++ head/sysutils/munin-common/distinfo (revision 465591) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509105915 -SHA256 (munin-2.0.34.tar.gz) = ae9a314db0790882fdd4b2d3debe06248d541cb6c5705be4dbb1f8d9d6d66ca7 -SIZE (munin-2.0.34.tar.gz) = 1342411 +TIMESTAMP = 1522066415 +SHA256 (munin-2.0.36.tar.gz) = bf48e3e900c72d11f8104de43d8e39c26d532ebe239a364f95cfc414c143e1d8 +SIZE (munin-2.0.36.tar.gz) = 2053780 Index: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__.in (revision 465590) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__.in (nonexistent) @@ -1,65 +0,0 @@ ---- plugins/node.d.freebsd/if_.in.orig 2014-11-24 21:46:24 UTC -+++ plugins/node.d.freebsd/if_.in -@@ -22,7 +22,7 @@ - INTERFACE=${0##*if_} - - if [ "$1" = "autoconf" ]; then -- if [ -x /usr/bin/netstat ]; then -+ if [ -x /sbin/ifconfig -o -x /usr/bin/netstat ]; then - echo yes - exit 0 - else -@@ -32,8 +32,12 @@ if [ "$1" = "autoconf" ]; then - fi - - if [ "$1" = "suggest" ]; then -- if [ -x /usr/bin/netstat ]; then -- netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '//s/\** .*//p' -+ if [ -x /sbin/ifconfig ] -+ then -+ ifconfig -l | sed -Ee 's/[[:<:]](pfsync|faith|pf(log|sync)|lo|plip|carp|enc|fwe)[^ ]*//g' | xargs -n 1 echo -+ exit 0 -+ elif [ -x /usr/bin/netstat ]; then -+ netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pf(log|sync)/d' -e '//s/\** .*//p' - exit 0 - else - exit 1 -@@ -68,8 +72,14 @@ BEGIN { rsum = 0; osum = 0; } - // { - if (NF == 10) { - rsum += $6; osum += $9; -- } else { -- rsum += $7; osum += $10; -+ } else if (NF == 11) { -+ if ($4 ~ /:/) { -+ rsum += $7; osum += $10; -+ } else { -+ rsum += $7; osum += $10; -+ } -+ } else { # NF == 12 -+ rsum += $8; osum += $11; - } - } - END { -@@ -83,9 +93,18 @@ else - if (NF == 10) { - print "rbytes.value", $6; - print "obytes.value", $9; -- } else { -- print "rbytes.value", $7; -- print "obytes.value", $10; -+ } else if (NF == 11) { -+ if ($4 ~ /:/) { -+ print "rbytes.value", $7; -+ print "obytes.value", $10; -+ } else { -+ print "rbytes.value", $7; -+ print "obytes.value", $10; -+ } -+ } else { # NF == 12 -+ print "rbytes.value", $8; -+ print "obytes.value", $11; - } - }' - fi -+ Property changes on: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__errcoll__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__errcoll__.in (revision 465590) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__errcoll__.in (nonexistent) @@ -1,49 +0,0 @@ ---- plugins/node.d.freebsd/if_errcoll_.in.orig 2014-11-24 21:46:24 UTC -+++ plugins/node.d.freebsd/if_errcoll_.in -@@ -19,7 +19,7 @@ - INTERFACE=${0##*if_errcoll_} - - if [ "$1" = "autoconf" ]; then -- if [ -x /usr/bin/netstat ]; then -+ if [ -x /sbin/ifconfig -o -x /usr/bin/netstat ]; then - echo yes - exit 0 - else -@@ -29,8 +29,12 @@ if [ "$1" = "autoconf" ]; then - fi - - if [ "$1" = "suggest" ]; then -- if [ -x /usr/bin/netstat ]; then -- netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '//s/\** .*//p' -+ if [ -x /sbin/ifconfig ] -+ then -+ ifconfig -l | sed -Ee 's/[[:<:]](pfsync|faith|pf(log|sync)|lo|plip|carp|enc|fwe)[^ ]*//g' | xargs -n 1 echo -+ exit 0 -+ elif [ -x /usr/bin/netstat ]; then -+ netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pf(log|sync)/d' -e '//s/\** .*//p' - exit 0 - else - exit 1 -@@ -59,9 +63,19 @@ fi; - print "ierrors.value", $5; - print "oerrors.value", $8; - print "collisions.value", $10; -- } else { -+ } else if (NF == 11) { -+ if ($4 ~ /:/) { -+ print "ierrors.value", $6; -+ print "oerrors.value", $9; -+ print "collisions.value", $11; -+ } else { -+ print "ierrors.value", $5; -+ print "oerrors.value", $9; -+ print "collisions.value", $11; -+ } -+ } else { # NF == 12 - print "ierrors.value", $6; -- print "oerrors.value", $9; -- print "collisions.value", $11; -+ print "oerrors.value", $10; -+ print "collisions.value", $12; - } - }' Property changes on: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__errcoll__.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__packets__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__packets__.in (revision 465590) +++ head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__packets__.in (nonexistent) @@ -1,113 +0,0 @@ ---- plugins/node.d.freebsd/if_packets_.in.orig 2014-12-10 15:34:51 UTC -+++ plugins/node.d.freebsd/if_packets_.in -@@ -0,0 +1,110 @@ -+#!@@GOODSH@@ -+# -*- sh -*- -+# -+# Wildcard-plugin to monitor network interfaces. To monitor an -+# interface, link if_packets_ to this file. E.g. -+# -+# ln -s /usr/share/munin/node/plugins-auto/if_packets_ /etc/munin/node.d/if_packets_eth0 -+# -+# ...will monitor eth0. -+# -+# To aggregate all network interfaces on the system (except lo0), -+# link if_packets_aggregated to this file. -+# -+# Any device found in /usr/bin/netstat can be monitored. -+# -+# Magic markers (optional - used by munin-config and some installation -+# scripts): -+# -+#%# family=auto -+#%# capabilities=autoconf suggest -+ -+INTERFACE=${0##*if_packets_} -+ -+if [ "$1" = "autoconf" ]; then -+ if [ -x /sbin/ifconfig -o -x /usr/bin/netstat ]; then -+ echo yes -+ exit 0 -+ else -+ echo "no (/usr/bin/netstat not found)" -+ exit 0 -+ fi -+fi -+ -+if [ "$1" = "suggest" ]; then -+ if [ -x /sbin/ifconfig ] -+ then -+ ifconfig -l | sed -Ee 's/[[:<:]](pfsync|faith|pf(log|sync)|lo|plip|carp|enc|fwe)[^ ]*//g' | xargs -n 1 echo -+ exit 0 -+ elif [ -x /usr/bin/netstat ]; then -+ netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pf(log|sync)/d' -e '//s/\** .*//p' -+ exit 0 -+ else -+ exit 1 -+ fi -+fi -+ -+if [ "$1" = "config" ]; then -+ -+ echo "graph_order rpackets opackets" -+ echo "graph_title $INTERFACE pps" -+ echo 'graph_args --base 1000' -+ echo 'graph_vlabel packets per ${graph_period} in (-) / out (+)' -+ echo 'graph_category network' -+ echo "graph_info This graph shows the packets counter of the $INTERFACE network interface. Please note that the traffic is shown in packets per second." -+ echo 'rpackets.label received' -+ echo 'rpackets.type COUNTER' -+ echo 'rpackets.graph no' -+ -+ echo 'rpackets.min 0' -+ echo 'opackets.label pps' -+ echo 'opackets.type COUNTER' -+ echo 'opackets.negative rpackets' -+ -+ echo 'opackets.min 0' -+ echo "opackets.info Packets sent (+) and received (-) on the $INTERFACE network interface." -+ exit 0 -+fi -+ -+if [ "$INTERFACE" = "aggregated" ]; then -+ /usr/bin/netstat -i -b -n | grep -v '^lo' | awk ' -+BEGIN { rsum = 0; osum = 0; } -+// { -+ if (NF == 10) { -+ rsum += $4; osum += $7; -+ } else if (NF == 11) { -+ if ($4 ~ /:/) { -+ rsum += $5; osum += $8; -+ } else { -+ rsum += $4; osum += $8; -+ } -+ } else { # NF == 12 -+ rsum += $6; osum += $9; -+ } -+} -+END { -+ printf "rpackets.value %i\n", rsum; -+ printf "opackets.value %i\n", osum; -+}' -+ -+else -+ /usr/bin/netstat -i -b -n -I $INTERFACE | awk ' -+// { -+ if (NF == 10) { -+ print "rpackets.value", $4; -+ print "opackets.value", $7; -+ } else if (NF == 11) { -+ if ($4 ~ /:/) { -+ print "rpackets.value", $5; -+ print "opackets.value", $8; -+ } else { -+ print "rpackets.value", $4; -+ print "opackets.value", $8; -+ } -+ } else { # NF == 12 -+ print "rpackets.value", $5; -+ print "opackets.value", $9; -+ } -+}' -+fi -+ Property changes on: head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__packets__.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in (revision 465590) +++ head/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in (revision 465591) @@ -1,52 +1,52 @@ ---- plugins/node.d/bind9_rndc.in.orig 2014-11-24 21:46:24 UTC +--- plugins/node.d/bind9_rndc.in.orig 2018-03-25 14:01:24 UTC +++ plugins/node.d/bind9_rndc.in -@@ -63,6 +63,7 @@ use strict; - my $rndc = defined($ENV{rndc}) ? $ENV{rndc} : '/usr/sbin/rndc'; +@@ -65,6 +65,7 @@ my $rndc = defined($ENV{rndc}) ? $ENV{rn + my $rndc_options = defined($ENV{rndc_options}) ? $ENV{rndc_options} : ''; my $querystats = $ENV{querystats} || '/var/run/named.stats'; my %IN; +my @IN_KEYS; # attempt to create log file if it doesn't exist if ( ! -r $querystats ) { -@@ -124,20 +125,13 @@ chomp $line; +@@ -126,20 +127,13 @@ chomp $line; if ($line eq '++ Incoming Requests ++') { # new format - %IN = ( - requests => 0, - responses => 0, - success => 0, - auth_answer => 0, - nonauth_answer => 0, - nxrrset => 0, - failure => 0, - nxdomain => 0, - recursion => 0, - duplicates => 0, - transfers => 0, - rejections => 0, - ); + @IN_KEYS = ('requests', 'responses', 'success', 'auth_answer', + 'nonauth_answer', 'nxrrset', 'failure', 'nxdomain', + 'recursion', 'duplicates', 'transfers', 'rejections'); + %IN = (); + for my $key (@IN_KEYS) { + $IN{$key} = 0; + } # jump to server stats section while ($line ne '++ Name Server Statistics ++') { -@@ -197,11 +191,11 @@ if (defined($ARGV[0]) and ($ARGV[0] eq ' +@@ -199,11 +193,11 @@ if (defined($ARGV[0]) and ($ARGV[0] eq ' print "graph_vlabel queries / \${graph_period}\n"; print "graph_category BIND\n"; - for my $key (keys %IN) { + for my $key (@IN_KEYS) { print "query_$key.label $key\n"; print "query_$key.type DERIVE\n"; print "query_$key.min 0\n"; } } else { - print "query_$_.value $IN{$_}\n" for keys %IN; + print "query_$_.value $IN{$_}\n" for @IN_KEYS; } Index: head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in (revision 465590) +++ head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in (revision 465591) @@ -1,38 +1,38 @@ ---- plugins/node.d/squeezebox_.in.orig 2014-11-24 21:46:24 UTC +--- plugins/node.d/squeezebox_.in.orig 2018-03-25 14:01:24 UTC +++ plugins/node.d/squeezebox_.in @@ -157,7 +157,7 @@ if [ "$CMD" = "years" ]; then printf "graph_order y" echo $years_array | sed 's/ / y/g' - for i in `seq 0 $no_of_years`; do + for i in `jot - 0 $no_of_years`; do year=$(echo ${arr1[$i]}) if [ $year = 0 ]; then echo y0.label No year @@ -172,7 +172,7 @@ if [ "$CMD" = "years" ]; then done exit 0 fi - for i in `seq 0 $no_of_years`; do + for i in `jot - 0 $no_of_years`; do 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 @@ -183,7 +183,7 @@ elif [ "$CMD" = "signalstrength" -o "$CM - echo "graph_category Squeezebox" + echo "graph_category radio" COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3) (( COUNT-- )) - for ID in $(seq 0 $COUNT); do + for ID in $(jot - 0 $COUNT); do 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') @@ -193,7 +193,7 @@ elif [ "$CMD" = "signalstrength" -o "$CM fi COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3) (( COUNT-- )) - for ID in $(seq 0 $COUNT); do + for ID in $(jot - 0 $COUNT); do MAC=$(printf "%b" "player id $ID ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%3A/:/g') VAL=$(printf "%b" "$MAC $CMD ?\nexit\n"| $NC $HOST $PORT | cut -d " " -f 2- | sed "s/$CMD //") MAC2=$(echo $MAC| sed 's/://g') Index: head/sysutils/munin-common/munin.mk =================================================================== --- head/sysutils/munin-common/munin.mk (revision 465590) +++ head/sysutils/munin-common/munin.mk (revision 465591) @@ -1,36 +1,36 @@ -MUNIN_VERSION= 2.0.34 +MUNIN_VERSION= 2.0.36 MUNIN_SITES= http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/ DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files PORTSCOUT= limitw:1,even DBDIR?= /var/${PORTNAME} DBDIRNODE?= /var/${PORTNAME} LOGDIR?= /var/log/${PORTNAME} STATEDIR?= /var/run/${PORTNAME} SPOOLDIR?= /var/spool/${PORTNAME} MUNIN_DIRS= BINDIR=${PREFIX}/bin \ CGIDIR=${PREFIX}/www/cgi-bin \ CONFDIR=${ETCDIR} \ DBDIR=${DBDIR} \ DBDIRNODE=${DBDIRNODE} \ DOCDIR=${DOCSDIR} \ HTMLDIR=${WWWDIR} \ LIBDIR=${DATADIR} \ LOGDIR=${LOGDIR} \ MANDIR=${MANPREFIX}/man \ SBINDIR=${PREFIX}/sbin \ STATEDIR=${STATEDIR} \ SPOOLDIR=${SPOOLDIR} MAKE_ARGS= ${MUNIN_DIRS} \ BASH=${LOCALBASE}/bin/bash \ PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL} USERS= munin GROUPS= munin PLIST_SUB= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS} SUB_LIST= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS} CPE_VENDOR= munin-monitoring MAKE_JOBS_UNSAFE= Try to use things before making thems. Index: head/sysutils/munin-node/Makefile =================================================================== --- head/sysutils/munin-node/Makefile (revision 465590) +++ head/sysutils/munin-node/Makefile (revision 465591) @@ -1,93 +1,92 @@ # Created by: Lupe Christoph # $FreeBSD$ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node MAINTAINER= mat@FreeBSD.org COMMENT= Node-specific part of Munin BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ p5-Net-Server>=0:net/p5-Net-Server \ bash:shells/bash RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ p5-Net-Server>=0:net/p5-Net-Server \ p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \ p5-libwww>=0:www/p5-libwww \ bash:shells/bash USES= gmake perl5 shebangfix cpe PKGMESSAGE= ${WRKDIR}/pkg-message REINPLACE_ARGS= -i "" SHEBANG_FILES= node/bin/munindoc node/sbin/munin-node node/sbin/munin-sched \ node/sbin/munin-run node/sbin/munin-node-configure .include "${.CURDIR}/../munin-common/munin.mk" ALL_TARGET= build-node build-plugins build/node/_bin/munin-async build/node/_bin/munin-asyncd INSTALL_TARGET= install-node-prime install-async-prime install-plugins-prime NO_ARCH= yes OPTIONS_DEFINE= SNMP PERL PYTHON JAVA OPTIONS_DEFAULT= SNMP PERL PYTHON OPTIONS_SUB= yes SNMP_DESC= Include SNMP plugins PERL_DESC= Include all Perl modules (adds dependencies) JAVA_DESC= Include JAVA plugins PYTHON_DESC= Include Python plugins SNMP_BUILD_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP SNMP_RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP PERL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg \ p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-XML-Parser>=0:textproc/p5-XML-Parser \ p5-XML-LibXML>=0:textproc/p5-XML-LibXML PYTHON_USES= python JAVA_USE= java=yes JAVA_INSTALL_TARGET= install-plugins-java JAVA_BUILD= yes JAVA_RUN= yes SUB_FILES= pkg-message plugins.conf USE_RC_SUBR= munin-asyncd munin-node munin-sched post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/node/sbin/munin-node \ ${WRKSRC}/node/sbin/munin-node-configure \ ${WRKSRC}/node/sbin/munin-run @${REINPLACE_CMD} \ -e 's|^\(BASH[[:space:]]*:=\).*|\1 ${bash_CMD}|' \ -e 's|^\(JAVARUN[[:space:]]*:=\).*|\1 ${java_CMD}|' \ -e 's|^\(PERL[[:space:]]*:=\).*|\1 ${perl_CMD}|' \ -e 's|^\(PYTHON[[:space:]]*:=\).*|\1 ${python_CMD}|' \ -e 's|^\(RUBY[[:space:]]*:=\).*|\1 ${ruby_CMD}|' \ ${WRKSRC}/Makefile.config @${FIND} ${WRKSRC}/node/sbin -type f -name "*.orig" -delete post-install: ${REINPLACE_CMD} -i '' -e '1s,${PERL5},${PERL},' ${STAGEDIR}${PREFIX}/bin/munindoc ${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state ${STAGEDIR}${SPOOLDIR}/async ${INSTALL_SCRIPT} ${.CURDIR}/plugins/* ${STAGEDIR}${DATADIR}/plugins/ ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \ ${STAGEDIR}${ETCDIR}/munin-node.conf.sample ${INSTALL_DATA} ${WRKDIR}/plugins.conf \ ${STAGEDIR}${ETCDIR}/plugins.conf.sample (cd ${WRKSRC}/node/blib/bindoc; \ ${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 munin-sched.1 munindoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \ ) (cd ${WRKSRC}/build/doc; \ ${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \ ${INSTALL_MAN} munin.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \ ) ${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-node.newsyslog .include