Updated kernel to 2.6.24.7

Updated iptables to 1.4.0 Updated mISDN to 1-1-8 Updated openswan to 2.6.14 This version is not completed yet todo: -natt patch -check if other kernel patches still needed (CoreTemp ...) -check rootfiles (iptables, openswan) -fix asterix -fix linux-fusion
2026-04-27 03:07:43 +02:00 · 2008-07-13 19:09:48 +02:00
parent 8a8e094a3c
commit 64cf4991cc
22 changed files with 82880 additions and 1903 deletions
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -36,7 +36,7 @@ PAK_VER    = 3

 CHAN_CAPI  = chan_capi-1.0.2

-DEPS       = "sox zaptel libpri spandsp libmad"
+DEPS       = "sox libpri spandsp libmad"

 ###############################################################################
 # Top-level Rules
@@ -99,8 +99,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/$(CHAN_CAPI) \
 		$(DIR_SRC)/agx-ast-addons && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire
-	cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts \
-		menuselect.makeopts
+#	cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts \
+#		menuselect.makeopts
 	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-alaw-1.4.8.tar.gz \
 		$(DIR_APP)/sounds/asterisk-core-sounds-en-alaw-1.4.8.tar.gz
 	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-alaw-1.4.7.tar.gz \
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -24,7 +24,7 @@

 include Config

-VER        = 1.3.8
+VER        = 1.4.0

 THISAPP    = iptables-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -37,18 +37,18 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 objects = 	$(DL_FILE) \
 			netfilter-layer7-v2.18.tar.gz \
-			libnfnetlink-0.0.25.tar.bz2 \
-			libnetfilter_queue-0.0.13.tar.bz2
+			libnfnetlink-0.0.39.tar.bz2 \
+			libnetfilter_queue-0.0.16.tar.bz2

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 netfilter-layer7-v2.18.tar.gz 		= $(URL_IPFIRE)/netfilter-layer7-v2.18.tar.gz
-libnfnetlink-0.0.25.tar.bz2		= $(URL_IPFIRE)/libnfnetlink-0.0.25.tar.bz2
-libnetfilter_queue-0.0.13.tar.bz2	= $(URL_IPFIRE)/libnetfilter_queue-0.0.13.tar.bz2
+libnfnetlink-0.0.39.tar.bz2		= $(URL_IPFIRE)/libnfnetlink-0.0.39.tar.bz2
+libnetfilter_queue-0.0.16.tar.bz2	= $(URL_IPFIRE)/libnetfilter_queue-0.0.16.tar.bz2

-$(DL_FILE)_MD5 = 0a9209f928002e5eee9cdff8fef4d4b3
+$(DL_FILE)_MD5 = 90cfa8a554a29b0b859a625e701af2a7
 netfilter-layer7-v2.18.tar.gz_MD5 = 8d2e2c00f5c20e8c0852998035aeffd2
-libnfnetlink-0.0.25.tar.bz2_MD5 = fc915a2e66d282e524af6ef939042d7d
-libnetfilter_queue-0.0.13.tar.bz2_MD5 = 660cbfd3dc8c10bf9b1803cd2b688256
+libnfnetlink-0.0.39.tar.bz2_MD5 = 348fed8c1edbe5b873ffc7b192140093
+libnetfilter_queue-0.0.16.tar.bz2_MD5 = b36664e6cd39edbfe46b416a86118add

 install : $(TARGET)

@@ -77,15 +77,17 @@ $(subst %,%_MD5,$(objects)) :

 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.13
+	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16

 	@cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.18.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/iptables-1.3-for-kernel-2.6.20forward-layer7-2.18.patch
+
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/iptables-1.4-for-kernel-2.6.20forward-layer7-2.18.patch
+	chmod +x $(DIR_APP)/extensions/.layer7-test*

 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.3.0-imq1.diff
