]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
strongswan: Disable stroke and move fully towards swanctl
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 4 Aug 2017 20:19:15 +0000 (21:19 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 4 Aug 2017 20:19:15 +0000 (21:19 +0100)
This commit disables stroke, charon and scepclient in favour
of the new configuration tool swanctl.

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

index a2a48eb2799f36ccdf12e3e9736ca1eca5f85427..dd7a0a45f9f5f22eae9993ebd4059b2bd4695e8f 100644 (file)
@@ -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