Updated to a new experimental openswan.

config/kernel/kernel.config.i586

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24.7
-# Mon Jul 14 10:58:23 2008
+# Linux kernel version: 2.6.24.7-ipfire
+# Wed Jul 16 20:38:30 2008
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -791,6 +791,23 @@ CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=m
 # CONFIG_NET_9P is not set
+CONFIG_KLIPS=m
+
+#
+# KLIPS options
+#
+CONFIG_KLIPS_ESP=y
+CONFIG_KLIPS_AH=y
+CONFIG_KLIPS_AUTH_HMAC_MD5=y
+CONFIG_KLIPS_AUTH_HMAC_SHA1=y
+CONFIG_KLIPS_ALG=y
+# CONFIG_KLIPS_ENC_CRYPTOAPI is not set
+CONFIG_KLIPS_ENC_3DES=y
+CONFIG_KLIPS_ENC_AES=y
+CONFIG_KLIPS_IPCOMP=y
+# CONFIG_KLIPS_OCF is not set
+CONFIG_KLIPS_DEBUG=y
+CONFIG_KLIPS_IF_MAX=64
 
 #
 # Device Drivers

doc/packages-list.txt

@@ -39,6 +39,7 @@
 * arptables-v0.0.3-3
 * as86-0.16.17
 * asterisk-1.4.18
+* asterisk-1.4.18_old
 * atl2-2.0.4
 * autoconf-2.59
 * automake-1.9.6
@@ -125,6 +126,7 @@
 * icegenerator-0.5.5-pre2
 * igmpproxy-src-0.1-beta2
 * inetutils-1.4.2
+* initscripts_old
 * ipaddr-1.2
 * ipfireseeder-1.00
 * iproute2-2.6.16-060323
@@ -165,6 +167,8 @@
 * libxml2-2.6.26
 * libxslt-1.1.17
 * linux-2.6.24.7
+* linux-2.6.24.7-smp_old
+* linux-2.6.24.7_old
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * linuxigd-0.95
@@ -217,6 +221,7 @@
 * openssl-0.9.8g
 * openswan-2.6.14
 * openswan-2.6.14-kmod
+* openswan-2.6.16dr2
 * openvpn-2.0.9
 * pam_mysql-0.7RC1
 * patch-2.5.4
@@ -272,6 +277,8 @@
 * tcptrack-1.3.0
 * teamspeak-2.0.24.1
 * texinfo-4.8
+* tftp-hpa-0.48
+* tftp-hpa-0.48_old
 * tiff-3.8.2
 * traceroute-1.4a12
 * tripwire-2.4.1.2

lfs/linux

@@ -100,8 +100,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# 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
 
-	# Openswan nat-t
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
+	# Openswan
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.6.16dr2-2.6.24-kernel.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.6.16dr2-2.6.24-natt.patch
 
 	# Reiser4
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.24.patch

lfs/openswan

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.14
+VER        = 2.6.16dr2
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,8 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-#$(DL_FILE)_MD5 = 0c2505cf2639a7de051e815f41e8e1f4
-$(DL_FILE)_MD5 = 44dc3cb98b9cb4e3fa03b82967d08b78
+$(DL_FILE)_MD5 = 8bf347f1d2219dd9277adb2b34720bf9
 
 install : $(TARGET)
 
@@ -81,15 +80,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	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
+		-e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' Makefile.inc
+
+	cd $(DIR_APP) && sed -e 's/-Werror//g' -i programs/Makefile.program
+	cd $(DIR_APP) && sed -e 's/-Werror//g' -i lib/liblwres/Makefile
 
-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
 	
@@ -108,6 +103,5 @@ else
 	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)

make.sh

@@ -343,7 +343,6 @@ buildipfire() {
   ipfiremake v4l-dvb			SMP=1
   ipfiremake madwifi                    SMP=1
   ipfiremake sane		KMOD=1	SMP=1
-  ipfiremake openswan		KMOD=1	SMP=1
   ipfiremake linux
 #  ipfiremake linux-fusion
 #  ipfiremake ipp2p
@@ -355,7 +354,6 @@ buildipfire() {
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake sane		KMOD=1
-  ipfiremake openswan		KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio