[pkgsrc/trunk]: pkgsrc/sysutils Update munin packages to 1.3.2, latest develo...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils Update munin packages to 1.3.2, latest develo...
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:17:47 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/af5f83fe1f8d
branches:  trunk
changeset: 522191:af5f83fe1f8d
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Dec 05 14:53:32 2006 +0000

description:
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:

 sysutils/munin-doc/Makefile            |   4 ++--
 sysutils/munin-doc/PLIST               |   4 +++-
 sysutils/munin-doc/distinfo            |   8 ++++----
 sysutils/munin-node/MESSAGE            |   3 +--
 sysutils/munin-node/Makefile           |  11 ++++++-----
 sysutils/munin-node/PLIST              |   4 +++-
 sysutils/munin-node/distinfo           |   8 ++++----
 sysutils/munin-server/Makefile         |  12 ++++++++----
 sysutils/munin-server/distinfo         |  10 +++++-----
 sysutils/munin-server/patches/patch-ad |  22 +++++++++++-----------
 10 files changed, 47 insertions(+), 39 deletions(-)

diffs (263 lines):

diff -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-doc/Makefile
--- a/sysutils/munin-doc/Makefile       Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-doc/Makefile       Tue Dec 05 14:53:32 2006 +0000
@@ -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 -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-doc/PLIST
--- a/sysutils/munin-doc/PLIST  Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-doc/PLIST  Tue Dec 05 14:53:32 2006 +0000
@@ -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-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 -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-doc/distinfo
--- a/sysutils/munin-doc/distinfo       Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-doc/distinfo       Tue Dec 05 14:53:32 2006 +0000
@@ -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 -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-node/MESSAGE
--- a/sysutils/munin-node/MESSAGE       Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-node/MESSAGE       Tue Dec 05 14:53:32 2006 +0000
@@ -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 -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-node/Makefile
--- a/sysutils/munin-node/Makefile      Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-node/Makefile      Tue Dec 05 14:53:32 2006 +0000
@@ -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@localhost
 HOMEPAGE=      http://munin.sourceforge.net/
@@ -16,7 +15,7 @@
 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 @@
 
 MESSAGE_SUBST+=        VARBASE=${VARBASE:Q}
 
+BUILD_DEFS+=   VARBASE
+
 RCD_SCRIPTS+=  munin-node
 
 EGDIR=         ${PREFIX}/share/examples/munin
@@ -79,7 +80,7 @@
 
 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 -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-node/PLIST
--- a/sysutils/munin-node/PLIST Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-node/PLIST Tue Dec 05 14:53:32 2006 +0000
@@ -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/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_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 -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-node/distinfo
--- a/sysutils/munin-node/distinfo      Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-node/distinfo      Tue Dec 05 14:53:32 2006 +0000
@@ -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 -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-server/Makefile
--- a/sysutils/munin-server/Makefile    Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-server/Makefile    Tue Dec 05 14:53:32 2006 +0000
@@ -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 @@
 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}/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 @@
 
 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 -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-server/distinfo
--- a/sysutils/munin-server/distinfo    Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-server/distinfo    Tue Dec 05 14:53:32 2006 +0000
@@ -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 -r 1136b904fd24 -r af5f83fe1f8d sysutils/munin-server/patches/patch-ad
--- a/sysutils/munin-server/patches/patch-ad    Tue Dec 05 14:26:28 2006 +0000
+++ b/sysutils/munin-server/patches/patch-ad    Tue Dec 05 14:53:32 2006 +0000
@@ -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 @@
 -      $(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)/
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/pango Back out the previous change that removed ...
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/squirrelmail Use PKGMANDIR.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/pango Back out the previous change that removed ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/squirrelmail Use PKGMANDIR.
Indexes:
Home | Main Index | Thread Index | Old Index