From owner-svn-ports-all@freebsd.org Mon Sep 24 09:31:13 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6CF910A7578; Mon, 24 Sep 2018 09:31:13 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BC177766F5; Mon, 24 Sep 2018 09:31:11 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AEF731786A; Mon, 24 Sep 2018 09:31:11 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8O9VBLJ070169; Mon, 24 Sep 2018 09:31:11 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8O9V9wB070163; Mon, 24 Sep 2018 09:31:09 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201809240931.w8O9V9wB070163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 24 Sep 2018 09:31:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480561 - in head/sysutils: munin-common munin-common/files munin-node X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/sysutils: munin-common munin-common/files munin-node X-SVN-Commit-Revision: 480561 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Sep 2018 09:31:14 -0000 Author: mat Date: Mon Sep 24 09:31:09 2018 New Revision: 480561 URL: https://svnweb.freebsd.org/changeset/ports/480561 Log: Update to 2.0.42. Modified: head/sysutils/munin-common/distinfo (contents, props changed) head/sysutils/munin-common/files/patch-Makefile (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in (contents, props changed) head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in (contents, props changed) head/sysutils/munin-common/munin.mk head/sysutils/munin-node/Makefile (contents, props changed) Modified: head/sysutils/munin-common/distinfo ============================================================================== --- head/sysutils/munin-common/distinfo Mon Sep 24 09:31:05 2018 (r480560) +++ head/sysutils/munin-common/distinfo Mon Sep 24 09:31:09 2018 (r480561) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535967877 -SHA256 (munin-2.0.40.tar.gz) = e05c23ddada2a37ece2d6cd02202c88c981f31f64eba39392eb0d99a793dd28d -SIZE (munin-2.0.40.tar.gz) = 2252288 +TIMESTAMP = 1537780253 +SHA256 (munin-2.0.42.tar.gz) = 0f1b72e5339944b53a01867cdd09d6b399bfe470ea3b16017914e00b4d4ed110 +SIZE (munin-2.0.42.tar.gz) = 2252959 Modified: head/sysutils/munin-common/files/patch-Makefile ============================================================================== --- head/sysutils/munin-common/files/patch-Makefile Mon Sep 24 09:31:05 2018 (r480560) +++ head/sysutils/munin-common/files/patch-Makefile Mon Sep 24 09:31:09 2018 (r480561) @@ -1,4 +1,4 @@ ---- Makefile.orig 2018-08-15 03:16:09 UTC +--- Makefile.orig 2018-09-21 02:11:11 UTC +++ Makefile @@ -93,60 +93,47 @@ install: install-master-prime install-co @@ -155,7 +155,7 @@ install-common-prime: build-common install-common -@@ -515,7 +496,7 @@ t/install: +@@ -516,7 +497,7 @@ t/install: # This builds */Build from Build.PL %/Build: %/Build.PL @@ -164,7 +164,7 @@ build-%: %/Build cd $* && $(PERL) Build -@@ -531,6 +512,7 @@ install-%: %/Build +@@ -532,6 +513,7 @@ install-%: %/Build --install_path script=$(BINDIR) \ --install_path sbin=$(SBINDIR) \ --install_path bindoc=$(MANDIR)/man1 \ Modified: head/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in Mon Sep 24 09:31:05 2018 (r480560) +++ head/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in Mon Sep 24 09:31:09 2018 (r480561) @@ -1,4 +1,4 @@ ---- plugins/node.d/bind9_rndc.in.orig 2018-03-25 14:01:24 UTC +--- plugins/node.d/bind9_rndc.in.orig 2018-09-21 02:11:11 UTC +++ plugins/node.d/bind9_rndc.in @@ -65,6 +65,7 @@ my $rndc = defined($ENV{rndc}) ? $ENV{rn my $rndc_options = defined($ENV{rndc_options}) ? $ENV{rndc_options} : ''; @@ -38,7 +38,7 @@ while ($line ne '++ Name Server Statistics ++') { @@ -199,11 +193,11 @@ if (defined($ARGV[0]) and ($ARGV[0] eq ' print "graph_vlabel queries / \${graph_period}\n"; - print "graph_category BIND\n"; + print "graph_category dns\n"; - for my $key (keys %IN) { + for my $key (@IN_KEYS) { Modified: head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in Mon Sep 24 09:31:05 2018 (r480560) +++ head/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in Mon Sep 24 09:31:09 2018 (r480561) @@ -1,4 +1,4 @@ ---- plugins/node.d/multips_memory.in.orig 2018-07-24 11:34:38 UTC +--- plugins/node.d/multips_memory.in.orig 2018-09-21 02:11:11 UTC +++ plugins/node.d/multips_memory.in @@ -137,7 +137,7 @@ fi for name in $names; do @@ -6,6 +6,6 @@ - ps -eo "$monitor,comm" | gawk ' + ps -eo "$monitor,comm" | awk ' - BEGIN { total = "U"; } # U = Unknown. + BEGIN { total = "U"; } # U = Unknown. /grep/ { next; } $2 ~ /^'"$name"'$/ { total = total + ($1*1024); } Modified: head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in ============================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in Mon Sep 24 09:31:05 2018 (r480560) +++ head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in Mon Sep 24 09:31:09 2018 (r480561) @@ -1,6 +1,6 @@ ---- plugins/node.d/squeezebox_.in.orig 2018-07-24 11:34:38 UTC +--- plugins/node.d/squeezebox_.in.orig 2018-09-21 02:11:11 UTC +++ plugins/node.d/squeezebox_.in -@@ -152,7 +152,7 @@ if [ "$CMD" = "years" ]; then +@@ -153,7 +153,7 @@ if [ "$CMD" = "years" ]; then printf "graph_order y" echo "${years_array// / y}" @@ -9,7 +9,7 @@ year=${arr1[$i]} if [ "$year" = 0 ]; then echo "y0.label No year" -@@ -167,7 +167,7 @@ if [ "$CMD" = "years" ]; then +@@ -168,7 +168,7 @@ if [ "$CMD" = "years" ]; then done exit 0 fi @@ -18,7 +18,7 @@ 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" ] || [ +@@ -180,7 +180,7 @@ elif [ "$CMD" = "signalstrength" ] || [ echo "graph_category radio" 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=${MAC//:/} -@@ -189,7 +189,7 @@ elif [ "$CMD" = "signalstrength" ] || [ +@@ -191,7 +191,7 @@ elif [ "$CMD" = "signalstrength" ] || [ fi COUNT=$(printf "%b" 'player count ?\nexit\n' | "$NC" "$HOST" "$PORT" | cut -d " " -f 3) (( COUNT-- )) Modified: head/sysutils/munin-common/munin.mk ============================================================================== --- head/sysutils/munin-common/munin.mk Mon Sep 24 09:31:05 2018 (r480560) +++ head/sysutils/munin-common/munin.mk Mon Sep 24 09:31:09 2018 (r480561) @@ -1,6 +1,6 @@ LICENSE= GPLv2 -MUNIN_VERSION= 2.0.40 +MUNIN_VERSION= 2.0.42 MUNIN_SITES= http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/ DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/files Modified: head/sysutils/munin-node/Makefile ============================================================================== --- head/sysutils/munin-node/Makefile Mon Sep 24 09:31:05 2018 (r480560) +++ head/sysutils/munin-node/Makefile Mon Sep 24 09:31:09 2018 (r480561) @@ -3,7 +3,6 @@ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} -PORTREVISION= 1 CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node