cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to munin-2.0.59

Browse Source
This commit is contained in:
kirby 2020-03-29 10:22:17 +00:00
parent 1864ae9a26
commit 5c03a93991
8 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/munin/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.91 2020/03/17 10:50:13 kirby Exp $
# $OpenBSD: Makefile,v 1.92 2020/03/29 10:22:17 kirby Exp $
PORTROACH = limitw:1,even
COMMENT-main = flexible network host monitoring, client
COMMENT-server =flexible network host monitoring, server
V = 2.0.57
V = 2.0.59
DISTNAME = munin-$V
PKGNAME-main = munin-node-$V
PKGNAME-server =munin-server-$V

4
net/munin/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (munin-2.0.57.tar.gz) = tRyk/XPDzrIywX702LqWri05SC32UyEJriuq8toOspc=
SIZE (munin-2.0.57.tar.gz) = 2266092
SHA256 (munin-2.0.59.tar.gz) = iRISV0RFd0Z61z+HSQ7reXQBiNgtDc+yorCz3RUTG80=
SIZE (munin-2.0.59.tar.gz) = 2267792

10
net/munin/patches/patch-Makefile
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile,v 1.16 2020/02/02 11:16:53 kirby Exp $
$OpenBSD: patch-Makefile,v 1.17 2020/03/29 10:22:17 kirby Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -99,7 +99,6 @@ install-pre: $(MAKEFILES)
@@ -98,7 +98,6 @@ install-pre: $(MAKEFILES)
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
@@ -111,15 +110,15 @@ install-master-prime: $(INFILES_MASTER) install-pre in
@@ -110,15 +109,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/ ; \
@@ -158,10 +157,10 @@ install-plugins-prime: install-plugins build $(PLUGINS
@@ -157,10 +156,10 @@ install-plugins-prime: install-plugins build $(PLUGINS
mkdir -p $(CONFDIR)/plugins
mkdir -p $(CONFDIR)/plugin-conf.d
mkdir -p $(LIBDIR)/plugins
@ -46,7 +46,7 @@ Index: Makefile
$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
@@ -535,7 +534,7 @@ install-%: %/Build
@@ -534,7 +533,7 @@ install-%: %/Build
--install_path script=$(BINDIR) \
--install_path sbin=$(SBINDIR) \
--install_path bindoc=$(MANDIR)/man1 \

21
net/munin/patches/patch-master__bin_munin-check_in
View File

@ -1,13 +1,14 @@
$OpenBSD: patch-master__bin_munin-check_in,v 1.1 2014/03/25 08:42:25 kirby Exp $
--- master/_bin/munin-check.in.orig Sat Dec 7 14:55:16 2013
+++ master/_bin/munin-check.in Sat Feb 15 19:23:30 2014
$OpenBSD: patch-master__bin_munin-check_in,v 1.2 2020/03/29 10:22:17 kirby Exp $
Index: master/_bin/munin-check.in
--- master/_bin/munin-check.in.orig
+++ master/_bin/munin-check.in
@@ -1,4 +1,4 @@
-#!@@BASH@@
+#!@@GOODSH@@
# -*- sh -*-
# Copyright (C) 2008 Matthias Schmitz
# This program is free software; you can redistribute it and/or
@@ -20,20 +20,17 @@
@@ -19,20 +19,17 @@
####
# prints usage
@ -33,7 +34,7 @@ $OpenBSD: patch-master__bin_munin-check_in,v 1.1 2014/03/25 08:42:25 kirby Exp $
if [[ $? -ne 0 ]]; then
echo "Terminating..." >&2
@@ -45,8 +42,8 @@ eval set -- "$TEMP"
@@ -44,8 +41,8 @@ eval set -- "$TEMP"
while :; do
case "$1" in
@ -44,7 +45,7 @@ $OpenBSD: patch-master__bin_munin-check_in,v 1.1 2014/03/25 08:42:25 kirby Exp $
--) shift ; break ;;
*) echo "Internal error!" ; exit 1 ;;
esac
@@ -54,7 +51,7 @@ done
@@ -53,7 +50,7 @@ done
####
# sets owner to "@@USER@@"
@ -53,7 +54,7 @@ $OpenBSD: patch-master__bin_munin-check_in,v 1.1 2014/03/25 08:42:25 kirby Exp $
fix_object=$1; shift
fix_owner=$1; shift
@@ -72,7 +69,7 @@ function fix_owner() {
@@ -71,7 +68,7 @@ function fix_owner() {
####
# check if "@@USER@@" is owner, if PLEASE_FIXME set it calls fix_owner()
@ -62,7 +63,7 @@ $OpenBSD: patch-master__bin_munin-check_in,v 1.1 2014/03/25 08:42:25 kirby Exp $
object=$1; shift || exit 1
correctowner=$1; shift || exit 1
@@ -94,6 +91,11 @@ function owner_ok() {
@@ -93,6 +90,11 @@ function owner_ok() {
"lost+found") return 0;;
esac
@ -74,7 +75,7 @@ $OpenBSD: patch-master__bin_munin-check_in,v 1.1 2014/03/25 08:42:25 kirby Exp $
# ... and then dive into it
for subobject in $object/*; do
owner_ok $subobject $correctowner
@@ -102,7 +104,7 @@ function owner_ok() {
@@ -101,7 +103,7 @@ function owner_ok() {
}
@ -83,7 +84,7 @@ $OpenBSD: patch-master__bin_munin-check_in,v 1.1 2014/03/25 08:42:25 kirby Exp $
object=$1; shift || exit 1
correctperm=$1; shift || exit 1
@@ -145,12 +147,20 @@ for dir in @@DBDIR@@/*; do
@@ -144,12 +146,20 @@ for dir in @@DBDIR@@/*; do
*/plugin-state)
continue;;
esac

4
net/munin/patches/patch-node__bin_munin-asyncd_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-node__bin_munin-asyncd_in,v 1.7 2020/03/17 10:50:13 kirby Exp $
$OpenBSD: patch-node__bin_munin-asyncd_in,v 1.8 2020/03/29 10:22:17 kirby Exp $
Index: node/_bin/munin-asyncd.in
--- node/_bin/munin-asyncd.in.orig
+++ node/_bin/munin-asyncd.in
@@ -302,7 +302,7 @@ munin-asyncd [options]
@@ -305,7 +305,7 @@ munin-asyncd [options]
Options:
--host <hostname:port> Connect to this munin-node [localhost:4949]

4
net/munin/patches/patch-node_sbin_munin-node
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-node_sbin_munin-node,v 1.5 2020/03/17 10:50:13 kirby Exp $
$OpenBSD: patch-node_sbin_munin-node,v 1.6 2020/03/29 10:22:17 kirby Exp $
Index: node/sbin/munin-node
--- node/sbin/munin-node.orig
+++ node/sbin/munin-node
@@ -54,6 +54,9 @@ sub main
@@ -52,6 +52,9 @@ sub main
$ENV{$key} =~ /^(.*)$/;
$ENV{$key} = $1;
}

4
net/munin/patches/patch-plugins_node_d_exim_mailstats_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-plugins_node_d_exim_mailstats_in,v 1.2 2018/09/23 13:47:59 kirby Exp $
$OpenBSD: patch-plugins_node_d_exim_mailstats_in,v 1.3 2020/03/29 10:22:17 kirby Exp $
Index: plugins/node.d/exim_mailstats.in
--- plugins/node.d/exim_mailstats.in.orig
+++ plugins/node.d/exim_mailstats.in
@@ -130,7 +130,7 @@ sub parseEximfile
@@ -126,7 +126,7 @@ sub parseEximfile
}

6
net/munin/patches/patch-plugins_node_d_openbsd_df_inode_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-plugins_node_d_openbsd_df_inode_in,v 1.2 2018/07/01 15:02:36 kirby Exp $
$OpenBSD: patch-plugins_node_d_openbsd_df_inode_in,v 1.3 2020/03/29 10:22:17 kirby Exp $
Index: plugins/node.d.openbsd/df_inode.in
--- plugins/node.d.openbsd/df_inode.in.orig
+++ plugins/node.d.openbsd/df_inode.in
@@ -25,7 +25,7 @@ fi
@@ -23,7 +23,7 @@ fi
print_values() {
mfs=0
@ -11,7 +11,7 @@ Index: plugins/node.d.openbsd/df_inode.in
case $i in
mfs:*) name=mfs$mfs; mfs=`expr $mfs + 1`;;
*) name=`echo $i | awk '{ gsub("[^a-zA-Z0-9_]", "_", $1); print $1 }'` ;;
@@ -52,7 +52,7 @@ if [ "$1" = "config" ]; then
@@ -50,7 +50,7 @@ if [ "$1" = "config" ]; then
echo 'graph_category disk'
echo 'graph_scale no'
echo 'graph_info This graph shows the inode usage for the partitions of types that use inodes.'