From 8235f17df5bdc1d5131c10bdfd40b40741bdebce Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 3 Oct 2015 19:15:36 +0100 Subject: [PATCH] strongswan: Update to 5.3.3 ChaCha is disabled since our kernel does not support it yet Signed-off-by: Michael Tremer --- config/rootfiles/common/strongswan | 1 + config/rootfiles/core/95/filelists/i586/strongswan-padlock | 1 + config/rootfiles/core/95/filelists/strongswan | 1 + config/rootfiles/core/95/update.sh | 4 ++++ lfs/strongswan | 5 +++-- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 120000 config/rootfiles/core/95/filelists/i586/strongswan-padlock create mode 120000 config/rootfiles/core/95/filelists/strongswan diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 7564d38c8b..f51cc3a9cd 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -153,6 +153,7 @@ usr/libexec/ipsec/starter usr/libexec/ipsec/stroke usr/sbin/ipsec #usr/share/man/man1/pki---acert.1 +#usr/share/man/man1/pki---dn.1 #usr/share/man/man1/pki---gen.1 #usr/share/man/man1/pki---issue.1 #usr/share/man/man1/pki---keyid.1 diff --git a/config/rootfiles/core/95/filelists/i586/strongswan-padlock b/config/rootfiles/core/95/filelists/i586/strongswan-padlock new file mode 120000 index 0000000000..2412824fb2 --- /dev/null +++ b/config/rootfiles/core/95/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/strongswan b/config/rootfiles/core/95/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/core/95/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/95/update.sh b/config/rootfiles/core/95/update.sh index 388e18d7c2..a34a3fe171 100644 --- a/config/rootfiles/core/95/update.sh +++ b/config/rootfiles/core/95/update.sh @@ -36,6 +36,7 @@ rm -f /etc/rc.d/init.d/network-vlans rm -f /etc/rc.d/rcsysinit.d/S91network-vlans # Stop services +/etc/init.d/ipsec stop # Extract files extract_files @@ -44,6 +45,9 @@ extract_files /usr/local/bin/update-lang-cache # Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi # This update need a reboot... #touch /var/run/need_reboot diff --git a/lfs/strongswan b/lfs/strongswan index b4438dda50..2a181a3304 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.3.2 +VER = 5.3.3 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fab014be1477ef4ebf9a765e10f8802c +$(DL_FILE)_MD5 = 5a25f3d1c31a77ef44d14a2e7b3eaad0 install : $(TARGET) @@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-eap-peap \ --enable-eap-mschapv2 \ --enable-eap-identity \ + --disable-chapoly \ $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) -- 2.39.5