From 6fadf396b65a2e7bf16490a97c6339e32b7ddfe5 Mon Sep 17 00:00:00 2001
From: Maniacikarus <maniacikarus@ipfire.org>
Date: Mon, 20 Oct 2008 19:38:45 +0200
Subject: [PATCH] Revert "Upgraded collectd"

This reverts commit dee5f5cced9c25dfefd7975e0f29d02db96f17e1.

Conflicts:

	lfs/collectd
---
 doc/packages-list.txt | 10 +++++-----
 lfs/collectd          | 10 +++-------
 lfs/iptables          |  3 +--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f4ce1709af..71f090ba1c 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.5.1
+* collectd-4.4.3
 * 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.10
+* httpd-2.2.6
 * 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-5.1p1
-* openssl-0.9.8i
+* openssh-4.7p1
+* openssl-0.9.8g
 * 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.5
+* snort-2.6.1.4
 * sox-12.18.1
 * spandsp-0.0.4pre15
 * squashfs3.4
diff --git a/lfs/collectd b/lfs/collectd
index b5d4426b33..491d13c5be 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
-VER        = 4.5.1
+VER        = 4.4.3
 
 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 = 309b7a0b9b128a1575308773e1c43d9f
 
 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,8 +85,7 @@ $(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-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 
diff --git a/lfs/iptables b/lfs/iptables
index 4c21c378a0..a4d21b43c7 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -95,8 +95,7 @@ $(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 \
-				    --enable-devel
+				    --sbindir=/sbin --mandir=/usr/share/man
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
-- 
2.39.5