From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 4 Aug 2017 20:19:15 +0000 (+0100)
Subject: strongswan: Disable stroke and move fully towards swanctl
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc8a8a3c5f942985bc36730eb88652dab46e5d12;p=ipfire-3.x.git

strongswan: Disable stroke and move fully towards swanctl

This commit disables stroke, charon and scepclient in favour
of the new configuration tool swanctl.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm
index a2a48eb27..dd7a0a45f 100644
--- a/strongswan/strongswan.nm
+++ b/strongswan/strongswan.nm
@@ -5,7 +5,7 @@
 
 name       = strongswan
 version    = 5.5.3
-release    = 2
+release    = 3
 
 groups     = Networking/VPN
 url        = http://www.strongswan.org/
@@ -67,7 +67,10 @@ build
 		--disable-rc2 \
 		--with-capabilities=libcap \
 		--enable-unbound \
-		--enable-systemd
+		--enable-systemd \
+		--disable-charon \
+		--disable-stroke \
+		--disable-scepclient
 
 	if "%{DISTRO_ARCH}" == "i686"
 		configure_options += --enable-padlock
@@ -80,6 +83,13 @@ build
 	#end
 
 	install_cmds
+		mv -v %{BUILDROOT}%{unitdir}/strongswan{-swanctl,}.service
+
+		# Create directory for connections
+		mkdir -pv %{BUILDROOT}%{sysconfdir}/swanctl/connections
+		echo "include connections/*.conf" > \
+			%{BUILDROOT}%{sysconfdir}/swanctl/swanctl.conf
+
 		# Drop unneeded files.
 		rm -rvf %{BUILDROOT}%{libdir}/ipsec/lib*.so