slang: revert parallelized build

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

diff --git a/lfs/strongswan b/lfs/strongswan
index 17c1a01cf4fd352cac90ee260987b2b29ddd18f0..4174f78fe5b2fa2e8bbaef1580e8b4140a7832d3 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.5.0
+VER        = 5.7.2
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,14 +32,6 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/strongswan-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE)" "i586"
-       CONFIGURE_OPTIONS = \
-               --enable-padlock
-else
-       CONFIGURE_OPTIONS = \
-               --disable-padlock
-endif
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a96fa7eb6c62b40143dadb064b6bd586
+$(DL_FILE)_MD5 = 618de96dc2a506f82a162a5abf9263d4
 
 install : $(TARGET)
 
@@ -78,7 +70,9 @@ $(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-disable-ipv6.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire-interfaces.patch
 
        cd $(DIR_APP) && ./configure \
                --prefix="/usr" \
@@ -99,7 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-eap-peap \
                --enable-eap-mschapv2 \
                --enable-eap-identity \
-               --disable-chapoly \
+               --enable-chapoly \
+               --disable-padlock \
+               --disable-rc2 \
                $(CONFIGURE_OPTIONS)
 
        cd $(DIR_APP) && make $(MAKETUNING)
@@ -108,8 +104,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Remove all library files we don't want or need.
        rm -vf /usr/lib/ipsec/plugins/*.{,l}a
 
-       -rm -rfv /etc/rc*.d/*ipsec
-       cd $(DIR_SRC) && cp src/initscripts/init.d/ipsec /etc/rc.d/init.d/ipsec
        rm -f /etc/ipsec.conf /etc/ipsec.secrets
        ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf
        ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets