X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcollectd;h=d9081878fd86a7dc06e3572a43903ae4f8e3fc6d;hp=b6190385c6787aecda27347f7bdd50f09031285f;hb=37d5dd7c8570c5df0a22adf672ed445b7d2dab75;hpb=a332b303e428b5fa8f15e234b84d687c33b9f14a

diff --git a/lfs/collectd b/lfs/collectd
index b6190385c..d9081878f 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.2.3
+VER        = 4.5.1
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 19ebd43875fa364a356065b1d692c944
+$(DL_FILE)_MD5 = d85e00de03d40ca66d5eb4775e58fc1f
 
 install : $(TARGET)
 
@@ -77,15 +77,21 @@ $(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) && ./configure --localstatedir=/var \
-		--disable-{apache,apple_sensors,csv,ipvs,memcached,mysql,netlink,nginx,nut} \
-		--disable-{perl,serial,sensors,snmp,tape,vserver,wireless,xmms} \
+	cd $(DIR_APP) && sed -i 's|with_libiptc="no (Linux iptables header.*|with_libiptc="yes"|g' \
+				./configure
+	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} \
+		--disable-{perl,serial,snmp,tape,vserver,xmms} \
 		--enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \
-		--enable-{interface,iptables,irq,load,logfile,mbmon,memory,multimeter} \
-		--enable-{network,nfs,ntpd,ping,processes,rrdtool,swap,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-rrdtool=/usr/share/rrdtool-1.2.15
 	cd $(DIR_APP) && make install
 	cp -vf $(DIR_SRC)/config/collectd/collectd.conf /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/rc6.d/K50collectd 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)