Received: by mail.netbsd.org (Postfix, from userid 605) id 5475684D8C; Thu, 9 Apr 2020 15:00:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D12AC84D62 for ; Thu, 9 Apr 2020 15:00:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id I3aTPWDs2jGW for ; Thu, 9 Apr 2020 15:00:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 14B1884CD4 for ; Thu, 9 Apr 2020 15:00:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0E34AFB27; Thu, 9 Apr 2020 15:00:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1586444448267170" MIME-Version: 1.0 Date: Thu, 9 Apr 2020 15:00:48 +0000 From: "Thomas Merkel" Subject: CVS commit: pkgsrc/sysutils To: pkgsrc-changes@NetBSD.org Reply-To: tm@netbsd.org X-Mailer: log_accum Message-Id: <20200409150048.0E34AFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1586444448267170 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tm Date: Thu Apr 9 15:00:47 UTC 2020 Modified Files: pkgsrc/sysutils/munin-common: Makefile Makefile.common distinfo pkgsrc/sysutils/munin-master: Makefile pkgsrc/sysutils/munin-node: Makefile PLIST PLIST.SunOS Log Message: munin: update to version 2.0.56 Bugfix release which include build fixes for pkgsrc To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/munin-common/Makefile \ pkgsrc/sysutils/munin-common/Makefile.common cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/munin-common/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/munin-master/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/munin-node/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/munin-node/PLIST cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/munin-node/PLIST.SunOS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1586444448267170 Content-Disposition: inline Content-Length: 7146 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/munin-common/Makefile diff -u pkgsrc/sysutils/munin-common/Makefile:1.2 pkgsrc/sysutils/munin-common/Makefile:1.3 --- pkgsrc/sysutils/munin-common/Makefile:1.2 Sun Mar 22 18:48:06 2020 +++ pkgsrc/sysutils/munin-common/Makefile Thu Apr 9 15:00:47 2020 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2020/03/22 18:48:06 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2020/04/09 15:00:47 tm Exp $ # PKGNAME= ${DISTNAME:S/munin/munin-common/} -PKGREVISION= 1 COMMENT= Common components between a munin node and master .include "../../sysutils/munin-common/Makefile.common" Index: pkgsrc/sysutils/munin-common/Makefile.common diff -u pkgsrc/sysutils/munin-common/Makefile.common:1.2 pkgsrc/sysutils/munin-common/Makefile.common:1.3 --- pkgsrc/sysutils/munin-common/Makefile.common:1.2 Sun Mar 22 18:48:06 2020 +++ pkgsrc/sysutils/munin-common/Makefile.common Thu Apr 9 15:00:47 2020 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.2 2020/03/22 18:48:06 rillig Exp $ +# $NetBSD: Makefile.common,v 1.3 2020/04/09 15:00:47 tm Exp $ # # used by sysutils/munin-common/Makefile # used by sysutils/munin-master/Makefile # used by sysutils/munin-node/Makefile -VERSION= 2.0.49 +VERSION= 2.0.56 DISTNAME= munin-${VERSION} CATEGORIES= sysutils MASTER_SITES= http://downloads.munin-monitoring.org/munin/stable/${VERSION}/ Index: pkgsrc/sysutils/munin-common/distinfo diff -u pkgsrc/sysutils/munin-common/distinfo:1.3 pkgsrc/sysutils/munin-common/distinfo:1.4 --- pkgsrc/sysutils/munin-common/distinfo:1.3 Fri Sep 13 08:21:08 2019 +++ pkgsrc/sysutils/munin-common/distinfo Thu Apr 9 15:00:47 2020 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2019/09/13 08:21:08 jperkin Exp $ +$NetBSD: distinfo,v 1.4 2020/04/09 15:00:47 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 (munin-2.0.56.tar.gz) = 8753d2b6b2ed2a10e48f2b880951d969a70c6d93 +RMD160 (munin-2.0.56.tar.gz) = 36ff9fa559d0b0e45612a2f8ad1ddcacaf7b05b8 +SHA512 (munin-2.0.56.tar.gz) = b7012cadac0658902ba04a62a7b51ac86e0e47f496451044926aaa0cb69cafdc5b89ef25e99a80658659a93da6532fc85626c195b04d10c0babe696b204f67ca +Size (munin-2.0.56.tar.gz) = 2264291 bytes SHA1 (patch-MANIFEST) = 538cec30723a6d41b732c9dc4a175472fb821609 SHA1 (patch-Makefile) = f3fd52b56fcddda3efca61453c23243fac35568a SHA1 (patch-Makefile.config) = aeaae9374c58c6baf1901ddb9b55a8fac77cf30c Index: pkgsrc/sysutils/munin-master/Makefile diff -u pkgsrc/sysutils/munin-master/Makefile:1.1 pkgsrc/sysutils/munin-master/Makefile:1.2 --- pkgsrc/sysutils/munin-master/Makefile:1.1 Mon Sep 9 12:21:44 2019 +++ pkgsrc/sysutils/munin-master/Makefile Thu Apr 9 15:00:47 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/09/09 12:21:44 tm Exp $ +# $NetBSD: Makefile,v 1.2 2020/04/09 15:00:47 tm Exp $ # PKGNAME= ${DISTNAME:S/munin/munin-master/} @@ -61,6 +61,7 @@ CONF_FILES+= ${STATIC_EGDIR}/${f} ${PKG_ INSTALLATION_DIRS+= ${EGDIR} CHECK_PORTABILITY_SKIP+= node/node.d/* +CHECK_PORTABILITY_SKIP+= plugins/* BUILD_TARGET= build INSTALL_TARGET= install-master-prime Index: pkgsrc/sysutils/munin-node/Makefile diff -u pkgsrc/sysutils/munin-node/Makefile:1.41 pkgsrc/sysutils/munin-node/Makefile:1.42 --- pkgsrc/sysutils/munin-node/Makefile:1.41 Sun Dec 15 15:38:58 2019 +++ pkgsrc/sysutils/munin-node/Makefile Thu Apr 9 15:00:47 2020 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2019/12/15 15:38:58 taca Exp $ +# $NetBSD: Makefile,v 1.42 2020/04/09 15:00:47 tm Exp $ # PKGNAME= ${DISTNAME:S/munin/munin-node/} -PKGREVISION= 1 COMMENT= System monitoring tool, client version .include "../../sysutils/munin-common/Makefile.common" @@ -15,8 +14,8 @@ DEPENDS+= p5-Net-Server>=0:../../net/p5- DEPENDS+= p5-Socket6>=0:../../net/p5-Socket6 DEPENDS+= p5-Time-HiRes>=0:../../time/p5-Time-HiRes -OWN_DIRS+= ${PKG_SYSCONFDIR}/plugin-conf.d -OWN_DIRS= ${PKG_SYSCONFDIR}/plugins +OWN_DIRS= ${PKG_SYSCONFDIR}/plugin-conf.d +OWN_DIRS+= ${PKG_SYSCONFDIR}/plugins OWN_DIRS_PERMS+= ${MUNIN_DBDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755 OWN_DIRS_PERMS+= ${MUNIN_LOGDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755 @@ -34,6 +33,8 @@ INSTALLATION_DIRS+= ${EGDIR} CHECK_INTERPRETER_SKIP+= lib/munin/plugins/tomcat_ +CHECK_PORTABILITY_SKIP+= plugins/* + RCD_SCRIPTS+= munin-node BUILD_TARGET= build Index: pkgsrc/sysutils/munin-node/PLIST diff -u pkgsrc/sysutils/munin-node/PLIST:1.15 pkgsrc/sysutils/munin-node/PLIST:1.16 --- pkgsrc/sysutils/munin-node/PLIST:1.15 Mon Sep 9 12:21:44 2019 +++ pkgsrc/sysutils/munin-node/PLIST Thu Apr 9 15:00:47 2020 @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.15 2019/09/09 12:21:44 tm Exp $ +@comment $NetBSD: PLIST,v 1.16 2020/04/09 15:00:47 tm Exp $ +bin/munin-get bin/munindoc lib/munin/plugins/amavis lib/munin/plugins/apache_accesses @@ -48,7 +49,6 @@ lib/munin/plugins/hp2000_ lib/munin/plugins/http_loadtime lib/munin/plugins/ifx_concurrent_sessions_ lib/munin/plugins/ipac-ng -lib/munin/plugins/ipmi_ lib/munin/plugins/ipmi_sensor_ lib/munin/plugins/ircu lib/munin/plugins/loggrep @@ -71,7 +71,6 @@ lib/munin/plugins/mysql_queries lib/munin/plugins/mysql_slowqueries lib/munin/plugins/mysql_threads lib/munin/plugins/named -lib/munin/plugins/netopia lib/munin/plugins/netstat lib/munin/plugins/nginx_request lib/munin/plugins/nginx_status @@ -179,7 +178,6 @@ lib/munin/plugins/tomcat_access lib/munin/plugins/tomcat_jvm lib/munin/plugins/tomcat_threads lib/munin/plugins/tomcat_volume -lib/munin/plugins/users lib/munin/plugins/varnish_ lib/munin/plugins/vmstat lib/munin/plugins/zimbra_ @@ -201,6 +199,7 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node ${PERL5_SUB_INSTALLVENDORLIB}/Munin/Plugin.pm ${PERL5_SUB_INSTALLVENDORLIB}/Munin/Plugin/Pgsql.pm ${PERL5_SUB_INSTALLVENDORLIB}/Munin/Plugin/SNMP.pm +man/man1/munin-get.1 man/man1/munin-node-configure.1 man/man1/munin-node.1 man/man1/munin-run.1 @@ -227,6 +226,5 @@ sbin/munin-node sbin/munin-node-configure sbin/munin-run share/examples/munin/munin-node.conf -share/examples/rc.d/munin-node @pkgdir etc/munin/plugin-conf.d @pkgdir var/munin/plugin-state Index: pkgsrc/sysutils/munin-node/PLIST.SunOS diff -u pkgsrc/sysutils/munin-node/PLIST.SunOS:1.1 pkgsrc/sysutils/munin-node/PLIST.SunOS:1.2 --- pkgsrc/sysutils/munin-node/PLIST.SunOS:1.1 Mon Sep 9 12:21:44 2019 +++ pkgsrc/sysutils/munin-node/PLIST.SunOS Thu Apr 9 15:00:47 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.SunOS,v 1.1 2019/09/09 12:21:44 tm Exp $ +@comment $NetBSD: PLIST.SunOS,v 1.2 2020/04/09 15:00:47 tm Exp $ lib/munin/plugins/cpu lib/munin/plugins/if_ lib/munin/plugins/if_err_ @@ -9,7 +9,9 @@ lib/munin/plugins/iostat lib/munin/plugins/ipmi_ lib/munin/plugins/load lib/munin/plugins/memory +lib/munin/plugins/netopia lib/munin/plugins/paging_in lib/munin/plugins/paging_out lib/munin/plugins/temperature lib/munin/plugins/uptime +lib/munin/plugins/users --_----------=_1586444448267170--