Date: Mon, 27 Aug 2012 14:55:21 +0200 (CEST) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: flo@FreeBSD.org Subject: ports/171116: [PATCH] sysutils/munin-common: update to 2.0.5 Message-ID: <20120827125521.8385A9FC9@neo.vx.sk> Resent-Message-ID: <201208271310.q7RDA2DH009013@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171116
>Category: ports
>Synopsis: [PATCH] sysutils/munin-common: update to 2.0.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 27 13:10:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 9.0-STABLE FreeBSD 9.0-STABLE #6 r237147M: Sat Jun 16 01:05:38 CEST
>Description:
- Update to 2.0.5
Modified files:
D munin-master/distinfo
D munin-master/files/patch-master-__bin-munin-check.in
D munin-master/files/patch-Makefile
D munin-master/files/patch-Makefile.config
M munin-master/pkg-plist
M munin-master/Makefile
D munin-node/distinfo
A munin-node/files/munin-sched.in
M munin-node/files/patch-plugins__node.d__squeezebox_.in
D munin-node/files/patch-Makefile
D munin-node/files/patch-Makefile.config
M munin-node/files/patch-plugins__node.d__colour_tester.in
D munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff
M munin-node/pkg-plist
M munin-node/Makefile
M munin-common/distinfo
M munin-common/files/patch-Makefile
M munin-common/pkg-plist
M munin-common/munin.mk
M munin-common/Makefile
>How-To-Repeat:
>Fix:
Index: munin-master/distinfo
===================================================================
--- munin-master/distinfo (revision 303222)
+++ munin-master/distinfo (working copy)
@@ -1,2 +0,0 @@
-SHA256 (munin-1.4.7.tar.gz) = 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
-SIZE (munin-1.4.7.tar.gz) = 1236273
Index: munin-master/files/patch-master-__bin-munin-check.in
===================================================================
--- munin-master/files/patch-master-__bin-munin-check.in (revision 303222)
+++ munin-master/files/patch-master-__bin-munin-check.in (working copy)
@@ -1,20 +0,0 @@
---- master/_bin/munin-check.in.orig 2009-12-29 17:03:49.000000000 +0100
-+++ master/_bin/munin-check.in 2010-12-02 23:48:25.854543201 +0100
-@@ -78,7 +78,7 @@
- object=$1; shift || exit 1
- correctowner=$1; shift || exit 1
-
-- owner=$(stat -c%U $object)
-+ owner=$(stat -f%Su $object)
- if [ "$owner" != "$correctowner" ]; then
- echo "# $object : Wrong owner ($owner != $correctowner)";
- if [ "$PLEASE_FIXME" = "true" ]; then
-@@ -108,7 +108,7 @@
- object=$1; shift || exit 1
- correctperm=$1; shift || exit 1
-
-- perm=$(stat -c%a $object)
-+ perm=$(stat -f%OLp $object)
- if [ "$perm" != "$correctperm" ]; then
- echo "# $object : Wrong permissions ($perm != $correctperm)";
- if [ "$PLEASE_FIXME" = "true" ]; then
Index: munin-master/files/patch-Makefile
===================================================================
--- munin-master/files/patch-Makefile (revision 303222)
+++ munin-master/files/patch-Makefile (working copy)
@@ -1,11 +0,0 @@
---- Makefile.orig 2010-01-30 10:49:44.000000000 -0700
-+++ Makefile 2010-01-30 10:49:53.000000000 -0700
-@@ -69,7 +69,7 @@
- mkdir -p $(LOGDIR)
- mkdir -p $(STATEDIR)
- mkdir -p $(CONFDIR)
-- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
-+ $(CHOWN) $(USER) $(STATEDIR)
-
- install-master-prime: $(INFILES_MASTER) install-pre install-master
- mkdir -p $(CONFDIR)/templates
Index: munin-master/files/patch-Makefile.config
===================================================================
--- munin-master/files/patch-Makefile.config (revision 303222)
+++ munin-master/files/patch-Makefile.config (working copy)
@@ -1,14 +0,0 @@
---- Makefile.config.orig 2009-12-30 05:55:56.000000000 -0700
-+++ Makefile.config 2010-01-30 11:17:34.000000000 -0700
-@@ -126,9 +129,8 @@
- # Which command to use to check if the USER and GROUP to run Munin as, exists.
- # These will work on most modern OSes:
- #
--GETENT := $(shell which getent || which true 2>/dev/null)
--CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
--CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
-+CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
-+CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
-
- # For OSX, comment out the previous two lines and comment in these
- #
Index: munin-master/pkg-plist
===================================================================
--- munin-master/pkg-plist (revision 303222)
+++ munin-master/pkg-plist (working copy)
@@ -3,31 +3,43 @@
@unexec if cmp -s %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; then rm -f %D/%%ETCDIR%%/munin.conf ; fi
%%ETCDIR%%/munin.conf.sample
@exec if [ ! -f %D/%%ETCDIR%%/munin.conf ] ; then cp -p %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; fi
-%%ETCDIR%%/templates/definitions.html
-%%ETCDIR%%/templates/favicon.ico
-%%ETCDIR%%/templates/logo-h.png
-%%ETCDIR%%/templates/logo.png
+%%ETCDIR%%/static/definitions.html
+%%ETCDIR%%/static/dynazoom.html
+%%ETCDIR%%/static/favicon.ico
+%%ETCDIR%%/static/formatdate.js
+%%ETCDIR%%/static/logo-h.png
+%%ETCDIR%%/static/logo.png
+%%ETCDIR%%/static/querystring.js
+%%ETCDIR%%/static/style-1.2.css
+%%ETCDIR%%/static/style-new.css
+%%ETCDIR%%/static/style.css
+%%ETCDIR%%/static/zoom.js
%%ETCDIR%%/templates/munin-comparison-day.tmpl
%%ETCDIR%%/templates/munin-comparison-month.tmpl
%%ETCDIR%%/templates/munin-comparison-week.tmpl
%%ETCDIR%%/templates/munin-comparison-year.tmpl
+%%ETCDIR%%/templates/munin-categoryview.tmpl
+%%ETCDIR%%/templates/munin-dynazoom.tmpl
%%ETCDIR%%/templates/munin-domainview.tmpl
%%ETCDIR%%/templates/munin-nodeview.tmpl
%%ETCDIR%%/templates/munin-overview.tmpl
+%%ETCDIR%%/templates/munin-problemview.tmpl
%%ETCDIR%%/templates/munin-serviceview.tmpl
%%ETCDIR%%/templates/partial/bottom_navigation.tmpl
+%%ETCDIR%%/templates/partial/footer.tmpl
%%ETCDIR%%/templates/partial/generated_by.tmpl
%%ETCDIR%%/templates/partial/head.tmpl
%%ETCDIR%%/templates/partial/logo_navigation.tmpl
%%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl
+%%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl
%%ETCDIR%%/templates/partial/logo_path.tmpl
+%%ETCDIR%%/templates/partial/navigation.tmpl
%%ETCDIR%%/templates/partial/path.tmpl
-%%ETCDIR%%/templates/style-1.2.css
-%%ETCDIR%%/templates/style.css
%%SITE_PERL%%/Munin/Master/Config.pm
%%SITE_PERL%%/Munin/Master/GraphOld.pm
%%SITE_PERL%%/Munin/Master/Group.pm
%%SITE_PERL%%/Munin/Master/GroupRepository.pm
+%%SITE_PERL%%/Munin/Master/HTMLConfig.pm
%%SITE_PERL%%/Munin/Master/HTMLOld.pm
%%SITE_PERL%%/Munin/Master/Host.pm
%%SITE_PERL%%/Munin/Master/LimitsOld.pm
@@ -40,19 +52,22 @@
%%SITE_PERL%%/Munin/Master/Worker.pm
%%DATADIR%%/DejaVuSans.ttf
%%DATADIR%%/DejaVuSansMono.ttf
+%%DATADIR%%/munin-datafile2storable
%%DATADIR%%/munin-graph
%%DATADIR%%/munin-html
%%DATADIR%%/munin-limits
+%%DATADIR%%/munin-storable2datafile
%%DATADIR%%/munin-update
%%WWWDIR%%/.htaccess
www/cgi-bin/munin-cgi-graph
-www/cgi-bin/munin-fastcgi-graph
+www/cgi-bin/munin-cgi-html
@dirrmtry www/cgi-bin
@dirrmtry %%WWWDIR%%
@dirrmtry %%DATADIR%%
@dirrmtry %%DBDIR%%
@dirrm %%SITE_PERL%%/Munin/Master
@dirrmtry %%SITE_PERL%%/Munin
+@dirrmtry %%ETCDIR%%/static
@dirrmtry %%ETCDIR%%/templates/partial
@dirrmtry %%ETCDIR%%/templates
@exec mkdir -p %D/%%ETCDIR%%/munin-conf.d
Index: munin-master/Makefile
===================================================================
--- munin-master/Makefile (revision 303222)
+++ munin-master/Makefile (working copy)
@@ -6,10 +6,9 @@
#
PORTNAME= munin
-PORTVERSION= 1.4.7
-PORTREVISION= 3
+PORTVERSION= ${MUNIN_VERSION}
CATEGORIES= sysutils perl5
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
+MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -master
MAINTAINER= flo@FreeBSD.org
@@ -17,22 +16,30 @@
BUILD_DEPENDS= p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
munin-common>=0:${PORTSDIR}/sysutils/munin-common \
- p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
rrdtool>=0:${PORTSDIR}/databases/rrdtool \
p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
+ p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
+ p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
+ p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
+ p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
+ p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced
RUN_DEPENDS= munin-common>=0:${PORTSDIR}/sysutils/munin-common \
rrdtool>=0:${PORTSDIR}/databases/rrdtool \
- p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
+ p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \
p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
+ p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
+ p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
+ p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
+ p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced
USE_PERL5= yes
@@ -41,7 +48,9 @@
.include "${.CURDIR}/../munin-common/munin.mk"
-ALL_TARGET= build-master build-man
+EXTRA_PATCHES= ${MUNIN_PATCHES}
+DISTINFO_FILE= ${MUNIN_DISTINFO}
+ALL_TARGET= infiles build-master build-man
INSTALL_TARGET= install-master-prime
MAN3= Munin::Master::Config.3 \
Index: munin-node/distinfo
===================================================================
--- munin-node/distinfo (revision 303222)
+++ munin-node/distinfo (working copy)
@@ -1,2 +0,0 @@
-SHA256 (munin-1.4.7.tar.gz) = 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
-SIZE (munin-1.4.7.tar.gz) = 1236273
Index: munin-node/files/munin-sched.in
===================================================================
--- munin-node/files/munin-sched.in (revision 0)
+++ munin-node/files/munin-sched.in (working copy)
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+
+# PROVIDE: munin-sched
+# REQUIRE: DAEMON
+# BEFORE: cron
+
+#
+# Add the following lines to /etc/rc.conf to enable munin-sched:
+# munin_sched_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable munin-sched
+# munin_sched_config (path): Set to "%%PREFIX%%/etc/munin/munin-node.conf" by default.
+#
+
+. /etc/rc.subr
+
+name="munin_sched"
+rcvar=munin_sched_enable
+
+[ -z "$munin_sched_enable" ] && munin_sched_enable="NO"
+[ -z "$munin_sched_config" ] && munin_sched_config="%%PREFIX%%/etc/munin/munin-node.conf"
+
+command="%%PREFIX%%/sbin/munin-sched"
+pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_sched_config`
+
+load_rc_config $name
+run_rc_command "$1"
Index: munin-node/files/patch-plugins__node.d__squeezebox_.in
===================================================================
--- munin-node/files/patch-plugins__node.d__squeezebox_.in (revision 303222)
+++ munin-node/files/patch-plugins__node.d__squeezebox_.in (working copy)
@@ -1,24 +1,24 @@
---- ./plugins/node.d/squeezebox_.in.orig 2010-03-09 22:23:57.000000000 +0100
-+++ ./plugins/node.d/squeezebox_.in 2010-03-09 22:24:16.000000000 +0100
-@@ -157,7 +157,7 @@ if [ "$CMD" = "years" ]; then
- # echo "graph_order y0"
- echo -n "graph_order y"; echo $years_array | sed 's/ / y/g'
+--- ./plugins/node.d/squeezebox_.in.orig 2012-08-14 17:19:40.000000000 +0200
++++ ./plugins/node.d/squeezebox_.in 2012-08-27 13:55:40.573530762 +0200
+@@ -156,7 +156,7 @@
+ printf "graph_order y"
+ echo $years_array | sed 's/ / y/g'
- for i in `seq 0 $no_of_years`; do
+ for i in `jot - 0 $no_of_years`; do
year=$(echo ${arr1[$i]})
if [ $year = 0 ]; then
echo y0.label No year
-@@ -172,7 +172,7 @@ if [ "$CMD" = "years" ]; then
+@@ -171,7 +171,7 @@
done
exit 0
- fi
+ fi
- for i in `seq 0 $no_of_years`; do
+ for i in `jot - 0 $no_of_years`; do
year=$(echo ${arr1[$i]})
- echo -n "y${year}.value "
+ printf "y%s.value " ${year}
printf "%b" "albums 0 0 year:${year}\nexit\n" | $NC $HOST $PORT | sed 's/%3A/:/g' | cut -d ':' -f 3
-@@ -183,7 +183,7 @@ elif [ "$CMD" = "signalstrength" -o "$CM
+@@ -182,7 +182,7 @@
echo "graph_category Squeezebox"
COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3)
(( COUNT-- ))
@@ -27,7 +27,7 @@
MAC=$(printf "%b" "player id $ID ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%3A/:/g')
NAME=$(printf "%b" "player name $MAC ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 4 | sed 's/%20/ /g')
MAC2=$(echo $MAC | sed 's/://g; s/\./_/g')
-@@ -193,7 +193,7 @@ elif [ "$CMD" = "signalstrength" -o "$CM
+@@ -192,7 +192,7 @@
fi
COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3)
(( COUNT-- ))
Index: munin-node/files/patch-Makefile
===================================================================
--- munin-node/files/patch-Makefile (revision 303222)
+++ munin-node/files/patch-Makefile (working copy)
@@ -1,14 +0,0 @@
---- Makefile.orig 2009-12-30 05:55:56.000000000 -0700
-+++ Makefile 2010-01-30 12:57:44.000000000 -0700
-@@ -65,11 +65,8 @@
- endif
-
- install-pre: Makefile Makefile.config
-- @$(CHECKUSER)
-- mkdir -p $(LOGDIR)
- mkdir -p $(STATEDIR)
- mkdir -p $(CONFDIR)
-- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
-
- install-master-prime: $(INFILES_MASTER) install-pre install-master
- mkdir -p $(CONFDIR)/templates
Index: munin-node/files/patch-Makefile.config
===================================================================
--- munin-node/files/patch-Makefile.config (revision 303222)
+++ munin-node/files/patch-Makefile.config (working copy)
@@ -1,14 +0,0 @@
---- Makefile.config.orig 2009-12-30 05:55:56.000000000 -0700
-+++ Makefile.config 2010-01-30 11:17:34.000000000 -0700
-@@ -126,9 +129,8 @@
- # Which command to use to check if the USER and GROUP to run Munin as, exists.
- # These will work on most modern OSes:
- #
--GETENT := $(shell which getent || which true 2>/dev/null)
--CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
--CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
-+CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
-+CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
-
- # For OSX, comment out the previous two lines and comment in these
- #
Index: munin-node/files/patch-plugins__node.d__colour_tester.in
===================================================================
--- munin-node/files/patch-plugins__node.d__colour_tester.in (revision 303222)
+++ munin-node/files/patch-plugins__node.d__colour_tester.in (working copy)
@@ -1,5 +1,5 @@
---- ./plugins/node.d/colour_tester.in.orig 2010-03-09 22:23:28.000000000 +0100
-+++ ./plugins/node.d/colour_tester.in 2010-03-09 22:23:46.000000000 +0100
+--- ./plugins/node.d.debug/colour_tester.in.orig 2010-03-09 22:23:28.000000000 +0100
++++ ./plugins/node.d.debug/colour_tester.in 2010-03-09 22:23:46.000000000 +0100
@@ -29,7 +29,7 @@ NUMCOL=$(($I - 1))
Index: munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff
===================================================================
--- munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff (revision 303222)
+++ munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff (working copy)
@@ -1,11 +0,0 @@
---- ./plugins/node.d.freebsd/dev_cpu_.in.orig 2011-02-15 00:02:38.000000000 +0100
-+++ ./plugins/node.d.freebsd/dev_cpu_.in 2011-02-15 00:03:19.000000000 +0100
-@@ -109,7 +109,7 @@
- reqcpus
- for cpu in $cpus ; do
- echo -n "CPU$cpu.value "
-- sysctl -n "dev.cpu.$cpu.$func"
-+ sysctl -n "dev.cpu.$cpu.$func" | tr -d 'C'
- done
- }
-
Index: munin-node/pkg-plist
===================================================================
--- munin-node/pkg-plist (revision 303222)
+++ munin-node/pkg-plist (working copy)
@@ -15,10 +15,13 @@
%%SITE_PERL%%/Munin/Node/Configure/PluginList.pm
%%SITE_PERL%%/Munin/Node/Logger.pm
%%SITE_PERL%%/Munin/Node/OS.pm
+%%SITE_PERL%%/Munin/Node/ProxySpooler.pm
%%SITE_PERL%%/Munin/Node/SNMPConfig.pm
%%SITE_PERL%%/Munin/Node/Server.pm
%%SITE_PERL%%/Munin/Node/Service.pm
%%SITE_PERL%%/Munin/Node/Session.pm
+%%SITE_PERL%%/Munin/Node/SpoolReader.pm
+%%SITE_PERL%%/Munin/Node/SpoolWriter.pm
%%SITE_PERL%%/Munin/Node/Utils.pm
%%SITE_PERL%%/Munin/Plugin.pm
%%SITE_PERL%%/Munin/Plugin/Pgsql.pm
@@ -26,6 +29,7 @@
sbin/munin-node
sbin/munin-node-configure
sbin/munin-run
+sbin/munin-sched
%%DATADIR%%/plugins/amavis
%%DATADIR%%/plugins/apache_accesses
%%DATADIR%%/plugins/apache_processes
@@ -43,7 +47,6 @@
%%DATADIR%%/plugins/bind9
%%DATADIR%%/plugins/bind9_rndc
%%DATADIR%%/plugins/cmc_tc_sensor_
-%%DATADIR%%/plugins/colour_tester
%%DATADIR%%/plugins/coretemp
%%DATADIR%%/plugins/courier_
%%DATADIR%%/plugins/courier_mta_mailqueue
@@ -57,11 +60,9 @@
%%DATADIR%%/plugins/dhcpd3
%%DATADIR%%/plugins/digitemp_
%%DATADIR%%/plugins/ejabberd_
-%%DATADIR%%/plugins/env
%%DATADIR%%/plugins/exim_mailqueue
%%DATADIR%%/plugins/exim_mailqueue_alt
%%DATADIR%%/plugins/exim_mailstats
-%%DATADIR%%/plugins/extinfo_tester
%%DATADIR%%/plugins/fail2ban
%%DATADIR%%/plugins/foldingathome
%%DATADIR%%/plugins/foldingathome_rank
@@ -71,20 +72,21 @@
%%DATADIR%%/plugins/freeradius_proxy_acct
%%DATADIR%%/plugins/freeradius_proxy_auth
%%DATADIR%%/plugins/haproxy_
+%%DATADIR%%/plugins/haproxy_ng
%%DATADIR%%/plugins/hddtemp
%%DATADIR%%/plugins/hddtemp2
%%DATADIR%%/plugins/hddtemp_smartctl
%%DATADIR%%/plugins/hddtempd
+%%DATADIR%%/plugins/hp2000_
%%DATADIR%%/plugins/http_loadtime
-%%DATADIR%%/plugins/id
%%DATADIR%%/plugins/if_
%%DATADIR%%/plugins/if_errcoll_
%%DATADIR%%/plugins/ifx_concurrent_sessions_
%%DATADIR%%/plugins/iostat
%%DATADIR%%/plugins/ipac-ng
+%%DATADIR%%/plugins/ipmi_
%%DATADIR%%/plugins/ipmi_sensor_
%%DATADIR%%/plugins/ircu
-%%DATADIR%%/plugins/jmx_
%%DATADIR%%/plugins/load
%%DATADIR%%/plugins/loggrep
%%DATADIR%%/plugins/lpstat
@@ -94,7 +96,6 @@
%%DATADIR%%/plugins/memcached_
%%DATADIR%%/plugins/memory
%%DATADIR%%/plugins/mhttping
-%%DATADIR%%/plugins/multigraph_tester
%%DATADIR%%/plugins/multiping
%%DATADIR%%/plugins/multips
%%DATADIR%%/plugins/multips_memory
@@ -126,6 +127,8 @@
%%DATADIR%%/plugins/open_files
%%DATADIR%%/plugins/openvpn
%%DATADIR%%/plugins/perdition
+%%DATADIR%%/plugins/pgbouncer_connections
+%%DATADIR%%/plugins/pgbouncer_requests
%%DATADIR%%/plugins/ping_
%%DATADIR%%/plugins/plugin.sh
%%DATADIR%%/plugins/plugins.history
@@ -134,15 +137,19 @@
%%DATADIR%%/plugins/postfix_mailqueue
%%DATADIR%%/plugins/postfix_mailstats
%%DATADIR%%/plugins/postfix_mailvolume
+%%DATADIR%%/plugins/postgres_autovacuum
%%DATADIR%%/plugins/postgres_bgwriter
%%DATADIR%%/plugins/postgres_cache_
%%DATADIR%%/plugins/postgres_checkpoints
%%DATADIR%%/plugins/postgres_connections_
%%DATADIR%%/plugins/postgres_connections_db
%%DATADIR%%/plugins/postgres_locks_
+%%DATADIR%%/plugins/postgres_oldest_prepared_xact_
+%%DATADIR%%/plugins/postgres_prepared_xacts_
%%DATADIR%%/plugins/postgres_querylength_
%%DATADIR%%/plugins/postgres_scans_
%%DATADIR%%/plugins/postgres_size_
+%%DATADIR%%/plugins/postgres_streaming_
%%DATADIR%%/plugins/postgres_transactions_
%%DATADIR%%/plugins/postgres_tuples_
%%DATADIR%%/plugins/postgres_users
@@ -217,7 +224,6 @@
%%DATADIR%%/plugins/users
%%DATADIR%%/plugins/varnish_
%%DATADIR%%/plugins/vmstat
-%%DATADIR%%/plugins/warning_tester
%%DATADIR%%/plugins/zimbra_
@dirrmtry %%DBDIR%%/plugin-state
@dirrmtry %%DBDIR%%
Index: munin-node/Makefile
===================================================================
--- munin-node/Makefile (revision 303222)
+++ munin-node/Makefile (working copy)
@@ -6,9 +6,9 @@
#
PORTNAME= munin
-PORTVERSION= 1.4.7
+PORTVERSION= ${MUNIN_VERSION}
CATEGORIES= sysutils perl5
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
+MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -node
MAINTAINER= flo@FreeBSD.org
@@ -27,6 +27,8 @@
p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
bash:${PORTSDIR}/shells/bash
+DISTINFO_FILE= ${MUNIN_DISTINFO}
+EXTRA_PATCHES+= ${MUNIN_PATCHES}
USE_PERL5= yes
USE_GMAKE= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -40,6 +42,7 @@
MAN1= munin-node-configure.1 \
munin-node.1 \
munin-run.1 \
+ munin-sched.1 \
munindoc.1
MAN3_NODE= Munin::Node::Config.3 \
Munin::Node::Configure::Debug.3 \
@@ -49,10 +52,13 @@
Munin::Node::Configure::PluginList.3 \
Munin::Node::Logger.3 \
Munin::Node::OS.3 \
+ Munin::Node::ProxySpooler.3 \
Munin::Node::SNMPConfig.3 \
Munin::Node::Server.3 \
Munin::Node::Service.3 \
Munin::Node::Session.3 \
+ Munin::Node::SpoolReader.3 \
+ Munin::Node::SpoolWriter.3 \
Munin::Node::Utils.3
MAN3_PLUGIN= Munin::Plugin.3 \
Munin::Plugin::Pgsql.3 \
@@ -62,7 +68,7 @@
MAN8= munin.8
SUB_FILES= pkg-message munin-node-revive.sh
-USE_RC_SUBR= munin-node
+USE_RC_SUBR= munin-node munin-sched
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
Index: munin-common/distinfo
===================================================================
--- munin-common/distinfo (revision 303222)
+++ munin-common/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (munin-1.4.7.tar.gz) = 9a87356b1f8662f444a7a2a86ff36809124ffe787c442de0ea35850194d602af
-SIZE (munin-1.4.7.tar.gz) = 1236273
+SHA256 (munin-2.0.5.tar.gz) = 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785
+SIZE (munin-2.0.5.tar.gz) = 1319398
Index: munin-common/files/patch-Makefile
===================================================================
--- munin-common/files/patch-Makefile (revision 303222)
+++ munin-common/files/patch-Makefile (working copy)
@@ -1,11 +1,18 @@
---- Makefile.orig 2010-01-30 10:49:44.000000000 -0700
-+++ Makefile 2010-01-30 10:49:53.000000000 -0700
-@@ -69,7 +69,7 @@
- mkdir -p $(LOGDIR)
- mkdir -p $(STATEDIR)
+--- Makefile.orig 2012-08-14 17:19:40.000000000 +0200
++++ Makefile 2012-08-27 13:30:39.664510751 +0200
+@@ -68,11 +68,11 @@
+
+ install-pre: Makefile Makefile.config
+ @$(CHECKUSER)
+- mkdir -p $(LOGDIR)
+- mkdir -p $(STATEDIR)
+- mkdir -p $(SPOOLDIR)
++# mkdir -p $(LOGDIR)
++# mkdir -p $(STATEDIR)
++# mkdir -p $(SPOOLDIR)
mkdir -p $(CONFDIR)
-- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
-+ $(CHOWN) $(USER) $(STATEDIR)
+- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
++# $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
install-master-prime: $(INFILES_MASTER) install-pre install-master
mkdir -p $(CONFDIR)/templates
Index: munin-common/pkg-plist
===================================================================
--- munin-common/pkg-plist (revision 303222)
+++ munin-common/pkg-plist (working copy)
@@ -1,12 +1,13 @@
%%SITE_PERL%%/Munin/Common/Config.pm
%%SITE_PERL%%/Munin/Common/Defaults.pm
+%%SITE_PERL%%/Munin/Common/DictFile.pm
+%%SITE_PERL%%/Munin/Common/SyncDictFile.pm
%%SITE_PERL%%/Munin/Common/TLS.pm
%%SITE_PERL%%/Munin/Common/TLSClient.pm
%%SITE_PERL%%/Munin/Common/TLSServer.pm
%%SITE_PERL%%/Munin/Common/Timeout.pm
@dirrm %%SITE_PERL%%/Munin/Common
@dirrm %%SITE_PERL%%/Munin
-@exec mkdir -p %%LOGDIR%%
-@unexec /bin/rmdir %%LOGDIR%% 2>/dev/null || /usr/bin/true
-@exec mkdir -p %%STATEDIR%%
-@unexec /bin/rmdir %%STATEDIR%% 2>/dev/null || /usr/bin/true
+@exec mkdir -p %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
+@exec chown %%USER%%:%%GROUP%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%
+@unexec rmdir %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% 2>/dev/null || /usr/bin/true
Index: munin-common/munin.mk
===================================================================
--- munin-common/munin.mk (revision 303222)
+++ munin-common/munin.mk (working copy)
@@ -1,6 +1,13 @@
+MUNIN_VERSION= 2.0.5
+MUNIN_SITES= SF/${PORTNAME}/stable/${PORTVERSION}
+MUNIN_DISTINFO= ${PORTSDIR}/sysutils/munin-common/distinfo
+MUNIN_PATCHES= ${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
+ ${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config
+
DBDIR?= /var/${PORTNAME}
LOGDIR?= /var/log/${PORTNAME}
STATEDIR?= /var/run/${PORTNAME}
+SPOOLDIR?= /var/spool/${PORTNAME}
MUNIN_DIRS= BINDIR=${PREFIX}/bin \
CGIDIR=${PREFIX}/www/cgi-bin \
CONFDIR=${ETCDIR} \
@@ -11,10 +18,11 @@
LOGDIR=${LOGDIR} \
MANDIR=${MANPREFIX}/man \
SBINDIR=${PREFIX}/sbin \
- STATEDIR=${STATEDIR}
+ STATEDIR=${STATEDIR} \
+ SPOOLDIR=${SPOOLDIR}
MAKE_ARGS= ${MUNIN_DIRS} \
BASH=${LOCALBASE}/bin/bash \
PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}
-PLIST_SUB= ${MUNIN_DIRS}
-USERS= munin
-GROUPS= munin
+MUNIN_USER= munin
+MUNIN_GROUP= munin
+PLIST_SUB= ${MUNIN_DIRS} USER=${MUNIN_USER} GROUP=${MUNIN_GROUP}
Index: munin-common/Makefile
===================================================================
--- munin-common/Makefile (revision 303222)
+++ munin-common/Makefile (working copy)
@@ -6,9 +6,9 @@
#
PORTNAME= munin
-PORTVERSION= 1.4.7
+PORTVERSION= ${MUNIN_VERSION}
CATEGORIES= sysutils perl5
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
+MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -common
MAINTAINER= flo@FreeBSD.org
@@ -24,6 +24,9 @@
.include "${.CURDIR}/../munin-common/munin.mk"
+USERS= ${MUNIN_USER}
+GROUPS= ${MUNIN_GROUP}
+
ALL_TARGET= build-common-prime
INSTALL_TARGET= install-common
@@ -35,8 +38,8 @@
Munin::Common::Timeout.3
post-install:
- @${MKDIR} ${LOGDIR}
- @${CHOWN} ${USERS}:${GROUPS} ${LOGDIR}
+ @${MKDIR} ${LOGDIR} ${STATEDIR} ${SPOOLDIR}
+ @${CHOWN} ${USERS}:${GROUPS} ${LOGDIR} ${STADEDIR} ${SPOOLDIR}
@(cd ${WRKSRC}/common/blib/libdoc && for man in ${MAN3} ; do \
${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
done)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120827125521.8385A9FC9>