Updated samba to current stable.

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

diff --git a/lfs/openswan b/lfs/openswan
index 29cc418879fb328672ca51385042cb6e3a4a61fb..a5d6520b738b282ed1dd2bed8aebc390f3482c4e 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,20 +24,23 @@
 
 include Config
 
-VER        = 2.6.21
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
 
-THISAPP    = openswan-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+VER        = git-20100309
+
+THISAPP    = openswan.git
+DL_FILE    = openswan.$(VER).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
 ifeq "$(KMOD)" "1"
-ifeq "$(SMP)" "1"
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
+       TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 else
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$KVER
-endif
-else
-TARGET     = $(DIR_INFO)/$(THISAPP)
+       TARGET = $(DIR_INFO)/$(THISAPP)
 endif
 
 ###############################################################################
@@ -48,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ba9da6c90e0f5fe856767d7510ce371f
+$(DL_FILE)_MD5 = f23b716b8ffb242436d8e713d93d209c
 
 install : $(TARGET)
 
@@ -79,9 +82,6 @@ $(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 $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make minstall
@@ -92,7 +92,7 @@ else
                -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) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.24_noxmlto.patch
 
        cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
        
@@ -115,7 +115,7 @@ else
        
        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 /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
+       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.23-updown-add_ipfire-snat.patch
        cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-clear-1.patch
 endif  
        #@rm -rf $(DIR_APP)