munin-common: Update to version 2.0.69.

Patch provided by Steve Mokris in joyent/pkgsrc#330.

munin-2.0.69, 2021-11-22

Lars Kruse (1):
      Fix loading of "local_address" configuration

munin-2.0.68, 2021-11-14

Andreas Perhab (1):
      plugins/postgres_: enable configuring warning/critical

Christoph Moench-Tegeder (2):
      postgres_querylength: catch real statements only
      ntp_: do not mask required variable from Net::IP

Guillaume Rousse (2):
      display locally-defined tresholds
      use dedicated munin SNMP plugin

Kim B. Heino (2):
      plugins/mailman: add missing "graph_category" header
      plugins/postfix_mailqueue: don't run postconf if spooldir-override is defined

Lars Kruse (11):
      Remove obsolete links to old bug tracker ("trac")
      Fix typo
      plugin.sh: remove conversation log regarding shell redirects
      Remove old "authors" file
      Fix typos
      munin-asyncd: use configured update rate if undefined
      Munin::Master::Node: unify configuration access
      munin-run: allow to pass additional arguments to the plugin (#1419)
      Fix homepage link
      fix(postgres_querylength_): fix wrong PostgreSQL version (for 9.4)
      docs: remove stale content from release checklist

Sven Edge (1):
      Handle NVME drives in the Linux iostat plugin (2.0 branch)

Ville Skytt辰 (1):
      Use `grep -E/-F` instead of `egrep` and `fgrep`

wferi (1):
      Use the host-specific local_address configuration if present


(jperkin)

$NetBSD: patch-common_lib_Munin_Common_Defaults.pm,v 1.1 2022/04/04 11:45:33 jperkin Exp $

Initialize default paths for all Munin components.

--- common/lib/Munin/Common/Defaults.pm.orig	2019-05-09 03:45:43.000000000 +0000
+++ common/lib/Munin/Common/Defaults.pm
@@ -18,25 +18,25 @@ my $COMPONENT_ROOT = dirname(__FILE__) .
 our $DROPDOWNLIMIT     = 1;
 
 our $MUNIN_PREFIX     = '';
-our $MUNIN_CONFDIR    = "$COMPONENT_ROOT/t/config/";
+our $MUNIN_CONFDIR    = '@PKG_SYSCONFDIR@/';
 our $MUNIN_BINDIR     = '';
 our $MUNIN_SBINDIR    = '';
 our $MUNIN_DOCDIR     = '';
-our $MUNIN_LIBDIR     = '';
-our $MUNIN_HTMLDIR    = '';
-our $MUNIN_CGIDIR     = '';
+our $MUNIN_LIBDIR     = '@MUNIN_LIBDIR@';
+our $MUNIN_HTMLDIR    = '@MUNIN_WWWDIR@/munin/data';
+our $MUNIN_CGIDIR     = '@MUNIN_WWWDIR@/cgi-bin';
 our $MUNIN_CGITMPDIR     = '';
-our $MUNIN_DBDIR      = '';
-our $MUNIN_PLUGSTATE  = ''; 
+our $MUNIN_DBDIR      = '@MUNIN_DBDIR@';
+our $MUNIN_PLUGSTATE  = '@MUNIN_PLUGSTATE@';
 our $MUNIN_SPOOLDIR   = '';
 our $MUNIN_MANDIR     = '';
-our $MUNIN_LOGDIR     = "$COMPONENT_ROOT/log/";
-our $MUNIN_STATEDIR   = ''; 
+our $MUNIN_LOGDIR     = '@MUNIN_LOGDIR@/';
+our $MUNIN_STATEDIR   = '@MUNIN_STATEDIR@';
 our $MUNIN_USER       = getpwuid $UID;
 our $MUNIN_GROUP      = getgrgid $GID;
 our $MUNIN_PLUGINUSER = getpwuid $UID;
 our $MUNIN_VERSION    = 'svn';
-our $MUNIN_PERL       = '/usr/bin/perl';
+our $MUNIN_PERL       = '@PERL5@';
 our $MUNIN_PERLLIB    = '';
 our $MUNIN_GOODSH     = '';
 our $MUNIN_BASH       = '';

$NetBSD: patch-plugins_node.d.sunos_if__.in,v 1.1 2022/04/04 11:45:33 jperkin Exp $

Fix kstats.

--- plugins/node.d.sunos/if_.in.orig	2021-11-22 22:12:17.000000000 +0000
+++ plugins/node.d.sunos/if_.in
@@ -56,7 +56,7 @@ fi
 
 if [ "$1" = "suggest" ]; then
 	if [ -x /usr/bin/kstat ]; then
-		kstat -p -m '/^(?!unix)/' -n '/^(?!mac$)/' -s rbytes64 | awk -F: '{ print $3 }'
+		kstat -p -s rbytes64 | awk -F: '$3 != "mac" { print $3 }'
 		exit 0
 	else
 		exit 1
@@ -87,5 +87,5 @@ if [ "$1" = "config" ]; then
 	exit 0
 fi;
 
-kstat -p -m '/^(?!unix)/' -n $INTERFACE -s '*bytes64' | sed \
+kstat -p -n $INTERFACE -s '*bytes64' | sed \
 	's/.*\(.bytes\)64./\1.value /'

$NetBSD: patch-plugins_node.d.sunos_if__err__.in,v 1.1 2022/04/04 11:45:33 jperkin Exp $

Fix kstats.

--- plugins/node.d.sunos/if_err_.in.orig	2021-11-22 22:12:17.000000000 +0000
+++ plugins/node.d.sunos/if_err_.in
@@ -56,7 +56,7 @@ fi
 
 if [ "$1" = "suggest" ]; then
 	if [ -x /usr/bin/kstat ]; then
-		kstat -p -m '/^(?!unix)/' -n '/^(?!mac$)/' -s ierrors | awk -F: '{ print $3 }'
+		kstat -p -s ierrors | awk -F: '$1 != "unix" && $3 != "mac" { print $3 }'
 		exit 0
 	else
 		exit 1
@@ -88,8 +88,8 @@ if [ "$1" = "config" ]; then
 	exit 0
 fi
 
-kstat -p -m '/^(?!unix)/' -n $INTERFACE -s '/^([io]errors|collisions)$/' | awk -F: '
-{
+kstat -p -n $INTERFACE -s '/^([io]errors|collisions)$/' | awk -F: '
+$1 != "unix" {
 	split($4, four, "\t")
 	print four[1] ".value", four[2]
 }'