X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcollectd;h=3d2884198b319ad15d5b5b017f3834d40da66525;hp=b5d4426b33a371e1df0debe80dae42c6716670f0;hb=a19ff965bb6b586d56907cb77bdc0f70b2b3c459;hpb=d14d19e8b8ad1fa7f0119a385a6034722d5edbee

diff --git a/lfs/collectd b/lfs/collectd
index b5d4426b3..3d2884198 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.5.1
+VER        = 4.10.7
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -43,10 +43,8 @@ DEPS       = ""
 objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-collectd-4.5.1.patch = $(DL_FROM)/collectd-4.5.1.patch
 
-$(DL_FILE)_MD5 = d85e00de03d40ca66d5eb4775e58fc1f
-collectd-4.5.1.patch_MD5 = ae8356e845a3afdb96118412c354693b
+$(DL_FILE)_MD5 = f4193fdb5002ddac8159c88032a726bc
 
 install : $(TARGET)
 
@@ -79,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/collectd-4.5.1.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
 		--disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
 		--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
@@ -88,12 +85,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
 		--enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
 		--enable-{tcpconns,unixsock,users,wireless} \
-		--with-rrdtool=/usr/share/rrdtool-1.2.15 \
-		--with-libiptc
+		--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/S21collectd
+	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)