-	chmod +x $(DIR_APP)/extensions/.IMQ-test*  $(DIR_APP)/extensions/.layer7-test*
-
+	chmod +x $(DIR_APP)/extensions/.IMQ-test*
+	
 	# hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present
 	cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile
 	cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man KERNEL_DIR=/usr/src/linux LIBDIR=/lib $(MAKETUNING)
@@ -95,14 +97,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && cp -vf include/libiptc/{libiptc.h,ipt_kernel_headers.h} \
 		/usr/include/libiptc

-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.25.tar.bz2
-	cd $(DIR_SRC)/libnfnetlink-0.0.25 && ./configure --prefix=/usr
-	cd $(DIR_SRC)/libnfnetlink-0.0.25 && make
-	cd $(DIR_SRC)/libnfnetlink-0.0.25 && make install
+	cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.39.tar.bz2
+	cd $(DIR_SRC)/libnfnetlink-0.0.39 && ./configure --prefix=/usr
+	cd $(DIR_SRC)/libnfnetlink-0.0.39 && make
+	cd $(DIR_SRC)/libnfnetlink-0.0.39 && make install

-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.13.tar.bz2
-	cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && ./configure --prefix=/usr
-	cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make
-	cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make install
-	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.13
+	cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.16.tar.bz2
+	cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && ./configure --prefix=/usr
+	cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make
+	cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make install
+	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
 	@$(POSTBUILD)
+
--- a/lfs/klibc
+++ b/lfs/klibc
@@ -24,7 +24,7 @@

 include Config

-VER        = 1.5
+VER        = 1.5.10

 THISAPP    = klibc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 klibc-extras-2.2.tar.gz = $(DL_FROM)/klibc-extras-2.2.tar.gz

-$(DL_FILE)_MD5 = d55ce89c0656a7d6896ec0b2af07b5dc
+$(DL_FILE)_MD5 = baf6b522e427aae9c8f511b9c57193bd
 klibc-extras-2.2.tar.gz_MD5 = 7e5042978531048c369f59ca1a13055b

 install : $(TARGET)
--- a/lfs/kqemu
+++ b/lfs/kqemu
@@ -80,10 +80,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	
 ifeq "$(SMP)" "1"
+	mkdir -p /lib/modules/$(KVER)-ipfire-smp/misc/
 	cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire-smp/build/
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire-smp/misc/
 else
+	mkdir -p /lib/modules/$(KVER)-ipfire/misc/
 	cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire/build/
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire/misc/
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@

 include Config

-PATCHLEVEL = .21
-VER        = 2.6.20.21
+PATCHLEVEL = .7
+VER        = 2.6.24.7

 THISAPP    = linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,22 +47,22 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-	mISDN-1_1_5.tar.gz \
+	mISDN-1_1_8.tar.gz \
 	squashfs3.3.tgz \
 	netfilter-layer7-v2.18.tar.gz \
 	patch-2.6.16-nath323-1.3.bz2
 	
