X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenswan;h=a5d6520b738b282ed1dd2bed8aebc390f3482c4e;hb=279966278b82e1a7d0cb4977b637b7cc77b67cc9;hp=9f5afc4c7a1471a935e2be89336f2e64eb999391;hpb=e4766bc5700e86667ed3a77743e48f200a5f9e49;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/openswan b/lfs/openswan
index 9f5afc4c7a..a5d6520b73 100644
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,20 +24,23 @@
 
 include Config
 
-VER        = 2.6.20
+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 = 2e4751e39b2421406692e767e96a6f14
+$(DL_FILE)_MD5 = f23b716b8ffb242436d8e713d93d209c
 
 install : $(TARGET)
 
@@ -78,6 +81,7 @@ $(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 $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make minstall
@@ -88,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
 	
@@ -111,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)