From: Maniacikarus <maniacikarus@ipfire.org>
Date: Sun, 19 Oct 2008 16:53:26 +0000 (+0200)
Subject: Upgraded collectd
X-Git-Tag: v2.3-rc1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dee5f5cced9c25dfefd7975e0f29d02db96f17e1;p=ipfire-2.x.git

Upgraded collectd
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 71f090ba1c..f4ce1709af 100644
--- 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 491d13c5be..f4d97710e8 100644
--- 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)
 
@@ -85,7 +85,8 @@ $(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-rrdtool=/usr/share/rrdtool-1.2.15 \
+		--with_own_libiptc
 	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 
diff --git a/lfs/iptables b/lfs/iptables
index a4d21b43c7..4c21c378a0 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -95,7 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure  --prefix=/usr --with-ksource=/usr/src/linux \
 				    --libdir=/lib --includedir=/usr/include --enable-libipq \
 				    --libexecdir=/lib --bindir=/sbin \
-				    --sbindir=/sbin --mandir=/usr/share/man
+				    --sbindir=/sbin --mandir=/usr/share/man \
+				    --enable-devel
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install