-$(DL_FILE)												= $(URL_IPFIRE)/$(DL_FILE)
+$(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.18.tar.gz		= $(URL_IPFIRE)/netfilter-layer7-v2.18.tar.gz
 patch-2.6.16-nath323-1.3.bz2		= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 squashfs3.3.tgz				= $(URL_IPFIRE)/squashfs3.3.tgz
-mISDN-1_1_5.tar.gz			= $(URL_IPFIRE)/mISDN-1_1_5.tar.gz
+mISDN-1_1_8.tar.gz			= $(URL_IPFIRE)/mISDN-1_1_8.tar.gz

-$(DL_FILE)_MD5										= fbedc192e654735936cc780da8deeba4
+$(DL_FILE)_MD5				= 40a73780d51525d28d36dec852c680c4
 netfilter-layer7-v2.18.tar.gz_MD5	= 8d2e2c00f5c20e8c0852998035aeffd2
 patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
 squashfs3.3.tgz_MD5			= 95c40fca0d886893631b5de14a0af25b
-mISDN-1_1_5.tar.gz_MD5	          	= 93b1cff7817b82638a0475c2b7b7f1b6
+mISDN-1_1_8.tar.gz_MD5	          	= 29c55ffe0b35668a41eaed3b1c3ddfe2

 install : $(TARGET)

@@ -95,42 +95,42 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -s linux-$(VER) /usr/src/linux

 	# Security fix for CIFS & Netfilter SNMP
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-additional_check_on_BER_decoding.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-additional_check_on_BER_decoding.patch

 	# Temperatursensoren von Intel Core & Core 2 Prozessoren
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20-hwmon-coretemp.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20-hwmon-coretemp.patch

 	# Add USB ID of US-Robotics USR805423 to ZD1211 driver
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-zd1211-usrobotics-usbid.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-zd1211-usrobotics-usbid.patch

 	# Openswan nat-t
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6.20.21-natt.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.6.14-kernel-2.6.24.7-natt.patch

 	# Reiser4
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.20.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.24.patch

 	# SquashFS
 	cd $(DIR_SRC) && rm -rf squashfs*
 	cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.3.tgz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.3/kernel-patches/linux-2.6.20/squashfs3.3-patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.3/kernel-patches/linux-2.6.24/squashfs3.3-patch

 	# ip_conntrack permissions from 440 to 444
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
+#	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
 	
 	# Layer7-patch
 	cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.18
 	cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.18.tar.gz
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/for_older_kernels/kernel-2.6.20-2.6.21-layer7-2.16.1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/for_older_kernels/kernel-2.6.22-2.6.24-layer7-2.18.patch

 	# Linux Intermediate Queueing Device
 ifeq "$(XEN)" ""
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20-imq.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.24-imq.diff
 endif

 	# mISDN
 	cd $(DIR_SRC) && rm -rf mISDN-*
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_5.tar.gz
-	cd $(DIR_SRC)/mISDN-1_1_5 && yes 'yes' | ./std2kern -k /usr/src/linux
+	cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_8.tar.gz
+	cd $(DIR_SRC)/mISDN-1_1_8 && yes 'yes' | ./std2kern -k /usr/src/linux
 	
 	cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch

@@ -173,3 +173,4 @@ endif

 	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
 	@$(POSTBUILD)
+
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -24,7 +24,7 @@

 include Config

-VER        = 1_1_5
+VER        = 1_1_8

 THISAPP    = mISDNuser-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 45bf90350ac8f8e1845c02e293126d70
+$(DL_FILE)_MD5 = 7cf66625608736eb939cfcb2308f3edf

 install : $(TARGET)

--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.4.13
+VER        = 2.6.14

 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,8 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 0c2505cf2639a7de051e815f41e8e1f4
+#$(DL_FILE)_MD5 = 0c2505cf2639a7de051e815f41e8e1f4
+$(DL_FILE)_MD5 = 44dc3cb98b9cb4e3fa03b82967d08b78

 install : $(TARGET)

@@ -78,14 +79,17 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(KMOD)" "1"
-	cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
-	cd $(DIR_APP) && make minstall
-else
 	cd $(DIR_APP) && sed -i \
 		-e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
 		-e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
 		-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
+	cd $(DIR_APP) && sed -i \
+		-e 's/-Werror//g' programs/Makefile.program
+
+ifeq "$(KMOD)" "1"
+	cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
+	cd $(DIR_APP) && make minstall
+else
 	cd $(DIR_APP) && make programs
 	cd $(DIR_APP) && make install
 	
@@ -100,10 +104,10 @@ else
 	ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
 	ln -sf $(CONFIG_ROOT)/crls  /etc/ipsec.d/crls
 	
-	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.12-startklips-1.patch
-	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown-1.patch
-	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
-	cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-clear-1.patch
+	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.14-startklips-1.patch
+	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.14-updown-1.patch
+#	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
+#	cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-clear-1.patch
 endif	
 	#@rm -rf $(DIR_APP)
 	@$(POSTBUILD)