Date: Thu, 6 Dec 2012 14:27:28 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308385 - in head/sysutils: munin-common munin-master munin-node/files Message-ID: <201212061427.qB6ERSlR064455@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Thu Dec 6 14:27:28 2012 New Revision: 308385 URL: http://svnweb.freebsd.org/changeset/ports/308385 Log: - update to 2.0.9 - use correct pidfile for munin-sched rc script [1] - munin-cgi-graph requires FCGI [2] Submitted by: Geoffroy Desvernay <dgeo@centrale-marseille.fr> [1] Sergey V. Dyatko <sergey.dyatko@gmail.com> [2] Feature safe: yes Modified: head/sysutils/munin-common/distinfo head/sysutils/munin-common/munin.mk head/sysutils/munin-common/pkg-plist head/sysutils/munin-master/Makefile head/sysutils/munin-master/pkg-plist head/sysutils/munin-node/files/munin-node.in (contents, props changed) head/sysutils/munin-node/files/munin-sched.in head/sysutils/munin-node/files/patch-node__sbin__munin-node Modified: head/sysutils/munin-common/distinfo ============================================================================== --- head/sysutils/munin-common/distinfo Thu Dec 6 14:13:34 2012 (r308384) +++ head/sysutils/munin-common/distinfo Thu Dec 6 14:27:28 2012 (r308385) @@ -1,2 +1,2 @@ -SHA256 (munin-2.0.7.tar.gz) = 3daf42722ebd74a6269aa290b9f5821e2206df7b0fd6a39876863ff1a9b50c2e -SIZE (munin-2.0.7.tar.gz) = 1326773 +SHA256 (munin-2.0.9.tar.gz) = 6bb2b42de29a438ad80f1d6c53f4a35e9a74cb5a2103ea7a9530cba2d75c7309 +SIZE (munin-2.0.9.tar.gz) = 1328972 Modified: head/sysutils/munin-common/munin.mk ============================================================================== --- head/sysutils/munin-common/munin.mk Thu Dec 6 14:13:34 2012 (r308384) +++ head/sysutils/munin-common/munin.mk Thu Dec 6 14:27:28 2012 (r308385) @@ -1,4 +1,4 @@ -MUNIN_VERSION= 2.0.7 +MUNIN_VERSION= 2.0.9 MUNIN_SITES= SF/${PORTNAME}/stable/${PORTVERSION} MUNIN_DISTINFO= ${PORTSDIR}/sysutils/munin-common/distinfo MUNIN_PATCHES= ${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \ Modified: head/sysutils/munin-common/pkg-plist ============================================================================== --- head/sysutils/munin-common/pkg-plist Thu Dec 6 14:13:34 2012 (r308384) +++ head/sysutils/munin-common/pkg-plist Thu Dec 6 14:27:28 2012 (r308385) @@ -10,4 +10,4 @@ @dirrm %%SITE_PERL%%/Munin @exec mkdir -p %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% @exec chown %%USER%%:%%GROUP%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% -@unexec rmdir %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% 2>/dev/null || /usr/bin/true +@unexec rmdir %%DBDIR%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% 2>/dev/null || /usr/bin/true Modified: head/sysutils/munin-master/Makefile ============================================================================== --- head/sysutils/munin-master/Makefile Thu Dec 6 14:13:34 2012 (r308384) +++ head/sysutils/munin-master/Makefile Thu Dec 6 14:27:28 2012 (r308385) @@ -38,7 +38,8 @@ RUN_DEPENDS= munin-common>=0:${PORTSDIR} p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \ p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced \ p5-URI>=0:${PORTSDIR}/net/p5-URI \ - p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip + p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \ + p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI USE_PERL5= yes USE_GMAKE= yes Modified: head/sysutils/munin-master/pkg-plist ============================================================================== --- head/sysutils/munin-master/pkg-plist Thu Dec 6 14:13:34 2012 (r308384) +++ head/sysutils/munin-master/pkg-plist Thu Dec 6 14:27:28 2012 (r308385) @@ -64,6 +64,7 @@ www/cgi-bin/munin-cgi-html @dirrmtry www/cgi-bin @dirrmtry %%WWWDIR%% @dirrmtry %%DATADIR%% +@dirrmtry %%DBDIR%%/cgi-tmp @dirrmtry %%DBDIR%% @dirrm %%SITE_PERL%%/Munin/Master @dirrmtry %%SITE_PERL%%/Munin Modified: head/sysutils/munin-node/files/munin-node.in ============================================================================== --- head/sysutils/munin-node/files/munin-node.in Thu Dec 6 14:13:34 2012 (r308384) +++ head/sysutils/munin-node/files/munin-node.in Thu Dec 6 14:27:28 2012 (r308385) @@ -21,6 +21,7 @@ rcvar=munin_node_enable [ -z "$munin_node_config" ] && munin_node_config="%%PREFIX%%/etc/munin/munin-node.conf" command="%%PREFIX%%/sbin/munin-node" +command_interpreter="%%PERL%%" pidfile=`awk '$1 == "pid_file" { print $2 }' $munin_node_config` load_rc_config $name Modified: head/sysutils/munin-node/files/munin-sched.in ============================================================================== --- head/sysutils/munin-node/files/munin-sched.in Thu Dec 6 14:13:34 2012 (r308384) +++ head/sysutils/munin-node/files/munin-sched.in Thu Dec 6 14:27:28 2012 (r308385) @@ -21,7 +21,7 @@ rcvar=munin_sched_enable [ -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` +pidfile=`awk '$1 == "pid_file" { gsub("node","sched",$2); print $2; }' $munin_sched_config` load_rc_config $name run_rc_command "$1" Modified: head/sysutils/munin-node/files/patch-node__sbin__munin-node ============================================================================== --- head/sysutils/munin-node/files/patch-node__sbin__munin-node Thu Dec 6 14:13:34 2012 (r308384) +++ head/sysutils/munin-node/files/patch-node__sbin__munin-node Thu Dec 6 14:27:28 2012 (r308385) @@ -1,15 +1,13 @@ ---- node/sbin/munin-node.orig 2012-07-24 12:45:57.000000000 +0200 -+++ node/sbin/munin-node 2012-07-30 11:30:49.735734436 +0200 -@@ -53,8 +53,11 @@ - $ENV{$key} =~ /^(.*)$/; +--- node/sbin/munin-node.orig 2012-11-12 14:10:58.234196646 +0100 ++++ node/sbin/munin-node 2012-11-12 14:11:19.591568597 +0100 +@@ -54,6 +54,10 @@ $ENV{$key} = $1; } + + # plugins run in taint mode because the uid is changed, so the path + # must not contain writable directories. + $ENV{PATH}='/bin:/sbin:/usr/bin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin'; - -- $0 =~ /([^\/]*)$/; -+ $0 =~ /^(.*)$/; - $0 = $1; - ++ parse_args(); + + my $config = Munin::Node::Config->instance();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212061427.qB6ERSlR064455>