X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fstrongswan;h=5256b0ac6cae303421e835362ae1fcc040e78a99;hp=c7abf7a4d3837d3c4fbc48fa418399fe74eeb928;hb=5354d0f5c902f208d755b3b8a06f5896d4d2c975;hpb=532b997c65fba44c2c5778fd7622fafe513cc245

diff --git a/lfs/strongswan b/lfs/strongswan
index c7abf7a4d3..5256b0ac6c 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.1.1
+VER        = 5.2.0
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -34,12 +34,10 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ifeq "$(MACHINE)" "i586"
 	CONFIGURE_OPTIONS = \
-		--enable-padlock \
-		--enable-rdrand
+		--enable-padlock
 else
 	CONFIGURE_OPTIONS = \
-		--disable-padlock \
-		--disable-rdrand
+		--disable-padlock
 endif
 
 ###############################################################################
@@ -50,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e3af3d493d22286be3cd794533a8966a
+$(DL_FILE)_MD5 = 5cee4ee1a6ccb74400758b3ace54d46e
 
 install : $(TARGET)
 
@@ -80,24 +78,25 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.1.1-delay-dpd.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
 
 	cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
 	cd $(DIR_APP) && ./configure \
 		--prefix="/usr" \
 		--sysconfdir="/etc" \
 		--enable-curl \
+		--enable-dhcp \
+		--enable-farp \
 		--enable-openssl \
+		--enable-gcrypt \
 		--enable-xauth-eap \
+		--enable-xauth-noauth \
 		--enable-eap-radius \
 		--enable-eap-tls \
 		--enable-eap-ttls \
 		--enable-eap-peap \
 		--enable-eap-mschapv2 \
 		--enable-eap-identity \
-		--enable-unity \
 		$(CONFIGURE_OPTIONS)
 
 	cd $(DIR_APP) && make $(MAKETUNING)