Merge branch 'master' into next

[ipfire-2.x.git] / lfs / strongswan

diff --git a/lfs/strongswan b/lfs/strongswan
index 5c411a3337ae4279c604fd2e1eaea6fe0631b425..eb9cf46e6daf3b77d0947e6b1e9e927bdb733cfe 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.1.1
+VER        = 5.2.2
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e3af3d493d22286be3cd794533a8966a
+$(DL_FILE)_MD5 = 7ee1a33060b2bde35be0f6d78a1d26d0
 
 install : $(TARGET)
 
@@ -78,23 +78,26 @@ $(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-5.1.2-5.2.1_modp_custom.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.1.1-delay-dpd.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)