Xen-Image, fix config, readme, inittab/getty, change sizes

[people/pmueller/ipfire-2.x.git] / lfs / openswan

diff --git a/lfs/openswan b/lfs/openswan
index b6f99a1bdeae26d93c82aba1545c896a6d25165a..a72596deba22b4b090667ad323fcb303a583f2ec 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: openswan,v 1.6.2.17 2005/12/01 23:00:25 franck78 Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,13 +24,24 @@
 
 include Config
 
-VER        = 1.0.10
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+
+VER        = 2.6.23
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.openswan.org/download/
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(KMOD)" "1"
+       TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+else
+       TARGET = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -48,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3767814e3c080d146a8c7233dc31e0a9
+$(DL_FILE)_MD5 = c83053471e639bf3b97e3cf7796b7e83
 
 install : $(TARGET)
 
@@ -78,19 +81,29 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.1-plutoctl.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-1.0.6-numif.patch
+
+ifeq "$(KMOD)" "1"
+       cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module $(MAKETUNING) $(EXTRA_MAKE)
+       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
-       #remove keywords that may be used to run scripts sf bug#1350181 (bash file=> easy to recover)
-       cd $(DIR_APP)/utils && sed -i \
-           -e 's% prepluto postpluto%%' \
-           -e 's% leftupdown%%' _confread
+               -e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
+               -e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
+               -e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' \
+               -e 's%^XMLTO.*$$%#&%' Makefile.inc
+
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.20_noxmlto.patch
+
+       cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
+       
        cd $(DIR_APP) && make programs
        cd $(DIR_APP) && make install
-       mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/
+       
+       # don't know why make this doesnt made
+       cd $(DIR_APP) && cp -a programs/_confread/_confread.in /usr/lib/ipsec/_confread
+       
+       -rm -rfv /etc/rc*.d/*ipsec
+       cd $(DIR_SRC) && cp src/initscripts/init.d/ipsec /etc/rc.d/init.d/ipsec
        rm -f /etc/ipsec.conf /etc/ipsec.secrets
        ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf
        ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets
@@ -99,5 +112,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -sf $(CONFIG_ROOT)/ca    /etc/ipsec.d/cacerts
        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.6.16-startklips-1.patch
+       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-updown.klips-1.patch
+       cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-clear-1.patch
+endif  
        #@rm -rf $(DIR_APP)
        @$(POSTBUILD)