summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2006-12-05 14:53:32 +0000
committerxtraeme <xtraeme@pkgsrc.org>2006-12-05 14:53:32 +0000
commit272e6e990fe2b1a1ada70059b581e1a6d876ce2a (patch)
treeb95c08ed791bbd1fbe0b475f786e03c83fa37779
parent2de50ee664473338135ad0071d70a359f32450de (diff)
downloadpkgsrc-272e6e990fe2b1a1ada70059b581e1a6d876ce2a.tar.gz
Update munin packages to 1.3.2, latest development release
with fixes from the stable branch. Changes since previous version: This release implements proper TLS support, as well as all the bugfixes from the 1.2 stable series. pkgsrc changes: * Fixed many pkglint warnings. * Install munin.conf and munin-node.conf as ${INSTALL_DATA} not ${INSTALL_SCRIPT}, I couldn't see any reason why those were installed as scripts. * Added VARBASE into BUILD_DEFS, as suggested by pkglint.
Diffstat
-rw-r--r--sysutils/munin-doc/Makefile4
-rw-r--r--sysutils/munin-doc/PLIST4
-rw-r--r--sysutils/munin-doc/distinfo8
-rw-r--r--sysutils/munin-node/MESSAGE3
-rw-r--r--sysutils/munin-node/Makefile11
-rw-r--r--sysutils/munin-node/PLIST4
-rw-r--r--sysutils/munin-node/distinfo8
-rw-r--r--sysutils/munin-server/Makefile12
-rw-r--r--sysutils/munin-server/distinfo10
-rw-r--r--sysutils/munin-server/patches/patch-ad22
10 files changed, 47 insertions, 39 deletions
diff --git a/sysutils/munin-doc/Makefile b/sysutils/munin-doc/Makefile
index 44429624c55..940136ca2be 100644
--- a/sysutils/munin-doc/Makefile
+++ b/sysutils/munin-doc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/11/12 02:04:59 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/05 14:53:32 xtraeme Exp $
#
DISTNAME= ${PKGNAME:S:-doc-:_:}
-PKGNAME= munin-doc-1.3.1
+PKGNAME= munin-doc-1.3.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/}
diff --git a/sysutils/munin-doc/PLIST b/sysutils/munin-doc/PLIST
index 9628f127dbe..42668fc4ba8 100644
--- a/sysutils/munin-doc/PLIST
+++ b/sysutils/munin-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/06/08 19:03:34 he Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/12/05 14:53:32 xtraeme Exp $
man/man5/munin-node.conf.5
man/man5/munin.conf.5
man/man8/munin-cron.8
@@ -6,6 +6,8 @@ man/man8/munin-graph.8
man/man8/munin-html.8
man/man8/munin-limits.8
man/man8/munin-node.8
+man/man8/munin-node-configure-snmp.8
+man/man8/munin-node-configure.8
man/man8/munin-run.8
man/man8/munin-update.8
share/doc/munin/COPYING
diff --git a/sysutils/munin-doc/distinfo b/sysutils/munin-doc/distinfo
index 18ebdffd4e6..a669cff067f 100644
--- a/sysutils/munin-doc/distinfo
+++ b/sysutils/munin-doc/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2006/07/02 10:37:29 rillig Exp $
+$NetBSD: distinfo,v 1.3 2006/12/05 14:53:32 xtraeme Exp $
-SHA1 (munin_1.3.1.tar.gz) = f7783b645abbb25524c3f1b6e0fe27185f1de3db
-RMD160 (munin_1.3.1.tar.gz) = a6ea4e1839f4c787457e4051d55007b7bcebd1d4
-Size (munin_1.3.1.tar.gz) = 315743 bytes
+SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a
+RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4
+Size (munin_1.3.2.tar.gz) = 309319 bytes
SHA1 (patch-aa) = f17112a37d968d507bee23069d580c98ee8b1807
SHA1 (patch-ad) = 8accd3875324035f2c95903fc37cee4b4a55948a
diff --git a/sysutils/munin-node/MESSAGE b/sysutils/munin-node/MESSAGE
index f6e21a5ce49..71df9d5c4fa 100644
--- a/sysutils/munin-node/MESSAGE
+++ b/sysutils/munin-node/MESSAGE
@@ -1,9 +1,8 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/06/09 13:22:44 he Exp $
+$NetBSD: MESSAGE,v 1.3 2006/12/05 14:53:32 xtraeme Exp $
Plugins can be auto-configured with "munin-node-configure --shell | sh"
-
You may also want to add an entry such as
${VARBASE}/log/munin/munin-node.log munin:munin 644 7 * 24 Z
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 99e3dd121ab..7a023922a87 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2006/07/21 23:28:37 abs Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/05 14:53:32 xtraeme Exp $
#
DISTNAME= munin_${VER}
-VER= 1.3.1
+VER= 1.3.2
PKGNAME= munin-node-${VER}
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/}
-PKGREVISION= 4
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://munin.sourceforge.net/
@@ -16,7 +15,7 @@ DEPENDS+= p5-Net-Server>=0:../../net/p5-Net-Server
DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
DEPENDS+= munin-doc>=1.3.1:../../sysutils/munin-doc
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run tar
USE_TOOLS+= gmake
USE_PKGINSTALL= YES
@@ -67,6 +66,8 @@ FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP:Q}
MESSAGE_SUBST+= VARBASE=${VARBASE:Q}
+BUILD_DEFS+= VARBASE
+
RCD_SCRIPTS+= munin-node
EGDIR= ${PREFIX}/share/examples/munin
@@ -79,7 +80,7 @@ pre-configure:
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/build/node/munin-node.conf ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${EGDIR}
.include "../../mk/bsd.pkg.mk"
.include "../../lang/python/application.mk"
diff --git a/sysutils/munin-node/PLIST b/sysutils/munin-node/PLIST
index ca5380e7f68..718763422bf 100644
--- a/sysutils/munin-node/PLIST
+++ b/sysutils/munin-node/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/11/19 10:02:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/12/05 14:53:32 xtraeme Exp $
lib/munin/plugins/acpi
lib/munin/plugins/amavis
lib/munin/plugins/apache_accesses
@@ -40,6 +40,7 @@ lib/munin/plugins/load
lib/munin/plugins/loggrep
lib/munin/plugins/mailman
lib/munin/plugins/mailscanner
+lib/munin/plugins/mbmon_
lib/munin/plugins/memory
lib/munin/plugins/memory_pools
lib/munin/plugins/memory_types
@@ -81,6 +82,7 @@ lib/munin/plugins/sendmail_mailstats
lib/munin/plugins/sendmail_mailtraffic
lib/munin/plugins/sensors_
lib/munin/plugins/smart_
+lib/munin/plugins/snmp__cpuload
lib/munin/plugins/snmp__df
lib/munin/plugins/snmp__fc_if_
lib/munin/plugins/snmp__fc_if_err_
diff --git a/sysutils/munin-node/distinfo b/sysutils/munin-node/distinfo
index a25bbcd0db5..62d13d2b73d 100644
--- a/sysutils/munin-node/distinfo
+++ b/sysutils/munin-node/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/11/19 10:02:09 wiz Exp $
+$NetBSD: distinfo,v 1.4 2006/12/05 14:53:32 xtraeme Exp $
-SHA1 (munin_1.3.1.tar.gz) = f7783b645abbb25524c3f1b6e0fe27185f1de3db
-RMD160 (munin_1.3.1.tar.gz) = a6ea4e1839f4c787457e4051d55007b7bcebd1d4
-Size (munin_1.3.1.tar.gz) = 315743 bytes
+SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a
+RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4
+Size (munin_1.3.2.tar.gz) = 309319 bytes
SHA1 (patch-aa) = df9b128721166912c086a54b29b7971a00581ea0
SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80
SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e
diff --git a/sysutils/munin-server/Makefile b/sysutils/munin-server/Makefile
index eccc0d6543f..824f038776f 100644
--- a/sysutils/munin-server/Makefile
+++ b/sysutils/munin-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2006/11/12 02:21:08 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/12/05 14:53:32 xtraeme Exp $
#
DISTNAME= ${PKGNAME_NOREV:S:-server-:_:}
-PKGNAME= munin-server-1.3.1
-PKGREVISION= 2
+PKGNAME= munin-server-1.3.2
+#PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/}
@@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://munin.sourceforge.net/
COMMENT= System monitoring tool, server version
+DEPENDS+= p5-Date-Manip>=0:../../devel/p5-Date-Manip
+DEPENDS+= p5-HTML-Template>=0:../../www/p5-HTML-Template
DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
DEPENDS+= rrdtool>=1.2:../../databases/rrdtool
DEPENDS+= munin-doc>=1.3.1:../../sysutils/munin-doc
@@ -47,6 +49,8 @@ OWN_DIRS_PERMS+=${VARBASE}/run/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755
OWN_DIRS_PERMS+=${VARBASE}/log/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755
OWN_DIRS_PERMS+=${VARBASE}/munin/plugin-state ${MUNIN_USER} ${MUNIN_GROUP} 0775
+BUILD_DEFS+= VARBASE
+
INSTALL_TARGET= install-main
BUILD_TARGET= build
@@ -86,7 +90,7 @@ CONF_FILES+= ${TMPL_EGDIR}/${f} ${INST_TMPL_DIR}/${f}
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/build/server/munin.conf ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/build/server/munin.conf ${EGDIR}
.include "../../mk/bsd.pkg.mk"
.include "../../lang/perl5/module.mk"
diff --git a/sysutils/munin-server/distinfo b/sysutils/munin-server/distinfo
index 354fbb0ed82..feb1e8eb6ca 100644
--- a/sysutils/munin-server/distinfo
+++ b/sysutils/munin-server/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2006/07/21 23:21:20 abs Exp $
+$NetBSD: distinfo,v 1.4 2006/12/05 14:53:32 xtraeme Exp $
-SHA1 (munin_1.3.1.tar.gz) = f7783b645abbb25524c3f1b6e0fe27185f1de3db
-RMD160 (munin_1.3.1.tar.gz) = a6ea4e1839f4c787457e4051d55007b7bcebd1d4
-Size (munin_1.3.1.tar.gz) = 315743 bytes
+SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a
+RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4
+Size (munin_1.3.2.tar.gz) = 309319 bytes
SHA1 (patch-aa) = 4eca37dc4ee76bbd5b9e59a2eece06fcd7a9da2b
SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80
-SHA1 (patch-ad) = f59ed32d7ca4acf72dfa32d8151b4ffa4c0f41a9
+SHA1 (patch-ad) = a2293c767e0c5b6d4866449c5fbc4613ec664512
SHA1 (patch-ae) = ac8f4f5b7abf03c057ff293ab82c7176bc51a3f6
diff --git a/sysutils/munin-server/patches/patch-ad b/sysutils/munin-server/patches/patch-ad
index c66af5a5c8c..24e93675412 100644
--- a/sysutils/munin-server/patches/patch-ad
+++ b/sysutils/munin-server/patches/patch-ad
@@ -1,24 +1,24 @@
-$NetBSD: patch-ad,v 1.2 2006/07/21 16:23:42 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2006/12/05 14:53:32 xtraeme Exp $
---- Makefile.orig 2004-12-22 21:33:47.000000000 +0000
-+++ Makefile
-@@ -16,7 +16,7 @@ install: install-main install-node insta
-
+--- Makefile.orig 2006-12-05 15:43:41.000000000 +0100
++++ Makefile 2006-12-05 15:46:20.000000000 +0100
+@@ -18,6 +18,7 @@
install-main: build
$(CHECKUSER)
-- mkdir -p $(CONFDIR)/templates
+ mkdir -p $(CONFDIR)/templates
+ mkdir -p $(EGDIR)/templates
mkdir -p $(LIBDIR)
mkdir -p $(BINDIR)
mkdir -p $(PERLLIB)
-@@ -24,18 +24,17 @@ install-main: build
+@@ -25,19 +26,20 @@
mkdir -p $(LOGDIR)
mkdir -p $(STATEDIR)
mkdir -p $(HTMLDIR)
+ mkdir -p $(CGIDIR)
mkdir -p $(DBDIR)
+ mkdir -p $(CGIDIR)
-- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
+ $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
+ $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) $(CGIDIR)
for p in build/server/*.tmpl; do \
@@ -28,15 +28,15 @@ $NetBSD: patch-ad,v 1.2 2006/07/21 16:23:42 wiz Exp $
- $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/
- $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
- $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
--
-- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
+ $(INSTALL) -m 0644 server/logo.png $(EGDIR)/templates/
+ $(INSTALL) -m 0644 server/style.css $(EGDIR)/templates/
+ $(INSTALL) -m 0644 server/definitions.html $(EGDIR)/templates/
+- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
+
$(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
-@@ -71,7 +70,6 @@ install-node-non-snmp: build
+@@ -73,7 +75,6 @@
$(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
$(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 17:14:44 +0000