Applied changes to make.sh.

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

diff --git a/lfs/openswan b/lfs/openswan
index bcd66487c4b610087c6f79c2e44370f677f2ce27..29cc418879fb328672ca51385042cb6e3a4a61fb 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.18
+VER        = 2.6.21
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b485b38b1074155bc337f80557c24c0d
+$(DL_FILE)_MD5 = ba9da6c90e0f5fe856767d7510ce371f
 
 install : $(TARGET)
 
@@ -78,14 +78,21 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+       #openswan internal nat-t patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.6.20-nat-t.patch
+
 ifeq "$(KMOD)" "1"
-       cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
+       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
+               -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