From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Sat, 15 Aug 2009 12:28:35 +0000 (+0200)
Subject: Fixed collectd config and build, because of dependency errors.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7785e5cb92ca422fb771c519ed53e17fcb256610;p=ipfire-3.x.git

Fixed collectd config and build, because of dependency errors.
---

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index b3c284618..4a356f381 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -5,10 +5,10 @@
 #
 
 Hostname    "localhost"
-BaseDir     "/var/log/rrd/collectd"
+BaseDir     "/var/log/rrd/"
 PIDFile     "/var/run/collectd.pid"
 PluginDir   "/usr/lib/collectd"
-TypesDB     "/usr/lib/collectd/types.db"
+TypesDB     "/usr/share/collectd/types.db"
 Interval     30
 ReadThreads  3
 
@@ -24,7 +24,7 @@ LoadPlugin disk
 #LoadPlugin exec
 LoadPlugin hddtemp
 LoadPlugin interface
-LoadPlugin iptables
+#LoadPlugin iptables
 #LoadPlugin ipvs
 #LoadPlugin irq
 LoadPlugin load
@@ -41,7 +41,7 @@ LoadPlugin memory
 #LoadPlugin ntpd
 #LoadPlugin nut
 #LoadPlugin perl
-LoadPlugin ping
+#LoadPlugin ping
 LoadPlugin processes
 LoadPlugin rrdtool
 LoadPlugin sensors
diff --git a/lfs/collectd b/lfs/collectd
index b234b9890..3a084c355 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-PKG_VER    = 4.6.2
+PKG_VER    = 4.7.2
 PKG_REL    = 0
 
 THISAPP    = $(PKG_NAME)-$(PKG_VER)
@@ -125,7 +125,7 @@ $(OBJECT): $(objects)
 			--enable-ntpd \
 			--disable-nut \
 			--disable-perl \
-			--enable-ping \
+			--disable-ping \
 			--disable-powerdns \
 			--enable-processes \
 			--enable-rrdtool \