X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcollectd;h=07dc4d96ed1315f2e4bb3a9291f4f27176b10c2e;hp=a13c986a59b4f6535d868c011349f4d3bd417b63;hb=9237fb851a65b6d0c946e7d6d46167fd0bc3009c;hpb=7a5ed24ecc0ec2476f09478e6fe74e1f833b4b29

diff --git a/lfs/collectd b/lfs/collectd
index a13c986a59..07dc4d96ed 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.5.0
+VER        = 4.5.3
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8c6500784677fcd6ca1f6919bf9e7c85
+$(DL_FILE)_MD5 = f368200c4bedd64baba46094906e81ee
 
 install : $(TARGET)
 
@@ -77,6 +77,8 @@ $(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) && 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} \
@@ -87,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--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/
+	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/rc6.d/K50collectd