pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils munin: update to version 2.0.49
details: https://anonhg.NetBSD.org/pkgsrc/rev/43f103de6901
branches: trunk
changeset: 339260:43f103de6901
user: tm <tm%pkgsrc.org@localhost>
date: Mon Sep 09 12:21:44 2019 +0000
description:
munin: update to version 2.0.49
Version bump from outdated version 1.x to munin 2.0.49. Developed and imported
from WIP in cooperation with Sebastian Wiedenroth, Roland Illig, Filip Hajny and
Francois Tigeot.
diffstat:
sysutils/Makefile | 6 +-
sysutils/munin-common/DESCR | 10 +
sysutils/munin-common/Makefile | 25 +
sysutils/munin-common/Makefile.common | 79 ++++
sysutils/munin-common/distinfo | 11 +
sysutils/munin-common/patches/patch-MANIFEST | 30 +
sysutils/munin-common/patches/patch-Makefile | 107 +++++
sysutils/munin-common/patches/patch-Makefile.config | 159 ++++++++
sysutils/munin-common/patches/patch-common_Build.PL | 14 +
sysutils/munin-common/patches/patch-lib_Munin_Common_Defaults.pm | 41 ++
sysutils/munin-doc/DESCR | 9 -
sysutils/munin-doc/Makefile | 35 -
sysutils/munin-doc/PLIST | 21 -
sysutils/munin-doc/distinfo | 19 -
sysutils/munin-doc/patches/patch-aa | 91 ----
sysutils/munin-doc/patches/patch-ad | 21 -
sysutils/munin-doc/patches/patch-node_munin-node-configure-snmp.in | 15 -
sysutils/munin-doc/patches/patch-node_munin-node-configure.in | 15 -
sysutils/munin-doc/patches/patch-node_munin-node.conf.pod | 21 -
sysutils/munin-doc/patches/patch-node_munin-node.in | 15 -
sysutils/munin-doc/patches/patch-node_munin-run.in | 15 -
sysutils/munin-doc/patches/patch-server_munin-cron.pod | 12 -
sysutils/munin-doc/patches/patch-server_munin-graph.in | 15 -
sysutils/munin-doc/patches/patch-server_munin-html.in | 15 -
sysutils/munin-doc/patches/patch-server_munin-limits.in | 15 -
sysutils/munin-doc/patches/patch-server_munin-update.in | 15 -
sysutils/munin-doc/patches/patch-server_munin.conf.pod | 12 -
sysutils/munin-master/DESCR | 7 +
sysutils/munin-master/MESSAGE | 10 +
sysutils/munin-master/Makefile | 69 +++
sysutils/munin-master/PLIST | 76 +++
sysutils/munin-node/DESCR | 2 -
sysutils/munin-node/MESSAGE | 8 +-
sysutils/munin-node/Makefile | 128 +-----
sysutils/munin-node/PLIST | 191 +++++++--
sysutils/munin-node/PLIST.AIX | 2 +
sysutils/munin-node/PLIST.FreeBSD | 13 +
sysutils/munin-node/PLIST.Linux | 32 +
sysutils/munin-node/PLIST.NetBSD | 19 +
sysutils/munin-node/PLIST.SunOS | 15 +
sysutils/munin-node/distinfo | 14 -
sysutils/munin-node/files/munin-node.sh | 2 +-
sysutils/munin-node/files/node/node.d.netbsd/cpu.in | 144 -------
sysutils/munin-node/files/node/node.d.netbsd/df.in | 79 ----
sysutils/munin-node/files/node/node.d.netbsd/df_inode.in | 94 ----
sysutils/munin-node/files/node/node.d.netbsd/entropy.in | 39 --
sysutils/munin-node/files/node/node.d.netbsd/forks.in | 75 ---
sysutils/munin-node/files/node/node.d.netbsd/if_.in | 80 ----
sysutils/munin-node/files/node/node.d.netbsd/if_errcoll_.in | 76 ---
sysutils/munin-node/files/node/node.d.netbsd/interrupts.in | 104 -----
sysutils/munin-node/files/node/node.d.netbsd/iostat.in | 117 ------
sysutils/munin-node/files/node/node.d.netbsd/iostat_ops.in | 117 ------
sysutils/munin-node/files/node/node.d.netbsd/irqstats.in | 84 ----
sysutils/munin-node/files/node/node.d.netbsd/load.in | 122 ------
sysutils/munin-node/files/node/node.d.netbsd/memory.in | 89 ----
sysutils/munin-node/files/node/node.d.netbsd/memory_pools.in | 143 -------
sysutils/munin-node/files/node/node.d.netbsd/memory_types.in | 88 ----
sysutils/munin-node/files/node/node.d.netbsd/netstat.in | 94 ----
sysutils/munin-node/files/node/node.d.netbsd/nfs_client.in | 82 ----
sysutils/munin-node/files/node/node.d.netbsd/nfsd.in | 82 ----
sysutils/munin-node/files/node/node.d.netbsd/open_files.in | 81 ----
sysutils/munin-node/files/node/node.d.netbsd/processes.in | 52 --
sysutils/munin-node/files/node/node.d.netbsd/sensors_.in | 144 -------
sysutils/munin-node/files/node/node.d.netbsd/swap.in | 74 ---
sysutils/munin-node/files/node/node.d.netbsd/swap_size.in | 53 --
sysutils/munin-node/files/node/node.d.netbsd/uptime.in | 63 ---
sysutils/munin-node/files/node/node.d.netbsd/vmstat.in | 102 -----
sysutils/munin-node/files/node/node.d/ntp_kernel_err.in | 43 --
sysutils/munin-node/files/node/node.d/ntp_kernel_pll_freq.in | 50 --
sysutils/munin-node/files/node/node.d/ntp_kernel_pll_off.in | 43 --
sysutils/munin-node/files/smf/manifest.xml | 3 +-
sysutils/munin-node/patches/patch-aa | 86 ----
sysutils/munin-node/patches/patch-ab | 13 -
sysutils/munin-node/patches/patch-ac | 40 --
sysutils/munin-node/patches/patch-ad | 58 ---
sysutils/munin-node/patches/patch-ae | 15 -
sysutils/munin-node/patches/patch-af | 13 -
sysutils/munin-node/patches/patch-ag | 13 -
sysutils/munin-node/patches/patch-ah | 19 -
sysutils/munin-server/DESCR | 9 -
sysutils/munin-server/MESSAGE | 27 -
sysutils/munin-server/Makefile | 113 -----
sysutils/munin-server/PLIST | 20 -
sysutils/munin-server/distinfo | 10 -
sysutils/munin-server/patches/patch-aa | 88 ----
sysutils/munin-server/patches/patch-ab | 13 -
sysutils/munin-server/patches/patch-ad | 46 --
sysutils/munin-server/patches/patch-ae | 89 ----
88 files changed, 894 insertions(+), 3626 deletions(-)
diffs (truncated from 5018 to 300 lines):
diff -r ae343472eab1 -r 43f103de6901 sysutils/Makefile
--- a/sysutils/Makefile Mon Sep 09 12:05:37 2019 +0000
+++ b/sysutils/Makefile Mon Sep 09 12:21:44 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.830 2019/09/07 18:29:03 tnn Exp $
+# $NetBSD: Makefile,v 1.831 2019/09/09 12:21:44 tm Exp $
#
COMMENT= System utilities
@@ -391,9 +391,9 @@
SUBDIR+= mtoolsfm
SUBDIR+= mtscan
SUBDIR+= mtx
-SUBDIR+= munin-doc
+SUBDIR+= munin-common
+SUBDIR+= munin-master
SUBDIR+= munin-node
-SUBDIR+= munin-server
SUBDIR+= nautilus
SUBDIR+= nautilus-sendto
SUBDIR+= nbase
diff -r ae343472eab1 -r 43f103de6901 sysutils/munin-common/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/munin-common/DESCR Mon Sep 09 12:21:44 2019 +0000
@@ -0,0 +1,10 @@
+Munin is a tool for graphing all sorts of information about one or
+more servers and displaying it in a web interface. It uses the
+execellent RRDTool (written by Tobi Oetiker) and is written in Perl.
+Munin has a master/node architecture. The master connects to all the
+nodes at regular intervals, and asks them for data. It then stores
+the data in RRD-files, and (if needed) updates the graphs. One of the
+main goals has been ease of creating own "plugins" (graphs).
+
+This package manages the common components used by both master and
+node munin packages.
diff -r ae343472eab1 -r 43f103de6901 sysutils/munin-common/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/munin-common/Makefile Mon Sep 09 12:21:44 2019 +0000
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2019/09/09 12:21:44 tm Exp $
+#
+
+PKGNAME= ${DISTNAME:S/munin/munin-common/}
+COMMENT= Common components between a munin node and master
+
+.include "../../sysutils/munin-common/Makefile.common"
+
+# Adjust WRKSRC for the Perl module framework, but keep the same
+# patch base directory
+WRKSRC= ${WRKDIR}/${DISTNAME}/common
+PATCH_ARGS= -d ${WRKSRC}/.. --forward -E ${PATCH_STRIP}
+
+PERL5_MODULE_TYPE= Module::Build
+PERL5_PACKLIST= auto/Munin/Common/.packlist
+
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= lib/Munin/Common/Defaults.pm
+SUBST_VARS.paths= PKG_SYSCONFDIR MUNIN_DBDIR MUNIN_LIBDIR \
+ MUNIN_LOGDIR MUNIN_STATEDIR MUNIN_WWWDIR \
+ MUNIN_PLUGSTATE PERL5
+
+.include "../../lang/perl5/module.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r ae343472eab1 -r 43f103de6901 sysutils/munin-common/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/munin-common/Makefile.common Mon Sep 09 12:21:44 2019 +0000
@@ -0,0 +1,79 @@
+# $NetBSD: Makefile.common,v 1.1 2019/09/09 12:21:44 tm Exp $
+#
+# used by sysutils/munin-common/Makefile
+# used by sysutils/munin-master/Makefile
+# used by sysutils/munin-node/Makefile
+
+VERSION= 2.0.49
+DISTNAME= munin-${VERSION}
+CATEGORIES= sysutils
+MASTER_SITES= http://downloads.munin-monitoring.org/munin/stable/${VERSION}/
+
+MAINTAINER= tm%NetBSD.org@localhost
+HOMEPAGE= http://munin-monitoring.org/
+LICENSE= gnu-gpl-v2
+
+BUILD_DEPENDS+= p5-CPAN-Meta>=2.141170:../../devel/p5-CPAN-Meta
+BUILD_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build
+BUILD_DEPENDS+= p5-Time-HiRes>=0:../../time/p5-Time-HiRes
+DEPENDS= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
+
+DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo
+PATCHDIR= ${.CURDIR}/../../sysutils/munin-common/patches
+
+.include "../../mk/bsd.prefs.mk"
+
+USE_LANGUAGES= # none
+USE_TOOLS+= gmake bash:run perl:run
+
+BUILD_DEFS+= VARBASE
+
+MUNIN_GROUP?= munin
+MUNIN_USER?= munin
+
+MUNIN_DBDIR?= ${VARBASE}/munin
+MUNIN_LIBDIR= ${PREFIX}/lib/munin
+MUNIN_LOGDIR?= ${VARBASE}/log/munin
+MUNIN_PLUGSTATE?= ${MUNIN_DBDIR}/plugin-state
+MUNIN_SPOOLDIR?= ${VARBASE}/spool/munin
+MUNIN_STATEDIR?= ${VARBASE}/run/munin
+MUNIN_WWWDIR?= ${PREFIX}/www
+
+PKG_GROUPS_VARS+= MUNIN_GROUP
+PKG_USERS_VARS+= MUNIN_USER
+PKG_GROUPS= ${MUNIN_GROUP}
+PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP}
+PKG_GECOS.${MUNIN_USER}= Munin user
+PKG_HOME.${MUNIN_USER}= ${MUNIN_DBDIR}
+PKG_SHELL.${MUNIN_USER}= ${BASH}
+
+PKG_SYSCONFSUBDIR?= munin
+
+EGDIR= ${PREFIX}/share/examples/munin
+
+REPLACE_PERL= master/_bin/munin-update.in
+
+FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP}
+FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q}
+FILES_SUBST+= MUNIN_USER=${MUNIN_USER}
+FILES_SUBST+= PERL=${PERL5:Q}
+FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+FILES_SUBST+= STATEDIR=${STATEDIR}
+
+MAKE_ENV+= PERL_USE_UNSAFE_INC=1
+MAKE_ENV+= BASH=${BASH:Q}
+MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+= MUNIN_DBDIR=${MUNIN_DBDIR}
+MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP}
+MAKE_ENV+= MUNIN_LOGDIR=${MUNIN_LOGDIR}
+MAKE_ENV+= MUNIN_PLUGSTATE=${MUNIN_PLUGSTATE}
+MAKE_ENV+= MUNIN_SPOOLDIR=${MUNIN_SPOOLDIR}
+MAKE_ENV+= MUNIN_STATEDIR=${MUNIN_STATEDIR}
+MAKE_ENV+= MUNIN_USER=${MUNIN_USER}
+MAKE_ENV+= MUNIN_WWWDIR=${MUNIN_WWWDIR}
+MAKE_ENV+= PERL5=${PERL5:Q}
+MAKE_ENV+= PREFIX=${PREFIX}
+MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q}
+MAKE_ENV+= RUBY=${RUBY:Q}
+
+MESSAGE_SUBST+= MUNIN_USER=${MUNIN_USER}
diff -r ae343472eab1 -r 43f103de6901 sysutils/munin-common/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/munin-common/distinfo Mon Sep 09 12:21:44 2019 +0000
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1 2019/09/09 12:21:44 tm Exp $
+
+SHA1 (munin-2.0.49.tar.gz) = 48531b84c4382983cf4fe64a7c3ad22a86cbdc2e
+RMD160 (munin-2.0.49.tar.gz) = 0e13eb4dfd01ea122476d041f51233612db00cfd
+SHA512 (munin-2.0.49.tar.gz) = 20f1f27aa1ff39ed92c967a13581ae199930323f5d2b62b62ce0a548a4cf561595e85d069e836b156c05d4a94c66328009aba56cb1b06c4b2719fbd9e1061ca4
+Size (munin-2.0.49.tar.gz) = 2252353 bytes
+SHA1 (patch-MANIFEST) = 538cec30723a6d41b732c9dc4a175472fb821609
+SHA1 (patch-Makefile) = 725b2fbac05ec89882fec295b8d38fc183bb310a
+SHA1 (patch-Makefile.config) = ce29e172ddf3303e6539c269622e3c0d9e10e099
+SHA1 (patch-common_Build.PL) = 7d7f5afde978d0e5641f931d3f2585651ff40c1a
+SHA1 (patch-lib_Munin_Common_Defaults.pm) = 2f6ffe9fe1b91361e35b9bfcac239252ba789482
diff -r ae343472eab1 -r 43f103de6901 sysutils/munin-common/patches/patch-MANIFEST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/munin-common/patches/patch-MANIFEST Mon Sep 09 12:21:44 2019 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-MANIFEST,v 1.1 2019/09/09 12:21:44 tm Exp $
+
+Add missing MANIFEST file so that Munin::Common becomes manageable
+by the Perl module framework.
+
+--- /dev/null 2011-01-09 11:43:05.000000000 +0000
++++ common/MANIFEST
+@@ -0,0 +1,22 @@
++Build.PL
++lib/Munin/Common/Config.pm
++lib/Munin/Common/Defaults.pm
++lib/Munin/Common/Timeout.pm
++lib/Munin/Common/TLS.pm
++lib/Munin/Common/TLSClient.pm
++lib/Munin/Common/TLSServer.pm
++MANIFEST This list of files
++t/critic.t
++t/munin_common_config.t
++t/munin_common_defaults.t
++t/munin_common_timeout.t
++t/munin_common_tls.t
++t/pod-coverage.t
++t/pod.t
++t/tls/CA/ca_cert.pem
++t/tls/master_cert.pem
++t/tls/master_key.pem
++t/tls/node_cert.pem
++t/tls/node_key.pem
++t/tls/openssl.cnf
++t/tls/README
diff -r ae343472eab1 -r 43f103de6901 sysutils/munin-common/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/munin-common/patches/patch-Makefile Mon Sep 09 12:21:44 2019 +0000
@@ -0,0 +1,107 @@
+$NetBSD: patch-Makefile,v 1.1 2019/09/09 12:21:44 tm Exp $
+
+Installation fixed to use all essential files, populate
+PKG_SYSCONFDIR as expected by the Munin scripts. Gets
+configured man3ext from Perl instead of assuming 3pm suffix.
+
+--- Makefile.orig Thu May 9 03:45:43 2019
++++ Makefile Wed Aug 14 12:38:00 2019
+@@ -33,8 +33,9 @@
+ PODMAN8 := build/master/doc/munin-cron master/doc/munin master/doc/munin-check
+ PODMAN5 := build/master/doc/munin.conf node/doc/munin-node.conf
+ PYTHON_LINT_CALL ?= python3 -m flake8
++MAN3EXT := $(shell $(PERL) -e 'use Config; print $$Config{man3ext};')
+ CONFVAR_SUBSTITUTION_FILES = \
+- master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.3pm \
++ master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.$(MAN3EXT) \
+ master/blib/lib/Munin/Master/HTMLOld.pm \
+ node/blib/sbin/munin-node-configure \
+ node/blib/sbin/munin-node \
+@@ -94,50 +95,37 @@
+ install: install-master-prime install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-man install-async-prime
+
+ install-pre: $(MAKEFILES)
+- @$(CHECKUSER)
+- mkdir -p $(LOGDIR)
+- mkdir -p $(STATEDIR)
+- mkdir -p $(SPOOLDIR)
+- mkdir -p $(CONFDIR)
+- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
++ mkdir -p $(EGDIR)
+
+ install-master-prime: $(INFILES_MASTER) install-pre install-master
+- mkdir -p $(CONFDIR)/templates
+- mkdir -p $(CONFDIR)/static
+- mkdir -p $(CONFDIR)/templates/partial
+- mkdir -p $(CONFDIR)/munin-conf.d
++ mkdir -p $(EGDIR)/templates
++ mkdir -p $(EGDIR)/static
++ mkdir -p $(EGDIR)/templates/partial
++ mkdir -p $(EGDIR)/munin-conf.d
+ mkdir -p $(LIBDIR)
+ mkdir -p $(BINDIR)
+ mkdir -p $(PERLLIB)
+ mkdir -p $(PERLLIB)/Munin/Master
+ mkdir -p $(HTMLDIR)
+- mkdir -p $(DBDIR)
+- mkdir -p $(DBDIR)/cgi-tmp
+ mkdir -p $(CGIDIR)
+
+- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
+- $(CHMOD) 0755 $(DBDIR)
+-
+- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
+- $(CHMOD) 0755 $(DBDIR)/cgi-tmp
+-
+ for p in master/www/*.tmpl ; do \
+- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
++ $(INSTALL) -m 0644 "$$p" $(EGDIR)/templates/ ; \
+ done
+
+ for p in master/static/* ; do \
+- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \
++ $(INSTALL) -m 0644 "$$p" $(EGDIR)/static/ ; \
+ done
+
+ for p in master/www/partial/*.tmpl; do \
+- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
++ $(INSTALL) -m 0644 "$$p" $(EGDIR)/templates/partial/ ; \
+ done
+
+ $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
+ $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
+
+- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
+- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
++ $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
++ $(INSTALL) -m 0644 build/master/munin.conf $(EGDIR)/
+
+ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
+ $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
+@@ -156,17 +144,8 @@
+ install-node-plugins: install-plugins-prime
+
+ install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
+- @$(CHECKGROUP)
+-
+- mkdir -p $(CONFDIR)/plugins
+- mkdir -p $(CONFDIR)/plugin-conf.d
+ mkdir -p $(LIBDIR)/plugins
+- mkdir -p $(PLUGSTATE)
+
+- $(CHOWN) root:root $(PLUGSTATE)
+- $(CHMOD) 0755 $(PLUGSTATE)
+- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
+-
+ @# Process the OS specific plugins at the end. Otherwise they would be overridden by the
+ @# generic ones.
+ for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
+@@ -205,7 +184,7 @@
+ install-node-prime: install-node-pre install-node
Home |
Main Index |
Thread Index |
Old Index