X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fopenswan;h=36084a90a64193a5dc110c5db3f78a0235e12535;hp=c1d2fdd7cd719fbf6f1c14d42f81f3a5732d3000;hb=46ea679e1ea0dd728cacfa209ee6a85b4b6a2cdc;hpb=35fa14b6e1b483fb99c89572b1a2eace954f7f7f

diff --git a/lfs/openswan b/lfs/openswan
index c1d2fdd7cd..36084a90a6 100644
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.14
+VER        = 2.6.16dr2
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,8 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-#$(DL_FILE)_MD5 = 0c2505cf2639a7de051e815f41e8e1f4
-$(DL_FILE)_MD5 = 44dc3cb98b9cb4e3fa03b82967d08b78
+$(DL_FILE)_MD5 = 8bf347f1d2219dd9277adb2b34720bf9
 
 install : $(TARGET)
 
@@ -81,15 +80,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -i \
 		-e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
-		-e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
-		-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
-	cd $(DIR_APP) && sed -i \
-		-e 's/-Werror//g' programs/Makefile.program
+		-e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' Makefile.inc
+
+	cd $(DIR_APP) && sed -e 's/-Werror//g' -i programs/Makefile.program
+	cd $(DIR_APP) && sed -e 's/-Werror//g' -i lib/liblwres/Makefile
 
-ifeq "$(KMOD)" "1"
-	cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
-	cd $(DIR_APP) && make minstall
-else
 	cd $(DIR_APP) && make programs
 	cd $(DIR_APP) && make install
 	
@@ -108,6 +103,5 @@ else
 	cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.14-updown-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.4.9-clear-1.patch
-endif	
 	#@rm -rf $(DIR_APP)
 	@$(POSTBUILD)