X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fopenswan;h=a72596deba22b4b090667ad323fcb303a583f2ec;hp=5b28a849bf45e5d8c90aa473d158115e50efc8a4;hb=fbeee8929a770ef53d75cd8b562aeb7283306117;hpb=2b2e03eded667aea41f564e4ea982cdf77a32f08

diff --git a/lfs/openswan b/lfs/openswan
index 5b28a849bf..a72596deba 100644
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,13 +24,13 @@
 
 include Config
 
-ifeq "$(XEM)" "1"
+ifeq "$(XEN)" "1"
 	VERSUFIX=ipfire-xen
 else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2.6.21
+VER        = 2.6.23
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ba9da6c90e0f5fe856767d7510ce371f
+$(DL_FILE)_MD5 = c83053471e639bf3b97e3cf7796b7e83
 
 install : $(TARGET)
 
@@ -82,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
@@ -118,7 +115,6 @@ 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 /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-clear-1.patch
 endif	
 	#@rm -rf $(DIR_APP)