CVS commit: pkgsrc/sysutils/munin-common

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/munin-common
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Mon, 4 Apr 2022 11:45:34 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Apr  4 11:45:34 UTC 2022

Modified Files:
        pkgsrc/sysutils/munin-common: Makefile.common distinfo
Added Files:
        pkgsrc/sysutils/munin-common/patches:
            patch-common_lib_Munin_Common_Defaults.pm
            patch-plugins_node.d.sunos_if__.in
            patch-plugins_node.d.sunos_if__err__.in
Removed Files:
        pkgsrc/sysutils/munin-common/patches:
            patch-lib_Munin_Common_Defaults.pm

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/munin-common/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/munin-common/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/munin-common/patches/patch-common_lib_Munin_Common_Defaults.pm \
    pkgsrc/sysutils/munin-common/patches/patch-plugins_node.d.sunos_if__.in \
    pkgsrc/sysutils/munin-common/patches/patch-plugins_node.d.sunos_if__err__.in
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/sysutils/munin-common/patches/patch-lib_Munin_Common_Defaults.pm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/munin-common/Makefile.common
diff -u pkgsrc/sysutils/munin-common/Makefile.common:1.6 pkgsrc/sysutils/munin-common/Makefile.common:1.7
--- pkgsrc/sysutils/munin-common/Makefile.common:1.6    Sun Jul 25 13:26:35 2021
+++ pkgsrc/sysutils/munin-common/Makefile.common        Mon Apr  4 11:45:33 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.6 2021/07/25 13:26:35 tm Exp $
+# $NetBSD: Makefile.common,v 1.7 2022/04/04 11:45:33 jperkin Exp $
 #
 # used by sysutils/munin-common/Makefile
 # used by sysutils/munin-master/Makefile
 # used by sysutils/munin-node/Makefile
 
-VERSION=       2.0.67
+VERSION=       2.0.69
 DISTNAME=      munin-${VERSION}
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=munin/}

Index: pkgsrc/sysutils/munin-common/distinfo
diff -u pkgsrc/sysutils/munin-common/distinfo:1.7 pkgsrc/sysutils/munin-common/distinfo:1.8
--- pkgsrc/sysutils/munin-common/distinfo:1.7   Tue Oct 26 11:19:53 2021
+++ pkgsrc/sysutils/munin-common/distinfo       Mon Apr  4 11:45:33 2022
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:19:53 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/04/04 11:45:33 jperkin Exp $
 
-BLAKE2s (munin-2.0.67.tar.gz) = 208af60160d6ddfc98ae0d9c711bffce5d2c2c410710ab586a9a9c1fee00b11b
-SHA512 (munin-2.0.67.tar.gz) = 1f3766b52b99f625ff9cf4d3748a8935abed32b129d2a4714e37118e0116019bee3c1fd0e95da416fb3e39c9be9df17d11bca7f5a835be65ac5147e8b9858417
-Size (munin-2.0.67.tar.gz) = 2252301 bytes
+BLAKE2s (munin-2.0.69.tar.gz) = e1dbd5bf8ad7385c12de8ccfb4807aa2dcd9f2bd697068e8e027ae15fad45bbe
+SHA512 (munin-2.0.69.tar.gz) = e79c446d04df97d77b36972203667163ee662e0894e264c5dd84bd9402df780c5e67b69314bfdaddd87f102c4cdedb8fa7d2c07aeea46a8e4e9f08e50a08408f
+Size (munin-2.0.69.tar.gz) = 2250283 bytes
 SHA1 (patch-MANIFEST) = 538cec30723a6d41b732c9dc4a175472fb821609
 SHA1 (patch-Makefile) = f3fd52b56fcddda3efca61453c23243fac35568a
 SHA1 (patch-Makefile.config) = aeaae9374c58c6baf1901ddb9b55a8fac77cf30c
 SHA1 (patch-common_Build.PL) = 7d7f5afde978d0e5641f931d3f2585651ff40c1a
-SHA1 (patch-lib_Munin_Common_Defaults.pm) = 09b464d828e12da26d8f41916eb876863b4b4cb3
+SHA1 (patch-common_lib_Munin_Common_Defaults.pm) = 09b464d828e12da26d8f41916eb876863b4b4cb3
+SHA1 (patch-plugins_node.d.sunos_if__.in) = 9fe08aebbd759c6fc374e8a43740d28ec8004c90
+SHA1 (patch-plugins_node.d.sunos_if__err__.in) = e905228aa8c5c0d1c3a4d9562d550a0d8c0fbd4c

Added files:

Index: pkgsrc/sysutils/munin-common/patches/patch-common_lib_Munin_Common_Defaults.pm
diff -u /dev/null pkgsrc/sysutils/munin-common/patches/patch-common_lib_Munin_Common_Defaults.pm:1.1
--- /dev/null   Mon Apr  4 11:45:34 2022
+++ pkgsrc/sysutils/munin-common/patches/patch-common_lib_Munin_Common_Defaults.pm      Mon Apr  4 11:45:33 2022
@@ -0,0 +1,41 @@
+$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       = '';
Index: pkgsrc/sysutils/munin-common/patches/patch-plugins_node.d.sunos_if__.in
diff -u /dev/null pkgsrc/sysutils/munin-common/patches/patch-plugins_node.d.sunos_if__.in:1.1
--- /dev/null   Mon Apr  4 11:45:34 2022
+++ pkgsrc/sysutils/munin-common/patches/patch-plugins_node.d.sunos_if__.in     Mon Apr  4 11:45:33 2022
@@ -0,0 +1,22 @@
+$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 /'
Index: pkgsrc/sysutils/munin-common/patches/patch-plugins_node.d.sunos_if__err__.in
diff -u /dev/null pkgsrc/sysutils/munin-common/patches/patch-plugins_node.d.sunos_if__err__.in:1.1
--- /dev/null   Mon Apr  4 11:45:34 2022
+++ pkgsrc/sysutils/munin-common/patches/patch-plugins_node.d.sunos_if__err__.in        Mon Apr  4 11:45:33 2022
@@ -0,0 +1,26 @@
+$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]
+ }'

Prev by Date: CVS commit: pkgsrc/mk/pkgformat/pkg
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/mk/pkgformat/pkg
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index