Index: head/sysutils/munin-common/Makefile =================================================================== --- head/sysutils/munin-common/Makefile (revision 476508) +++ head/sysutils/munin-common/Makefile (revision 476509) @@ -1,28 +1,28 @@ # Created by: Sean Rees # $FreeBSD$ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -common MAINTAINER= mat@FreeBSD.org COMMENT= Common components between a munin node and server BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \ p5-Net-SSLeay>=0:security/p5-Net-SSLeay RUN_DEPENDS= p5-Net-SSLeay>=0:security/p5-Net-SSLeay USES= gmake perl5 cpe .include "${.CURDIR}/../munin-common/munin.mk" -ALL_TARGET= build-common-prime +ALL_TARGET= build-common INSTALL_TARGET= install-common NO_ARCH= yes post-install: ${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR} ${STAGEDIR}${DBDIR} .include Index: head/sysutils/munin-common/distinfo =================================================================== --- head/sysutils/munin-common/distinfo (revision 476508) +++ head/sysutils/munin-common/distinfo (revision 476509) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530519300 -SHA256 (munin-2.0.38.tar.gz) = ee44c8c5e0a0a08c0378a7bd324b3bfa50bf84eef77760d2c20c21059fdb3099 -SIZE (munin-2.0.38.tar.gz) = 2246848 +TIMESTAMP = 1533554476 +SHA256 (munin-2.0.39.tar.gz) = f2d5a84152f8d10b9694ed70efbdacb9312b79e8ef272ea3e669ae356749fb96 +SIZE (munin-2.0.39.tar.gz) = 2249240 Index: head/sysutils/munin-common/files/patch-Makefile =================================================================== --- head/sysutils/munin-common/files/patch-Makefile (revision 476508) +++ head/sysutils/munin-common/files/patch-Makefile (revision 476509) @@ -1,174 +1,174 @@ ---- Makefile.orig 2018-06-29 00:50:01 UTC +--- Makefile.orig 2018-07-24 11:34:38 UTC +++ Makefile -@@ -68,60 +68,47 @@ install: install-master-prime install-co +@@ -93,60 +93,47 @@ install: install-master-prime install-co install-pre: Makefile Makefile.config @$(CHECKUSER) - mkdir -p $(LOGDIR) - mkdir -p $(STATEDIR) - mkdir -p $(SPOOLDIR) - mkdir -p $(CONFDIR) - $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) + mkdir -p $(DESTDIR)$(CONFDIR) install-master-prime: $(INFILES_MASTER) install-pre install-master - mkdir -p $(CONFDIR)/templates - mkdir -p $(CONFDIR)/static - mkdir -p $(CONFDIR)/templates/partial - mkdir -p $(CONFDIR)/munin-conf.d - mkdir -p $(LIBDIR) - mkdir -p $(BINDIR) - mkdir -p $(PERLLIB) - mkdir -p $(PERLLIB)/Munin/Master - mkdir -p $(HTMLDIR) - mkdir -p $(DBDIR) - mkdir -p $(DBDIR)/cgi-tmp - mkdir -p $(CGIDIR) - - $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) - $(CHMOD) 0755 $(DBDIR) - - $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp - $(CHMOD) 0755 $(DBDIR)/cgi-tmp + mkdir -p $(DESTDIR)$(CONFDIR)/templates + mkdir -p $(DESTDIR)$(CONFDIR)/static + mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial + mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(HTMLDIR) + mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp + mkdir -p $(DESTDIR)$(CGIDIR) for p in master/www/*.tmpl ; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ + $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ done for p in master/static/* ; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \ + $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/static/ ; \ done for p in master/www/partial/*.tmpl; do \ - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ + $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \ done - $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/ - $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/ + $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0644 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/ - test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess - test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ + $(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess + $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(LIBDIR)/ - $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/munin-cgi-graph - $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(CGIDIR)/munin-cgi-html + $(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/munin-cgi-graph + $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(DESTDIR)$(CGIDIR)/munin-cgi-html # Not ready to be installed yet # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ -@@ -131,36 +118,30 @@ install-node-plugins: install-plugins-pr +@@ -156,36 +143,30 @@ install-node-plugins: install-plugins-pr install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config @$(CHECKGROUP) - mkdir -p $(CONFDIR)/plugins - mkdir -p $(CONFDIR)/plugin-conf.d - mkdir -p $(LIBDIR)/plugins - mkdir -p $(PLUGSTATE) - - $(CHOWN) root:root $(PLUGSTATE) - $(CHMOD) 0755 $(PLUGSTATE) - $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d + mkdir -p $(DESTDIR)$(CONFDIR)/plugins + mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d + mkdir -p $(DESTDIR)$(LIBDIR)/plugins + mkdir -p $(DESTDIR)$(PLUGSTATE) @# Process the OS specific plugins at the end. Otherwise they would be overridden by the @# generic ones. for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ - if test -f "$$p" ; then \ - echo Installing $$p; \ -- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ -+ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ - fi \ + if test -f "$$p"; then \ + echo Installing $$p; \ +- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ ++ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ + fi \ done - @# Some HP-UX plugins need *.adv support files in LIBDIR -- if [ "$(OSTYPE)" = "hp-ux" ]; then mv $(LIBDIR)/plugins/*.adv $(LIBDIR); done +- if [ "$(OSTYPE)" = "hp-ux" ]; then mv $(LIBDIR)/plugins/*.adv $(LIBDIR); fi - $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ - $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ + $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ + $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ install-plugins-java: build-plugins-java - mkdir -p $(JAVALIBDIR) - $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/ - mkdir -p $(LIBDIR)/plugins + mkdir -p $(DESTDIR)$(JAVALIBDIR) + $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/ + mkdir -p $(DESTDIR)$(LIBDIR)/plugins - for p in build/plugins/node.d.java/*; do \ - if test -f "$$p" ; then \ - echo Installing $$p; \ -- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ -+ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ - fi \ + for p in build/plugins/node.d.java/*; do \ + if test -f "$$p"; then \ + echo Installing $$p; \ +- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ ++ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ + fi \ done -@@ -171,14 +152,14 @@ install-plugins-java: build-plugins-java +@@ -196,14 +177,14 @@ install-plugins-java: build-plugins-java install-async-prime: install-async install-async: - mkdir -p $(LIBDIR) - $(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/ - $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/ + mkdir -p $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 0755 build/node/_bin/munin-async $(DESTDIR)$(LIBDIR)/ + $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(DESTDIR)$(LIBDIR)/ install-node-prime: install-node-pre install-node install-node-pre: build/node/munin-node.conf install-pre - test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ + test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ install-common-prime: build-common install-common -@@ -444,7 +425,7 @@ t/install: +@@ -491,7 +472,7 @@ t/install: # This builds */Build from Build.PL %/Build: %/Build.PL - cd $* && $(PERL) Build.PL + cd $* && $(PERL) Build.PL --config perl=$(PERL) build-%: %/Build cd $* && $(PERL) Build -@@ -461,6 +442,7 @@ install-%: %/Build - --install_path sbin=$(SBINDIR) \ - --install_path bindoc=$(MANDIR)/man1 \ - --install_path libdoc=$(MANDIR)/man3 \ -+ --destdir=$(DESTDIR) +@@ -507,6 +488,7 @@ install-%: %/Build + --install_path script=$(BINDIR) \ + --install_path sbin=$(SBINDIR) \ + --install_path bindoc=$(MANDIR)/man1 \ ++ --destdir=$(DESTDIR) \ + --install_path libdoc=$(MANDIR)/man3 test-%: %/Build - cd $* && $(PERL) Build test --verbose=0 || true Index: head/sysutils/munin-common/files/patch-Makefile.config =================================================================== --- head/sysutils/munin-common/files/patch-Makefile.config (revision 476508) +++ head/sysutils/munin-common/files/patch-Makefile.config (revision 476509) @@ -1,105 +1,105 @@ ---- Makefile.config.orig 2014-11-24 21:46:24 UTC +--- Makefile.config.orig 2018-07-24 11:34:38 UTC +++ Makefile.config @@ -17,62 +17,62 @@ # # the base of the Munin installation. # -PREFIX = $(DESTDIR)/opt/munin +PREFIX ?= $(DESTDIR)/opt/munin # Where Munin keeps its configurations (server.conf, client.conf, ++) -CONFDIR = $(DESTDIR)/etc/opt/munin +CONFDIR ?= $(DESTDIR)/etc/opt/munin # Server only - where to put munin-cron -BINDIR = $(PREFIX)/bin +BINDIR ?= $(PREFIX)/bin # Client only - where to put munin-node, munin-node-configure, and munin-run -SBINDIR = $(PREFIX)/sbin +SBINDIR ?= $(PREFIX)/sbin # Where to put text and html documentation -DOCDIR = $(PREFIX)/doc +DOCDIR ?= $(PREFIX)/doc # Where to put man pages -MANDIR = $(PREFIX)/man +MANDIR ?= $(PREFIX)/man # Where to put internal binaries and plugin repository -LIBDIR = $(PREFIX)/lib +LIBDIR ?= $(PREFIX)/lib # Server only - Output directory -HTMLDIR = $(PREFIX)/www/docs -CGIDIR = $(PREFIX)/www/cgi +HTMLDIR ?= $(PREFIX)/www/docs +CGIDIR ?= $(PREFIX)/www/cgi # Where to put internal data for master (RRD, internal files, ...) -DBDIR = $(DESTDIR)/var/opt/munin +DBDIR ?= $(DESTDIR)/var/opt/munin # Where to put internal data for node (plugin state, ...) -DBDIRNODE = $(DESTDIR)/var/opt/munin-node +DBDIRNODE ?= $(DESTDIR)/var/opt/munin-node # Client only - Where the spool files are written. Must be writable by # group "munin", and should be preserved between reboots -SPOOLDIR = $(DBDIR)/spool +SPOOLDIR ?= $(DBDIR)/spool # Client only - Where plugins should put their states. Must be writable by # group "munin", and should be preserved between reboots -PLUGSTATE = $(DBDIRNODE)/plugin-state +PLUGSTATE ?= $(DBDIRNODE)/plugin-state # Where Munin should place its logs. -LOGDIR = $(PREFIX)/log/munin +LOGDIR ?= $(PREFIX)/log/munin # Location of PID files and other statefiles. On the server, must be # writable by the user "munin". -STATEDIR = $(DESTDIR)/var/run/munin +STATEDIR ?= $(DESTDIR)/var/run/munin # The perl interpreter to use -PERL := $(shell which perl) +PERL := /usr/local/bin/perl # The python interpreter to use (used by some plugins) -PYTHON := /usr/bin/env python3 +PYTHON := /usr/local/bin/python # The ruby interpreter to use (used by some plugins) -RUBY := /usr/bin/env ruby +RUBY := /usr/local/bin/ruby # The java runtime to use (used by some plugins) -JAVARUN := /usr/bin/java +JAVARUN := /usr/local/bin/java # The java library dir to use (used by some plugins) # this is needed in order to be able to install @@ -92,7 +92,7 @@ JAVALIBDIR = $(LIBDIR) GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` LANG=C sh -c 'type sh | sed "s/.* //"') # Path of bash for bash specific plugins -BASH := /bin/bash +BASH := /usr/local/bin/bash # Server only - Where to install the perl libraries - PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) -@@ -129,9 +129,8 @@ CGIUSER := nobody + PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2) +@@ -128,9 +128,8 @@ CGIUSER := nobody # Which command to use to check if the USER and GROUP to run Munin as, exists. # These will work on most modern OSes: # -GETENT := $(shell which getent || which true 2>/dev/null) -CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) -CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2")) # For OSX, comment out the previous two lines and comment in these # Index: head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in (revision 476508) +++ head/sysutils/munin-common/files/patch-plugins_node.d_multiping.in (revision 476509) @@ -1,10 +1,10 @@ ---- plugins/node.d/multiping.in.orig 2014-11-24 21:46:24 UTC +--- plugins/node.d/multiping.in.orig 2018-07-24 11:34:38 UTC +++ plugins/node.d/multiping.in -@@ -59,6 +59,7 @@ if [ -z "$host" ]; then - host=${host:-${file_host:-www.google.com}} - fi +@@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fi + host=${host:-www.google.com} + +site=0 if [ "$1" = "config" ]; then echo graph_title Ping times echo 'graph_args --base 1000 -l 0' Index: head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in (revision 476508) +++ head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in (revision 476509) @@ -1,11 +1,11 @@ ---- plugins/node.d/multips_memory.in.orig 2017-01-18 20:25:20 UTC +--- plugins/node.d/multips_memory.in.orig 2018-07-24 11:34:38 UTC +++ plugins/node.d/multips_memory.in @@ -137,7 +137,7 @@ fi for name in $names; do fieldname="$(clean_fieldname "$name")" -- ps -eo $monitor,comm | gawk ' -+ ps -eo $monitor,comm | awk ' +- ps -eo "$monitor,comm" | gawk ' ++ ps -eo "$monitor,comm" | awk ' BEGIN { total = "U"; } # U = Unknown. /grep/ { next; } $2 ~ /^'"$name"'$/ { total = total + ($1*1024); } Index: head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in (revision 476508) +++ head/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in (revision 476509) @@ -1,67 +1,31 @@ ---- plugins/node.d/nutups_.in.orig 2014-11-24 21:46:24 UTC +--- plugins/node.d/nutups_.in.orig 2018-07-24 11:34:38 UTC +++ plugins/node.d/nutups_.in -@@ -7,20 +7,25 @@ +@@ -7,21 +7,25 @@ # - # usage: ups_upsid_function + # usage: nutups_upsid_function # +# env.upsc (default: "/bin/upsc") +# env.upsconf (default: "/etc/nut/ups.conf") +# #%# family=contrib #%# capabilities=autoconf suggest - UPS=$(basename $0 | cut -d_ -f2) - FUNCTION=$(basename $0 | cut -d_ -f3) -+UPSC=${upsc:-/bin/upsc} + UPS=$(basename "$0" | cut -d_ -f2) + FUNCTION=$(basename "$0" | cut -d_ -f3) + UPSC=$(command -v upsc) +UPSCONF=${upsconf:-/etc/nut/ups.conf} if [ "$1" = "autoconf" ]; then -- [ -x /bin/upsc ] && [ -r /etc/nut/ups.conf ] && echo yes && exit 0 -- echo "no (/bin/upsc or /etc/nut/ups.conf not found)" -+ [ -x $UPSC ] && [ -r $UPSCONF ] && echo yes && exit 0 +- [ -x "$UPSC" ] && [ -r /etc/nut/ups.conf ] && echo yes && exit 0 +- echo "no (upsc or /etc/nut/ups.conf not found)" ++ [ -x "$UPSC" ] && [ -r "$UPSCONF" ] && echo yes && exit 0 + echo "no ($UPSC or $UPSCONF not found)" exit 0 fi if [ "$1" = "suggest" ]; then - grep '^\[[^]]*\]$' /etc/nut/ups.conf \ -+ grep '^\[[^]]*\]$' $UPSCONF \ ++ grep '^\[[^]]*\]$' "$UPSCONF" \ | tr -d '][' \ - | while read ups; do + | while read -r ups; do for i in voltages freq charge current; do -@@ -42,7 +47,7 @@ voltages() { - echo "${i}.min 0" - done - else -- upsc $UPS | sed -n '/volt/{ -+ $UPSC $UPS | sed -n '/volt/{ - s/:// - /nominal/s/.* /nominal.value / - /voltage/s/\.[^ ]*/.value/ -@@ -64,7 +69,7 @@ charge() { - echo "${i}.min 0" - done - else -- upsc $UPS | sed -n '/charge/{ -+ $UPSC $UPS | sed -n '/charge/{ - s/^[^:]*\.//g - s/:/.value/ - p -@@ -87,7 +92,7 @@ frequency() { - echo "acfreq.max 100" - echo "acfreq.min 5" - else -- upsc $UPS | sed -n '/freq/{s/.*:/acfreq.value/;p}' -+ $UPSC $UPS | sed -n '/freq/{s/.*:/acfreq.value/;p}' - fi - } - -@@ -102,7 +107,7 @@ current() { - echo "current.max 100" - echo "current.min 0" - else -- upsc $UPS | sed -n '/current/{s/.*:/current.value/;p}' -+ $UPSC $UPS | sed -n '/current/{s/.*:/current.value/;p}' - fi - } - Index: head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in (revision 476508) +++ head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in (revision 476509) @@ -1,38 +1,38 @@ ---- plugins/node.d/squeezebox_.in.orig 2018-03-25 14:01:24 UTC +--- plugins/node.d/squeezebox_.in.orig 2018-07-24 11:34:38 UTC +++ plugins/node.d/squeezebox_.in -@@ -157,7 +157,7 @@ if [ "$CMD" = "years" ]; then +@@ -152,7 +152,7 @@ if [ "$CMD" = "years" ]; then printf "graph_order y" - echo $years_array | sed 's/ / y/g' + echo "${years_array// / y}" -- 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 +- for i in $(seq 0 "$no_of_years"); do ++ for i in $(jot - 0 "$no_of_years"); do + year=${arr1[$i]} + if [ "$year" = 0 ]; then + echo "y0.label No year" +@@ -167,7 +167,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=${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 +@@ -178,7 +178,7 @@ elif [ "$CMD" = "signalstrength" ] || [ echo "graph_category radio" - COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3) + 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 +- 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=${MAC//:/} +@@ -189,7 +189,7 @@ elif [ "$CMD" = "signalstrength" ] || [ fi - COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3) + 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') +- 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=${MAC//:/} Index: head/sysutils/munin-common/munin.mk =================================================================== --- head/sysutils/munin-common/munin.mk (revision 476508) +++ head/sysutils/munin-common/munin.mk (revision 476509) @@ -1,38 +1,38 @@ LICENSE= GPLv2 -MUNIN_VERSION= 2.0.38 +MUNIN_VERSION= 2.0.39 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.