svn commit: r367171 - in head/sysutils/munin-node: . files
Mathieu Arnold
mat at FreeBSD.org
Wed Sep 3 07:28:43 UTC 2014
Author: mat
Date: Wed Sep 3 07:28:40 2014
New Revision: 367171
URL: http://svnweb.freebsd.org/changeset/ports/367171
QAT: https://qat.redports.org/buildarchive/r367171/
Log:
- Add missing dependency on www/p5-libwww [1]
- Fix fail2ban's path [2] (while there, make plugins.conf PREFIX safe)
- Fix multiping plugin [3] (while there, regenerate patches)
- Add a forgotten run dep on Java.
PR: 192341 [1]
Submitted by: fbsd at shoggothmedia.com [1]
PR: 179549 [2]
Submitted by: fabian at bug.ch [2]
PR: 192332 [3]
Submitted by: fbsd at shoggothmedia.com [3]
Sponsored by: Absolight
Added:
head/sysutils/munin-node/files/patch-plugins__node.d__multiping.in (contents, props changed)
head/sysutils/munin-node/files/plugins.conf.in
- copied, changed from r367013, head/sysutils/munin-node/files/plugins.conf
Deleted:
head/sysutils/munin-node/files/plugins.conf
Modified:
head/sysutils/munin-node/Makefile
head/sysutils/munin-node/files/patch-node__munin-node.conf.in
head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in
head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in
head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in
head/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in
head/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in
Modified: head/sysutils/munin-node/Makefile
==============================================================================
--- head/sysutils/munin-node/Makefile Wed Sep 3 06:44:34 2014 (r367170)
+++ head/sysutils/munin-node/Makefile Wed Sep 3 07:28:40 2014 (r367171)
@@ -3,6 +3,7 @@
PORTNAME= munin
PORTVERSION= ${MUNIN_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils perl5
MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -node
@@ -20,6 +21,7 @@ RUN_DEPENDS= p5-Cache-Cache>=0:${PORTSDI
munin-common>=0:${PORTSDIR}/sysutils/munin-common \
p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
+ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
bash:${PORTSDIR}/shells/bash
USES= gmake perl5 shebangfix
@@ -46,8 +48,9 @@ SNMP_RUN_DEPENDS+= p5-Net-SNMP>=0:${PORT
JAVA_USE= java=yes
JAVA_INSTALL_TARGET= install-plugins-java
JAVA_BUILD= yes
+JAVA_RUN= yes
-SUB_FILES= pkg-message
+SUB_FILES= pkg-message plugins.conf
USE_RC_SUBR= munin-node munin-sched
post-patch:
@@ -70,7 +73,7 @@ post-install:
${STAGEDIR}${PREFIX}/etc/rc.d/munin-node
${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \
${STAGEDIR}${ETCDIR}/munin-node.conf.sample
- ${INSTALL_DATA} ${FILESDIR}/plugins.conf \
+ ${INSTALL_DATA} ${WRKDIR}/plugins.conf \
${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf.sample
(cd ${WRKSRC}/node/blib/bindoc; \
${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 munin-sched.1 munindoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \
Modified: head/sysutils/munin-node/files/patch-node__munin-node.conf.in
==============================================================================
--- head/sysutils/munin-node/files/patch-node__munin-node.conf.in Wed Sep 3 06:44:34 2014 (r367170)
+++ head/sysutils/munin-node/files/patch-node__munin-node.conf.in Wed Sep 3 07:28:40 2014 (r367171)
@@ -1,4 +1,4 @@
---- node/munin-node.conf.in.orig 2013-07-19 16:30:03 UTC
+--- node/munin-node.conf.in.orig 2014-04-22 19:29:32 UTC
+++ node/munin-node.conf.in
@@ -10,7 +10,7 @@
setsid 1
Modified: head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in
==============================================================================
--- head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in Wed Sep 3 06:44:34 2014 (r367170)
+++ head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_.in Wed Sep 3 07:28:40 2014 (r367171)
@@ -1,4 +1,4 @@
---- plugins/node.d.freebsd/if_.in.orig 2013-07-19 16:30:03 UTC
+--- plugins/node.d.freebsd/if_.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d.freebsd/if_.in
@@ -83,9 +83,12 @@
if (NF == 10) {
Modified: head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in
==============================================================================
--- head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in Wed Sep 3 06:44:34 2014 (r367170)
+++ head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__if_errcoll_.in Wed Sep 3 07:28:40 2014 (r367171)
@@ -1,4 +1,4 @@
---- plugins/node.d.freebsd/if_errcoll_.in.orig 2013-07-19 16:30:03 UTC
+--- plugins/node.d.freebsd/if_errcoll_.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d.freebsd/if_errcoll_.in
@@ -59,9 +59,13 @@
print "ierrors.value", $5;
Modified: head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in
==============================================================================
--- head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in Wed Sep 3 06:44:34 2014 (r367170)
+++ head/sysutils/munin-node/files/patch-plugins__node.d.freebsd__iostat.in Wed Sep 3 07:28:40 2014 (r367171)
@@ -1,4 +1,4 @@
---- plugins/node.d.freebsd/iostat.in.orig 2013-07-19 16:30:03 UTC
+--- plugins/node.d.freebsd/iostat.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d.freebsd/iostat.in
@@ -56,13 +56,11 @@
for d in $drives; do
Modified: head/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in
==============================================================================
--- head/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in Wed Sep 3 06:44:34 2014 (r367170)
+++ head/sysutils/munin-node/files/patch-plugins__node.d__hddtemp_smartctl.in Wed Sep 3 07:28:40 2014 (r367171)
@@ -1,4 +1,4 @@
---- plugins/node.d/hddtemp_smartctl.in.orig 2013-07-19 16:30:03 UTC
+--- plugins/node.d/hddtemp_smartctl.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d/hddtemp_smartctl.in
@@ -162,7 +162,7 @@
Added: head/sysutils/munin-node/files/patch-plugins__node.d__multiping.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/munin-node/files/patch-plugins__node.d__multiping.in Wed Sep 3 07:28:40 2014 (r367171)
@@ -0,0 +1,10 @@
+--- plugins/node.d/multiping.in.orig 2014-04-22 19:29:32 UTC
++++ plugins/node.d/multiping.in
+@@ -59,6 +59,7 @@
+ host=${host:-${file_host:-www.google.com}}
+ fi
+
++site=0
+ if [ "$1" = "config" ]; then
+ echo graph_title Ping times
+ echo 'graph_args --base 1000 -l 0'
Modified: head/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in
==============================================================================
--- head/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in Wed Sep 3 06:44:34 2014 (r367170)
+++ head/sysutils/munin-node/files/patch-plugins__node.d__squeezebox_.in Wed Sep 3 07:28:40 2014 (r367171)
@@ -1,4 +1,4 @@
---- plugins/node.d/squeezebox_.in.orig 2013-07-19 16:30:03 UTC
+--- plugins/node.d/squeezebox_.in.orig 2014-04-22 19:29:32 UTC
+++ plugins/node.d/squeezebox_.in
@@ -157,7 +157,7 @@
printf "graph_order y"
Copied and modified: head/sysutils/munin-node/files/plugins.conf.in (from r367013, head/sysutils/munin-node/files/plugins.conf)
==============================================================================
--- head/sysutils/munin-node/files/plugins.conf Tue Sep 2 14:33:48 2014 (r367013, copy source)
+++ head/sysutils/munin-node/files/plugins.conf.in Wed Sep 3 07:28:40 2014 (r367171)
@@ -21,30 +21,30 @@
[amavis]
env.amavislog /var/log/maillog
-env.logtail /usr/local/bin/logtail
+env.logtail %%LOCALBASE%%/bin/logtail
[courier_*]
env.logfile /var/log/maillog
-env.logtail /usr/local/bin/logtail
+env.logtail %%LOCALBASE%%/bin/logtail
[dhcp3]
-env.configfile /usr/local/etc/dhcpd.conf
+env.configfile %%LOCALBASE%%/etc/dhcpd.conf
env.leasefile /var/db/dhcpd.leases
[exim*]
group mail
-env.exim /usr/local/sbin/exim
+env.exim %%LOCALBASE%%/sbin/exim
[hddtemp_smartctl]
group operator
-env.smartctl /usr/local/sbin/smartctl
+env.smartctl %%LOCALBASE%%/sbin/smartctl
[mbmon*]
-env.mbmon /usr/local/bin/mbmon
+env.mbmon %%LOCALBASE%%/bin/mbmon
[mysql*]
-env.mysqladmin /usr/local/bin/mysqladmin
-env.mysqlshow /usr/local/bin/mysqlshow
+env.mysqladmin %%LOCALBASE%%/bin/mysqladmin
+env.mysqlshow %%LOCALBASE%%/bin/mysqlshow
[postfix*]
user root
@@ -53,3 +53,7 @@ env.logfile maillog
[sendmail*]
env.mspqueue /var/spool/clientmqueue
env.mailstats /usr/sbin/mailstats
+
+[fail2ban*]
+user root
+env.client %%LOCALBASE%%/bin/fail2ban-client
More information about the svn-ports-all
mailing list