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 presentdiff -r1.6 -r1.7 pkgsrc/sysutils/munin-common/Makefile.common
(jperkin)
@@ -1,77 +1,77 @@ | @@ -1,77 +1,77 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.6 2021/07/25 13:26:35 tm Exp $ | 1 | # $NetBSD: Makefile.common,v 1.7 2022/04/04 11:45:33 jperkin Exp $ | |
2 | # | 2 | # | |
3 | # used by sysutils/munin-common/Makefile | 3 | # used by sysutils/munin-common/Makefile | |
4 | # used by sysutils/munin-master/Makefile | 4 | # used by sysutils/munin-master/Makefile | |
5 | # used by sysutils/munin-node/Makefile | 5 | # used by sysutils/munin-node/Makefile | |
6 | 6 | |||
7 | VERSION= 2.0.67 | 7 | VERSION= 2.0.69 | |
8 | DISTNAME= munin-${VERSION} | 8 | DISTNAME= munin-${VERSION} | |
9 | CATEGORIES= sysutils | 9 | CATEGORIES= sysutils | |
10 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} | 10 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} | |
11 | 11 | |||
12 | MAINTAINER= tm@NetBSD.org | 12 | MAINTAINER= tm@NetBSD.org | |
13 | HOMEPAGE= http://munin-monitoring.org/ | 13 | HOMEPAGE= http://munin-monitoring.org/ | |
14 | LICENSE= gnu-gpl-v2 | 14 | LICENSE= gnu-gpl-v2 | |
15 | 15 | |||
16 | BUILD_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build | 16 | BUILD_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build | |
17 | DEPENDS= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay | 17 | DEPENDS= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay | |
18 | 18 | |||
19 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo | 19 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo | |
20 | PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/patches | 20 | PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/patches | |
21 | 21 | |||
22 | .include "../../mk/bsd.prefs.mk" | 22 | .include "../../mk/bsd.prefs.mk" | |
23 | 23 | |||
24 | USE_LANGUAGES= # none | 24 | USE_LANGUAGES= # none | |
25 | USE_TOOLS+= gmake bash:run perl:run | 25 | USE_TOOLS+= gmake bash:run perl:run | |
26 | 26 | |||
27 | BUILD_DEFS+= VARBASE | 27 | BUILD_DEFS+= VARBASE | |
28 | 28 | |||
29 | MUNIN_GROUP?= munin | 29 | MUNIN_GROUP?= munin | |
30 | MUNIN_USER?= munin | 30 | MUNIN_USER?= munin | |
31 | 31 | |||
32 | MUNIN_DBDIR?= ${VARBASE}/munin | 32 | MUNIN_DBDIR?= ${VARBASE}/munin | |
33 | MUNIN_LIBDIR= ${PREFIX}/lib/munin | 33 | MUNIN_LIBDIR= ${PREFIX}/lib/munin | |
34 | MUNIN_LOGDIR?= ${VARBASE}/log/munin | 34 | MUNIN_LOGDIR?= ${VARBASE}/log/munin | |
35 | MUNIN_PLUGSTATE?= ${MUNIN_DBDIR}/plugin-state | 35 | MUNIN_PLUGSTATE?= ${MUNIN_DBDIR}/plugin-state | |
36 | MUNIN_SPOOLDIR?= ${VARBASE}/spool/munin | 36 | MUNIN_SPOOLDIR?= ${VARBASE}/spool/munin | |
37 | MUNIN_STATEDIR?= ${VARBASE}/run/munin | 37 | MUNIN_STATEDIR?= ${VARBASE}/run/munin | |
38 | MUNIN_WWWDIR?= ${PREFIX}/www | 38 | MUNIN_WWWDIR?= ${PREFIX}/www | |
39 | 39 | |||
40 | PKG_GROUPS_VARS+= MUNIN_GROUP | 40 | PKG_GROUPS_VARS+= MUNIN_GROUP | |
41 | PKG_USERS_VARS+= MUNIN_USER | 41 | PKG_USERS_VARS+= MUNIN_USER | |
42 | PKG_GROUPS= ${MUNIN_GROUP} | 42 | PKG_GROUPS= ${MUNIN_GROUP} | |
43 | PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP} | 43 | PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP} | |
44 | PKG_GECOS.${MUNIN_USER}= Munin user | 44 | PKG_GECOS.${MUNIN_USER}= Munin user | |
45 | PKG_HOME.${MUNIN_USER}= ${MUNIN_DBDIR} | 45 | PKG_HOME.${MUNIN_USER}= ${MUNIN_DBDIR} | |
46 | PKG_SHELL.${MUNIN_USER}= ${BASH} | 46 | PKG_SHELL.${MUNIN_USER}= ${BASH} | |
47 | 47 | |||
48 | PKG_SYSCONFSUBDIR?= munin | 48 | PKG_SYSCONFSUBDIR?= munin | |
49 | 49 | |||
50 | EGDIR= ${PREFIX}/share/examples/munin | 50 | EGDIR= ${PREFIX}/share/examples/munin | |
51 | 51 | |||
52 | REPLACE_PERL= ${WRKDIR}/${DISTNAME}/master/_bin/munin-update.in | 52 | REPLACE_PERL= ${WRKDIR}/${DISTNAME}/master/_bin/munin-update.in | |
53 | 53 | |||
54 | FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP} | 54 | FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP} | |
55 | FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q} | 55 | FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q} | |
56 | FILES_SUBST+= MUNIN_USER=${MUNIN_USER} | 56 | FILES_SUBST+= MUNIN_USER=${MUNIN_USER} | |
57 | FILES_SUBST+= PERL=${PERL5:Q} | 57 | FILES_SUBST+= PERL=${PERL5:Q} | |
58 | FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} | 58 | FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} | |
59 | FILES_SUBST+= STATEDIR=${STATEDIR} | 59 | FILES_SUBST+= STATEDIR=${STATEDIR} | |
60 | 60 | |||
61 | MAKE_ENV+= PERL_USE_UNSAFE_INC=1 | 61 | MAKE_ENV+= PERL_USE_UNSAFE_INC=1 | |
62 | MAKE_ENV+= BASH=${BASH:Q} | 62 | MAKE_ENV+= BASH=${BASH:Q} | |
63 | MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} | 63 | MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} | |
64 | MAKE_ENV+= MUNIN_DBDIR=${MUNIN_DBDIR} | 64 | MAKE_ENV+= MUNIN_DBDIR=${MUNIN_DBDIR} | |
65 | MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} | 65 | MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} | |
66 | MAKE_ENV+= MUNIN_LOGDIR=${MUNIN_LOGDIR} | 66 | MAKE_ENV+= MUNIN_LOGDIR=${MUNIN_LOGDIR} | |
67 | MAKE_ENV+= MUNIN_PLUGSTATE=${MUNIN_PLUGSTATE} | 67 | MAKE_ENV+= MUNIN_PLUGSTATE=${MUNIN_PLUGSTATE} | |
68 | MAKE_ENV+= MUNIN_SPOOLDIR=${MUNIN_SPOOLDIR} | 68 | MAKE_ENV+= MUNIN_SPOOLDIR=${MUNIN_SPOOLDIR} | |
69 | MAKE_ENV+= MUNIN_STATEDIR=${MUNIN_STATEDIR} | 69 | MAKE_ENV+= MUNIN_STATEDIR=${MUNIN_STATEDIR} | |
70 | MAKE_ENV+= MUNIN_USER=${MUNIN_USER} | 70 | MAKE_ENV+= MUNIN_USER=${MUNIN_USER} | |
71 | MAKE_ENV+= MUNIN_WWWDIR=${MUNIN_WWWDIR} | 71 | MAKE_ENV+= MUNIN_WWWDIR=${MUNIN_WWWDIR} | |
72 | MAKE_ENV+= PERL5=${PERL5:Q} | 72 | MAKE_ENV+= PERL5=${PERL5:Q} | |
73 | MAKE_ENV+= PREFIX=${PREFIX} | 73 | MAKE_ENV+= PREFIX=${PREFIX} | |
74 | MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} | 74 | MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} | |
75 | MAKE_ENV+= RUBY=${RUBY:Q} | 75 | MAKE_ENV+= RUBY=${RUBY:Q} | |
76 | 76 | |||
77 | MESSAGE_SUBST+= MUNIN_USER=${MUNIN_USER} | 77 | MESSAGE_SUBST+= MUNIN_USER=${MUNIN_USER} |
@@ -1,10 +1,12 @@ | @@ -1,10 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2021/10/26 11:19:53 nia Exp $ | 1 | $NetBSD: distinfo,v 1.8 2022/04/04 11:45:33 jperkin Exp $ | |
2 | 2 | |||
3 | BLAKE2s (munin-2.0.67.tar.gz) = 208af60160d6ddfc98ae0d9c711bffce5d2c2c410710ab586a9a9c1fee00b11b | 3 | BLAKE2s (munin-2.0.69.tar.gz) = e1dbd5bf8ad7385c12de8ccfb4807aa2dcd9f2bd697068e8e027ae15fad45bbe | |
4 | SHA512 (munin-2.0.67.tar.gz) = 1f3766b52b99f625ff9cf4d3748a8935abed32b129d2a4714e37118e0116019bee3c1fd0e95da416fb3e39c9be9df17d11bca7f5a835be65ac5147e8b9858417 | 4 | SHA512 (munin-2.0.69.tar.gz) = e79c446d04df97d77b36972203667163ee662e0894e264c5dd84bd9402df780c5e67b69314bfdaddd87f102c4cdedb8fa7d2c07aeea46a8e4e9f08e50a08408f | |
5 | Size (munin-2.0.67.tar.gz) = 2252301 bytes | 5 | Size (munin-2.0.69.tar.gz) = 2250283 bytes | |
6 | SHA1 (patch-MANIFEST) = 538cec30723a6d41b732c9dc4a175472fb821609 | 6 | SHA1 (patch-MANIFEST) = 538cec30723a6d41b732c9dc4a175472fb821609 | |
7 | SHA1 (patch-Makefile) = f3fd52b56fcddda3efca61453c23243fac35568a | 7 | SHA1 (patch-Makefile) = f3fd52b56fcddda3efca61453c23243fac35568a | |
8 | SHA1 (patch-Makefile.config) = aeaae9374c58c6baf1901ddb9b55a8fac77cf30c | 8 | SHA1 (patch-Makefile.config) = aeaae9374c58c6baf1901ddb9b55a8fac77cf30c | |
9 | SHA1 (patch-common_Build.PL) = 7d7f5afde978d0e5641f931d3f2585651ff40c1a | 9 | SHA1 (patch-common_Build.PL) = 7d7f5afde978d0e5641f931d3f2585651ff40c1a | |
10 | SHA1 (patch-lib_Munin_Common_Defaults.pm) = 09b464d828e12da26d8f41916eb876863b4b4cb3 | 10 | SHA1 (patch-common_lib_Munin_Common_Defaults.pm) = 09b464d828e12da26d8f41916eb876863b4b4cb3 | |
11 | SHA1 (patch-plugins_node.d.sunos_if__.in) = 9fe08aebbd759c6fc374e8a43740d28ec8004c90 | |||
12 | SHA1 (patch-plugins_node.d.sunos_if__err__.in) = e905228aa8c5c0d1c3a4d9562d550a0d8c0fbd4c |
$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]
}'