svn commit: r465591 - in head/sysutils: munin-common munin-common/files munin-node

[Mathieu Arnold]

Author: mat
Date: Mon Mar 26 13:40:01 2018
New Revision: 465591
URL: https://svnweb.freebsd.org/changeset/ports/465591

Log:
  Update to 2.0.36.
  
  Sponsored by:	Absolight

Deleted:
  head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__.in
  head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__errcoll__.in
  head/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__packets__.in
Modified:
  head/sysutils/munin-common/distinfo   (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_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 Mar 26 13:35:06 2018	(r465590)
+++ head/sysutils/munin-common/distinfo	Mon Mar 26 13:40:01 2018	(r465591)
@@ -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

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 Mar 26 13:35:06 2018	(r465590)
+++ head/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in	Mon Mar 26 13:40:01 2018	(r465591)
@@ -1,14 +1,14 @@
---- 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
  
@@ -36,7 +36,7 @@
  
      # 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";
  

Modified: head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in
==============================================================================
--- head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in	Mon Mar 26 13:35:06 2018	(r465590)
+++ head/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in	Mon Mar 26 13:40:01 2018	(r465591)
@@ -1,4 +1,4 @@
---- 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"
@@ -19,7 +19,7 @@
  		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

Modified: head/sysutils/munin-common/munin.mk
==============================================================================
--- head/sysutils/munin-common/munin.mk	Mon Mar 26 13:35:06 2018	(r465590)
+++ head/sysutils/munin-common/munin.mk	Mon Mar 26 13:40:01 2018	(r465591)
@@ -1,4 +1,4 @@
-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

Modified: head/sysutils/munin-node/Makefile
==============================================================================
--- head/sysutils/munin-node/Makefile	Mon Mar 26 13:35:06 2018	(r465590)
+++ head/sysutils/munin-node/Makefile	Mon Mar 26 13:40:01 2018	(r465591)
@@ -3,7 +3,6 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node