Update collectd / remove libiptc check

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 71f090ba1c34ec2c3f9e7a8f04a744c523f4b86a..f4ce1709af2a5ede23ed1f45f4368c2c136d5b5a 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -64,7 +64,7 @@
 * centerim-4.22.1
 * clamav-0.94
 * cmake-2.4.8
-* collectd-4.4.3
+* collectd-4.5.1
 * coreutils-5.96
 * cpio-2.6
 * cpufrequtils-004
@@ -125,7 +125,7 @@
 * hostapd-0.5.10
 * hplip-2.7.10
 * htop-0.8.1
-* httpd-2.2.6
+* httpd-2.2.10
 * hwdata
 * iana-etc-2.10
 * icecast-2.3.1
@@ -221,8 +221,8 @@
 * oinkmaster-2.0
 * openldap-2.3.20
 * openmailadmin-1.0.0
-* openssh-4.7p1
-* openssl-0.9.8g
+* openssh-5.1p1
+* openssl-0.9.8i
 * openswan-2.6.18
 * openswan-2.6.18-kmod-VER
 * openvpn-2.0.9
@@ -261,7 +261,7 @@
 * shadow-4.0.15
 * slang-1.4.9
 * smartmontools-5.36
-* snort-2.6.1.4
+* snort-2.6.1.5
 * sox-12.18.1
 * spandsp-0.0.4pre15
 * squashfs3.4

diff --git a/lfs/collectd b/lfs/collectd
index 491d13c5be83fed29d81f9fd6b04b1b701bbce24..d9081878fd86a7dc06e3572a43903ae4f8e3fc6d 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.4.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 = 309b7a0b9b128a1575308773e1c43d9f
+$(DL_FILE)_MD5 = d85e00de03d40ca66d5eb4775e58fc1f
 
 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} \