X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fopenswan;h=29cc418879fb328672ca51385042cb6e3a4a61fb;hb=522e5b465ccd4f2f7440cae21bc6e57b8deac3c8;hp=3420840c55ae084e1ec884414a7e8a16acf291ec;hpb=bd24e1fae9c647d3d735d0db761449e3a9884420;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/openswan b/lfs/openswan
index 3420840c5..29cc41887 100644
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.16
+VER        = 2.6.21
 
 THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ ifeq "$(KMOD)" "1"
 ifeq "$(SMP)" "1"
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
 else
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$KVER
 endif
 else
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ef0ea8f9082df70c993a035904d538c7
+$(DL_FILE)_MD5 = ba9da6c90e0f5fe856767d7510ce371f
 
 install : $(TARGET)
 
@@ -78,18 +78,22 @@ $(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//' lib/libdns/Makefile
-	cd $(DIR_APP) && sed -i 's/-Werror//' lib/libisc/Makefile
-	cd $(DIR_APP) && sed -i 's/-Werror//' lib/liblwres/Makefile
 	cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
 	
 	cd $(DIR_APP) && make programs
@@ -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.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)