summaryrefslogtreecommitdiff
path: root/sysutils/munin-node/files/patch-node__sbin__munin-node
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-12-06 14:27:28 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-12-06 14:27:28 +0000
commit7e06c048aab2cd22780f9d77aa5a7f2dcfad5947 (patch)
treee103c4d5f5c26c912d1e520c712eac0c25e101ee /sysutils/munin-node/files/patch-node__sbin__munin-node
parent- Use a space after "Created by:", not a tab (diff)
- 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
Notes
Notes: svn path=/head/; revision=308385
Diffstat (limited to 'sysutils/munin-node/files/patch-node__sbin__munin-node')
-rw-r--r--sysutils/munin-node/files/patch-node__sbin__munin-node16
1 files changed, 7 insertions, 9 deletions
diff --git a/sysutils/munin-node/files/patch-node__sbin__munin-node b/sysutils/munin-node/files/patch-node__sbin__munin-node
index 792c9a645408..cb411ce82779 100644
--- a/sysutils/munin-node/files/patch-node__sbin__munin-node
+++ b/sysutils/munin-node/files/patch-node__sbin__munin-node
@@ -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();