strongswan: Don't ship unity plugin any more.

Fixes #10569

diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 550fa69d9ad422e34f715fd677802b0c73cd0319..077ac4195a0d3cccefed4d8cdc57f9af4929f49d 100644 (file)
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -54,7 +54,6 @@ etc/strongswan.d/charon/sha2.conf
 etc/strongswan.d/charon/socket-default.conf
 etc/strongswan.d/charon/sshkey.conf
 etc/strongswan.d/charon/stroke.conf
-etc/strongswan.d/charon/unity.conf
 etc/strongswan.d/charon/updown.conf
 etc/strongswan.d/charon/x509.conf
 etc/strongswan.d/charon/xauth-eap.conf
@@ -133,7 +132,6 @@ usr/lib/ipsec/plugins/libstrongswan-sha2.so
 usr/lib/ipsec/plugins/libstrongswan-socket-default.so
 usr/lib/ipsec/plugins/libstrongswan-sshkey.so
 usr/lib/ipsec/plugins/libstrongswan-stroke.so
-usr/lib/ipsec/plugins/libstrongswan-unity.so
 usr/lib/ipsec/plugins/libstrongswan-updown.so
 usr/lib/ipsec/plugins/libstrongswan-x509.so
 usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
@@ -213,7 +211,6 @@ usr/sbin/ipsec
 #usr/share/strongswan/templates/config/plugins/socket-default.conf
 #usr/share/strongswan/templates/config/plugins/sshkey.conf
 #usr/share/strongswan/templates/config/plugins/stroke.conf
-#usr/share/strongswan/templates/config/plugins/unity.conf
 #usr/share/strongswan/templates/config/plugins/updown.conf
 #usr/share/strongswan/templates/config/plugins/x509.conf
 #usr/share/strongswan/templates/config/plugins/xauth-eap.conf

diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh
index 26e004496003bdd6dbd30dfd0c8913770e496b58..8bd9a89077d0335cbd4b3374606af1082a71e9ac 100644 (file)
--- a/config/rootfiles/core/80/update.sh
+++ b/config/rootfiles/core/80/update.sh
@@ -31,6 +31,12 @@ do
        rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+# Remove old strongswan files
+rm -f \
+       /etc/strongswan.d/charon/unity.conf \
+       /usr/lib/ipsec/plugins/libstrongswan-unity.so \
+       /usr/share/strongswan/templates/config/plugins/unity.conf
+
 # Stop services
 
 # Extract files

diff --git a/lfs/strongswan b/lfs/strongswan
index a5bda74ff2398d16b60664bd7bdc795d28040d5e..3f05c98cfec39b78f0e3ed5e22a10386bd2adfe4 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -97,7 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-eap-peap \
                --enable-eap-mschapv2 \
                --enable-eap-identity \
-               --enable-unity \
                $(CONFIGURE_OPTIONS)
 
        cd $(DIR_APP) && make $(MAKETUNING)