Compile openswan "ipsec.ko" seperated from kernel

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 0d6491ee52db825770cd6f4d80688a7cb956e5f2..78c6365acdf9cf3d375ad3953c295713f976ae36 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -219,6 +219,7 @@
 * openssh-4.7p1
 * openssl-0.9.8g
 * openswan-2.4.12
+* openswan-2.4.12-kmod
 * openvpn-2.0.9
 * pam_mysql-0.7RC1
 * patch-2.5.4

diff --git a/lfs/linux b/lfs/linux
index cbaae36c5a73fbd8666192d8382f9d39735672ab..5eda8240c5dfffd4f6546ae73c92e6a187e98b95 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -52,9 +52,8 @@ objects =$(DL_FILE) \
        iptables-1.3.8.tar.bz2 \
        patch-o-matic-ng-20061210.tar.bz2 \
        netfilter-layer7-v2.18.tar.gz \
-       patch-2.6.16-nath323-1.3.bz2 \
-       openswan-2.4.12.tar.gz
-
+       patch-2.6.16-nath323-1.3.bz2
+       
 $(DL_FILE)                                                                                             = $(URL_IPFIRE)/$(DL_FILE)
 patch-o-matic-ng-20061210.tar.bz2      = $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2
 iptables-1.3.8.tar.bz2                 = $(URL_IPFIRE)/iptables-1.3.8.tar.bz2
@@ -62,7 +61,6 @@ 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
-openswan-2.4.12.tar.gz                 = $(URL_IPFIRE)/openswan-2.4.12.tar.gz
 
 $(DL_FILE)_MD5                                                                         = fbedc192e654735936cc780da8deeba4
 patch-o-matic-ng-20061210.tar.bz2_MD5  = 76edac76301b45f89e467b41c8cf4393
@@ -71,7 +69,6 @@ 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
-openswan-2.4.12.tar.gz_MD5             = 0bca0cc205d2d83eff64a7cea825ce7a
 
 install : $(TARGET)
 
@@ -112,14 +109,8 @@ $(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 2
-       cd $(DIR_SRC) && rm -rf openswan-*
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.12.tar.gz
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12.kernel-2.6-klips.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.4.12.kernel-2.6.20-cryptoalg.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.12-missing-files.patch
-       cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
 
        # Reiser4
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.20.patch

diff --git a/lfs/openswan b/lfs/openswan
index 70550386cb770148900c6acffcf39a09977b9452..825f4936e9d28074bfaba3d45b6416894c9650d6 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -30,7 +30,15 @@ THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+ifeq "$(KMOD)" "1"
+ifeq "$(SMP)" "1"
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
+else
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod
+endif
+else
 TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -70,6 +78,10 @@ $(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)%' \
@@ -93,6 +105,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
-       
+endif  
        #@rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 14b4a5e848c5774c0cba00c6e90c03b25530eecc..bcc2145b00dc0a4b296fca4339c1a59da288246f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -343,6 +343,7 @@ 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
@@ -354,6 +355,7 @@ buildipfire() {
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake sane              KMOD=1
+  ipfiremake openswan          KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio