update to munin-2.0.39

This commit is contained in:
kirby 2018-07-26 19:17:44 +00:00
parent 54e5d34989
commit 7c5dabbb7c
13 changed files with 106 additions and 119 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.70 2018/07/01 15:02:36 kirby Exp $
# $OpenBSD: Makefile,v 1.71 2018/07/26 19:17:44 kirby Exp $
PORTROACH = limitw:1,even
COMMENT-main = flexible network host monitoring, client
COMMENT-server =flexible network host monitoring, server
V = 2.0.38
V = 2.0.39
DISTNAME = munin-$V
PKGNAME-main = munin-node-$V
PKGNAME-server =munin-server-$V

View File

@ -1,2 +1,2 @@
SHA256 (munin-2.0.38.tar.gz) = 7kTIxeCgoIwDeKe9Mks7+lC/hO73d2DSwgwhBZ/bMJk=
SIZE (munin-2.0.38.tar.gz) = 2246848
SHA256 (munin-2.0.39.tar.gz) = 8tWoQVL40QuWlO1w772suTEreejvJy6j5mmuNWdJ+5Y=
SIZE (munin-2.0.39.tar.gz) = 2249240

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile,v 1.9 2018/07/01 15:02:36 kirby Exp $
$OpenBSD: patch-Makefile,v 1.10 2018/07/26 19:17:44 kirby Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -72,7 +72,6 @@ install-pre: Makefile Makefile.config
@@ -97,7 +97,6 @@ install-pre: Makefile Makefile.config
mkdir -p $(STATEDIR)
mkdir -p $(SPOOLDIR)
mkdir -p $(CONFDIR)
@ -10,7 +10,7 @@ Index: Makefile
install-master-prime: $(INFILES_MASTER) install-pre install-master
mkdir -p $(CONFDIR)/templates
@@ -84,15 +83,15 @@ install-master-prime: $(INFILES_MASTER) install-pre in
@@ -109,15 +108,15 @@ install-master-prime: $(INFILES_MASTER) install-pre in
mkdir -p $(PERLLIB)
mkdir -p $(PERLLIB)/Munin/Master
mkdir -p $(HTMLDIR)
@ -32,7 +32,7 @@ Index: Makefile
for p in master/www/*.tmpl ; do \
$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
@@ -134,10 +133,10 @@ install-plugins-prime: install-plugins build $(PLUGINS
@@ -159,10 +158,10 @@ install-plugins-prime: install-plugins build $(PLUGINS
mkdir -p $(CONFDIR)/plugins
mkdir -p $(CONFDIR)/plugin-conf.d
mkdir -p $(LIBDIR)/plugins
@ -46,21 +46,12 @@ Index: Makefile
$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
@@ -149,7 +148,7 @@ install-plugins-prime: install-plugins build $(PLUGINS
fi \
done
@# Some HP-UX plugins need *.adv support files in LIBDIR
- if [ "$(OSTYPE)" = "hp-ux" ]; then mv $(LIBDIR)/plugins/*.adv $(LIBDIR); done
+ if [ "$(OSTYPE)" = "hp-ux" ]; then mv $(LIBDIR)/plugins/*.adv $(LIBDIR); fi
$(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
$(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
@@ -460,7 +459,7 @@ install-%: %/Build
--install_path script=$(BINDIR) \
--install_path sbin=$(SBINDIR) \
--install_path bindoc=$(MANDIR)/man1 \
- --install_path libdoc=$(MANDIR)/man3 \
+ --install_path libdoc=$(MANDIR)/man3p \
@@ -507,7 +506,7 @@ install-%: %/Build
--install_path script=$(BINDIR) \
--install_path sbin=$(SBINDIR) \
--install_path bindoc=$(MANDIR)/man1 \
- --install_path libdoc=$(MANDIR)/man3
+ --install_path libdoc=$(MANDIR)/man3p
test-%: %/Build
cd $* && $(PERL) Build test --verbose=0 || true

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile_config,v 1.4 2018/07/01 15:02:36 kirby Exp $
$OpenBSD: patch-Makefile_config,v 1.5 2018/07/26 19:17:44 kirby Exp $
Index: Makefile.config
--- Makefile.config.orig
+++ Makefile.config
@ -61,7 +61,7 @@ Index: Makefile.config
# Location of PID files and other statefiles. On the server, must be
# writable by the user "munin".
@@ -106,7 +109,7 @@ OSTYPE := $(shell uname | LANG=C tr '[A-Z]' '[a-z]
@@ -105,7 +108,7 @@ OSTYPE := $(shell uname | LANG=C tr '[A-Z]' '[a-z]
# How to figure out the hostname. (Only used in default configuration
# files)
@ -70,7 +70,7 @@ Index: Makefile.config
# What is the safest way to create a tempfile.
# Default is to figure it out by testing various methods.
@@ -117,8 +120,8 @@ MKTEMP := $(shell ./test-mktemp)
@@ -116,8 +119,8 @@ MKTEMP := $(shell ./test-mktemp)
VERSION := $(shell ./getversion)
# User to run munin as
@ -81,7 +81,7 @@ Index: Makefile.config
# Default user to run the plugins as
PLUGINUSER := nobody
@@ -130,8 +133,8 @@ CGIUSER := nobody
@@ -129,8 +132,8 @@ CGIUSER := nobody
# These will work on most modern OSes:
#
GETENT := $(shell which getent || which true 2>/dev/null)

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-node__bin_munin-asyncd_in,v 1.2 2016/11/03 07:45:29 kirby Exp $
--- node/_bin/munin-asyncd.in.orig Fri Sep 9 21:42:23 2016
+++ node/_bin/munin-asyncd.in Thu Nov 3 09:33:56 2016
@@ -279,7 +279,7 @@ munin-asyncd [options]
$OpenBSD: patch-node__bin_munin-asyncd_in,v 1.3 2018/07/26 19:17:44 kirby Exp $
Index: node/_bin/munin-asyncd.in
--- node/_bin/munin-asyncd.in.orig
+++ node/_bin/munin-asyncd.in
@@ -283,7 +283,7 @@ munin-asyncd [options]
Options:
--host <hostname:port> Connect to this munin-node [localhost:4949]

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-plugins_node_d_amavis_in,v 1.2 2012/10/12 09:46:46 kirby Exp $
--- plugins/node.d/amavis.in.orig Tue Oct 2 23:46:50 2012
+++ plugins/node.d/amavis.in Tue Oct 9 22:03:32 2012
$OpenBSD: patch-plugins_node_d_amavis_in,v 1.3 2018/07/26 19:17:44 kirby Exp $
Index: plugins/node.d/amavis.in
--- plugins/node.d/amavis.in.orig
+++ plugins/node.d/amavis.in
@@ -20,11 +20,11 @@ The configuration environment variables are available
=item amavislog
@ -26,14 +27,9 @@ $OpenBSD: patch-plugins_node_d_amavis_in,v 1.2 2012/10/12 09:46:46 kirby Exp $
group adm
=head1 INTERPRETATION
@@ -77,12 +77,11 @@ GPLv2
@@ -74,8 +74,8 @@ GPLv2
=cut
mktempfile () {
- cmd=`echo $MUNIN_MKTEMP | sed s/\\$1/$1/`
- $cmd
+ @@MKTEMP@@
}
-AMAVIS_LOG=${amavislog:-/var/log/mail/mail.info}
-LOGTAIL=${logtail:-logtail}

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-plugins_node_d_courier__in,v 1.2 2012/10/12 09:46:46 kirby Exp $
--- plugins/node.d/courier_.in.orig Fri Aug 31 19:22:50 2012
+++ plugins/node.d/courier_.in Sun Sep 30 23:19:14 2012
$OpenBSD: patch-plugins_node_d_courier__in,v 1.3 2018/07/26 19:17:44 kirby Exp $
Index: plugins/node.d/courier_.in
--- plugins/node.d/courier_.in.orig
+++ plugins/node.d/courier_.in
@@ -27,8 +27,8 @@ variable to "imaplogin" and "courierpop3login", respec
The default configuration is:
@ -18,10 +19,10 @@ $OpenBSD: patch-plugins_node_d_courier__in,v 1.2 2012/10/12 09:46:46 kirby Exp $
# Set the location of the courier logs
-COURIER_LOG=${logfile:-/var/log/mail.log}
+COURIER_LOG=${logfile:-/var/log/maillog}
SERVICE=${service:-`basename $0 | sed 's/^courier_//g'`}
SERVICE=${service:-$(basename "$0" | sed 's/^courier_//g')}
OFFSET_FILE=${MUNIN_PLUGSTATE}/courier_${SERVICE}.offset
-LOGTAIL=${logtail:-/usr/sbin/logtail}
+LOGTAIL=${logtail:-/usr/local/bin/logtail}
mktempfile () {
@@MKTEMP@@
case $1 in

View File

@ -1,8 +1,9 @@
$OpenBSD: patch-plugins_node_d_named_in,v 1.1 2010/10/23 15:52:23 sthen Exp $
--- plugins/node.d/named.in.orig Sat Oct 23 12:25:39 2010
+++ plugins/node.d/named.in Sat Oct 23 12:25:42 2010
@@ -74,8 +74,8 @@ munin-node.
if [ -n "$logfile" ]; then
$OpenBSD: patch-plugins_node_d_named_in,v 1.2 2018/07/26 19:17:44 kirby Exp $
Index: plugins/node.d/named.in
--- plugins/node.d/named.in.orig
+++ plugins/node.d/named.in
@@ -75,8 +75,8 @@ munin-node.
if [ -n "${logfile:-}" ]; then
SYSLOGFILE=$logfile
else
- if [ -f /var/adm/messages ]; then

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-plugins_node_d_perdition_in,v 1.2 2012/10/12 09:46:46 kirby Exp $
--- plugins/node.d/perdition.in.orig Fri Aug 31 19:22:50 2012
+++ plugins/node.d/perdition.in Sun Sep 30 23:27:43 2012
$OpenBSD: patch-plugins_node_d_perdition_in,v 1.3 2018/07/26 19:17:44 kirby Exp $
Index: plugins/node.d/perdition.in
--- plugins/node.d/perdition.in.orig
+++ plugins/node.d/perdition.in
@@ -12,7 +12,7 @@ perdition - Plugin to graph perdition connections and
The following configuration variables are available for this plugin:
@ -10,7 +11,7 @@ $OpenBSD: patch-plugins_node_d_perdition_in,v 1.2 2012/10/12 09:46:46 kirby Exp
=head1 DEPENDENCIES
@@ -56,7 +56,7 @@ mktempfile () {
@@ -53,7 +53,7 @@ Unknown
# Set the location of the perdition logs
PERDITION_LOG=${logfile:-/var/log/perdition.log}
OFFSET_FILE=${MUNIN_PLUGSTATE}/perdition.offset

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-plugins_node_d_sendmail_mailqueue_in,v 1.2 2012/10/12 09:46:46 kirby Exp $
--- plugins/node.d/sendmail_mailqueue.in.orig Fri Aug 31 19:22:50 2012
+++ plugins/node.d/sendmail_mailqueue.in Sun Sep 30 23:19:21 2012
$OpenBSD: patch-plugins_node_d_sendmail_mailqueue_in,v 1.3 2018/07/26 19:17:44 kirby Exp $
Index: plugins/node.d/sendmail_mailqueue.in
--- plugins/node.d/sendmail_mailqueue.in.orig
+++ plugins/node.d/sendmail_mailqueue.in
@@ -38,7 +38,7 @@ GPLv2
=cut
-MSP_QUEUE=/var/spool/mqueue-client
+MSP_QUEUE=/var/spool/clientmqueue
MTA_QUEUE=/var/spool/mqueue
if [ "$mspqueue" ]; then MSP_QUEUE=$mspqueue ; fi
if [ "$mtaqueue" ]; then MTA_QUEUE=$mtaqueue ; fi
-MSP_QUEUE=${mspqueue:-/var/spool/mqueue-client}
+MSP_QUEUE=${mspqueue:-/var/spool/clientmqueue}
MTA_QUEUE=${mtaqueue:-/var/spool/mqueue}
if [ "$1" = "autoconf" ]; then

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-plugins_node_d_squeezebox__in,v 1.4 2018/04/01 08:21:01 kirby Exp $
$OpenBSD: patch-plugins_node_d_squeezebox__in,v 1.5 2018/07/26 19:17:44 kirby Exp $
seq -> jot (handily avoiding the need for bashisms)
correct nc path
@ -13,49 +13,47 @@ Index: plugins/node.d/squeezebox_.in
: <<=cut
@@ -146,7 +146,6 @@ if [ "$CMD" = "years" ]; then
no_of_years=$(printf "%b" "years\nexit\n" | $NC $HOST $PORT | sed 's/%3A/:/g' | cut -d ':' -f 2)
years_array=$(printf "%b" "years 0 $no_of_years\nexit\n" | $NC $HOST $PORT | sed 's/%3A/:/g' | cut -d ' ' -f 4- | sed 's/year://g' | cut -d ' ' -f -$no_of_years)
arr1=( `echo "$years_array" | tr -s ' ' ' '` )
@@ -141,7 +141,6 @@ if [ "$CMD" = "years" ]; then
years_array=$(printf "%b" "years 0 $no_of_years\\nexit\\n" | "$NC" "$HOST" "$PORT" | sed 's/%3A/:/g' | cut -d ' ' -f 4- | sed 's/year://g' | cut -d ' ' -f "-$no_of_years")
# shellcheck disable=SC2207
arr1=( $(echo "$years_array" | tr -s ' ' ' ') )
- (( no_of_years-- )) # We don't need that last entry in the array
if [ "$1" = "config" ]; then
echo "graph_title Number of years"
echo "graph_category radio"
@@ -157,7 +156,7 @@ if [ "$CMD" = "years" ]; then
@@ -152,7 +151,7 @@ if [ "$CMD" = "years" ]; then
printf "graph_order y"
echo $years_array | sed 's/ / y/g'
echo "${years_array// / y}"
- for i in `seq 0 $no_of_years`; do
+ for i in `jot $no_of_years 0`; do
year=$(echo ${arr1[$i]})
if [ $year = 0 ]; then
echo y0.label No year
@@ -172,7 +171,7 @@ if [ "$CMD" = "years" ]; then
done
exit 0
fi
- for i in `seq 0 $no_of_years`; do
+ for i in `jot $no_of_years 0`; do
year=$(echo ${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
@@ -182,8 +181,7 @@ elif [ "$CMD" = "signalstrength" -o "$CMD" = "mixer vo
echo "graph_title $TITLE"
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
+ for ID in $(jot $COUNT 0); do
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=$(echo $MAC | sed 's/://g; s/\./_/g')
@@ -192,8 +190,7 @@ elif [ "$CMD" = "signalstrength" -o "$CMD" = "mixer vo
exit 0
- for i in $(seq 0 "$no_of_years"); do
+ for i in $(jot "$no_of_years" 0); do
year=${arr1[$i]}
if [ "$year" = 0 ]; then
echo "y0.label No year"
@@ -167,7 +166,7 @@ if [ "$CMD" = "years" ]; then
done
exit 0
fi
COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3)
- (( COUNT-- ))
- for ID in $(seq 0 $COUNT); do
+ for ID in $(jot $COUNT 0); do
MAC=$(printf "%b" "player id $ID ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%3A/:/g')
VAL=$(printf "%b" "$MAC $CMD ?\nexit\n"| $NC $HOST $PORT | cut -d " " -f 2- | sed "s/$CMD //")
MAC2=$(echo $MAC| sed 's/://g')
- for i in $(seq 0 "$no_of_years"); do
+ for i in $(jot "$no_of_years" 0); do
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 +177,7 @@ elif [ "$CMD" = "signalstrength" ] || [ "$CMD" = "mixe
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
+ for ID in $(jot "$COUNT" 0); do
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 +188,7 @@ elif [ "$CMD" = "signalstrength" ] || [ "$CMD" = "mixe
fi
COUNT=$(printf "%b" 'player count ?\nexit\n' | "$NC" "$HOST" "$PORT" | cut -d " " -f 3)
(( COUNT-- ))
- for ID in $(seq 0 "$COUNT"); do
+ for ID in $(jot "$COUNT" 0); do
MAC=$(printf "%b" "player id $ID ?\\nexit\\n" | "$NC" "$HOST" "$PORT" | cut -d " " -f 4 | sed 's/%3A/:/g')
VAL=$(printf "%b" "$MAC $CMD ?\\nexit\\n"| "$NC" "$HOST" "$PORT" | cut -d " " -f 2- | sed "s/$CMD //")
MAC2=${MAC//:/}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.19 2018/04/01 08:21:01 kirby Exp $
@comment $OpenBSD: PLIST-main,v 1.20 2018/07/26 19:17:44 kirby Exp $
@conflict munin-server-<2.0.21
@newgroup _munin:644
@newgroup _munin-plugin:645
@ -7,17 +7,8 @@
@extraunexec rm -rf ${SYSCONFDIR}/munin/plugins/*
@extraunexec rm -rf ${SYSCONFDIR}/munin/plugin-conf.d/*
@extraunexec rm -rf /var/log/munin/*
@owner _munin
@sample /var/db/munin/
@mode 775
@owner _munin-plugin
@group _munin
@sample /var/db/munin/spool/
@sample /var/db/munin-pluginstate/
@sample /var/log/munin/
@mode
@owner
@group
@rcscript ${RCDIR}/munin_asyncd
@rcscript ${RCDIR}/munin_node
bin/munin-check
bin/munindoc
libdata/perl5/site_perl/Munin/
@ -337,5 +328,11 @@ share/examples/munin/plugin-conf.d/openbsd-packages
@sample ${SYSCONFDIR}/munin/plugin-conf.d/openbsd-packages
share/examples/munin/plugins/
@sample ${SYSCONFDIR}/munin/plugins/
@rcscript ${RCDIR}/munin_asyncd
@rcscript ${RCDIR}/munin_node
@owner _munin
@sample /var/db/munin/
@mode 775
@owner _munin-plugin
@group _munin
@sample /var/db/munin/spool/
@sample /var/db/munin-pluginstate/
@sample /var/log/munin/

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.8 2017/05/16 08:48:56 ajacoutot Exp $
@comment $OpenBSD: PLIST-server,v 1.9 2018/07/26 19:17:44 kirby Exp $
@extraunexec rm -rf /var/www/htdocs/munin/*
@extraunexec rm -rf /var/db/munin/*
@owner www
@ -19,13 +19,13 @@ libexec/munin/munin-update
@man man/man8/munin-cron.8
@man man/man8/munin-html.8
@man man/man8/munin-limits.8
share/doc/pkg-readmes/${FULLPKGNAME}
@owner www
share/examples/munin/munin-cgi-graph.log
@sample /var/log/munin/munin-cgi-graph.log
share/examples/munin/munin-cgi-html.log
@sample /var/log/munin/munin-cgi-html.log
@owner
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/munin/munin-conf.d/
@sample ${SYSCONFDIR}/munin/munin-conf.d/
share/examples/munin/munin.conf