Merge remote-tracking branch 'origin/next' into fifteen

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

diff --git a/lfs/strongswan b/lfs/strongswan
index 553120c14cea53a994396e28c10c6d743c9e2ce8..948db5b1dfee681a5caa5bf9e28d6e9dd9729ae0 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,18 +24,22 @@
 
 include Config
 
-VER        = 5.0.3rc1
+VER        = 5.1.1
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/strongswan-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ifeq "$(MACHINE)" "i586"
-       PADLOCK = --enable-padlock
+       CONFIGURE_OPTIONS = \
+               --enable-padlock \
+               --enable-rdrand
 else
-       PADLOCK = --disable-padlock
+       CONFIGURE_OPTIONS = \
+               --disable-padlock \
+               --disable-rdrand
 endif
 
 ###############################################################################
@@ -46,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e643b1492509b90fb4bcf3cf40326cc1
+$(DL_FILE)_MD5 = e3af3d493d22286be3cd794533a8966a
 
 install : $(TARGET)
 
@@ -75,17 +79,25 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
+       @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.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-openssl \
+               --enable-xauth-eap \
                --enable-eap-radius \
-               $(PADLOCK)
+               --enable-eap-tls \
+               --enable-eap-ttls \
+               --enable-eap-peap \
+               --enable-eap-mschapv2 \
+               --enable-eap-identity \
+               --enable-unity \
+               $(CONFIGURE_OPTIONS)
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
@@ -104,5 +116,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
        ln -sf $(CONFIG_ROOT)/crls  /etc/ipsec.d/crls
 
-       #@rm -rf $(DIR_APP)
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)