X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcollectd;h=d4ea661d518bb137c3b85f667330e3d3d0cf564d;hp=aeee9dd42464bc12a684508038cbf8be8bf28b2b;hb=ba2a22487ae87281a33805827ec174d87b04c3fe;hpb=30ffe6fd967a5e37ba38fc021b339925b88947b0

diff --git a/lfs/collectd b/lfs/collectd
index aeee9dd424..d4ea661d51 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.4.0
+VER        = 4.10.7
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -36,6 +36,8 @@ PROG       = collectd
 
 DEPS       = ""
 
+CFLAGS    += -Wno-error=deprecated-declarations
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 76ec42bf1976c1d4110443d845decca3
+$(DL_FILE)_MD5 = f4193fdb5002ddac8159c88032a726bc
 
 install : $(TARGET)
 
@@ -78,19 +80,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
-		--disable-{apache,apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
-		--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,wireless,xmms} \
-		--disable-{apple_sensors,csv,ipvs,memcached,mysql,netlink,nginx,nut} \
-		--disable-{perl,serial,sensors,snmp,tape,vserver,wireless,xmms} \
+		--disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
+		--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
+		--disable-{perl,serial,snmp,tape,vserver,xmms} \
 		--enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \
-		--enable-{interface,iptbles,irq,load,logfile,memory,multimeter} \
-		--enable-{network,nfs,ntpd,ping,processes,rrdtool,swap,sensors,syslog} \
-		--enable-{tcpconns,unixsock,users} \
-		--with-rrdtool=/usr/share/rrdtool-1.2.15 --enable-debug
+		--enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
+		--enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
+		--enable-{tcpconns,unixsock,users,wireless} \
+		--with-librrd=/usr/share/rrdtool-1.2.30
 	cd $(DIR_APP) && make install
-	cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/
+	cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
 	ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd 
-	ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S20collectd
+	ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd
 	ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)