From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 24 Sep 2016 11:54:39 +0000 (+0100)
Subject: Revert "strongswan 5.5.0: update for rootfile"
X-Git-Tag: v2.19-core106~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c7a3c56ef10d5bc2bb2905846210606bfe1cd9c;p=ipfire-2.x.git

Revert "strongswan 5.5.0: update for rootfile"

The padlock module is only built on i586

This reverts commit 2ac05ca54c6a49e7f4a82aae57d1924fa7c998b2.
---

diff --git a/config/rootfiles/common/i586/strongswan-padlock b/config/rootfiles/common/i586/strongswan-padlock
index 952e7ae8f6..592521276f 100644
--- a/config/rootfiles/common/i586/strongswan-padlock
+++ b/config/rootfiles/common/i586/strongswan-padlock
@@ -1,2 +1,3 @@
 etc/strongswan.d/charon/padlock.conf
 usr/lib/ipsec/plugins/libstrongswan-padlock.so
+#usr/share/strongswan/templates/config/plugins/padlock.conf
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index a2a95abb6c..f81a9c861a 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -40,7 +40,6 @@ etc/strongswan.d/charon/kernel-netlink.conf
 etc/strongswan.d/charon/md5.conf
 etc/strongswan.d/charon/nonce.conf
 etc/strongswan.d/charon/openssl.conf
-etc/strongswan.d/charon/padlock.conf
 etc/strongswan.d/charon/pem.conf
 etc/strongswan.d/charon/pgp.conf
 etc/strongswan.d/charon/pkcs1.conf
@@ -136,7 +135,6 @@ usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
 usr/lib/ipsec/plugins/libstrongswan-md5.so
 usr/lib/ipsec/plugins/libstrongswan-nonce.so
 usr/lib/ipsec/plugins/libstrongswan-openssl.so
-usr/lib/ipsec/plugins/libstrongswan-padlock.so
 usr/lib/ipsec/plugins/libstrongswan-pem.so
 usr/lib/ipsec/plugins/libstrongswan-pgp.so
 usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
@@ -219,7 +217,6 @@ usr/sbin/swanctl
 #usr/share/strongswan/templates/config/plugins/md5.conf
 #usr/share/strongswan/templates/config/plugins/nonce.conf
 #usr/share/strongswan/templates/config/plugins/openssl.conf
-#usr/share/strongswan/templates/config/plugins/padlock.conf
 #usr/share/strongswan/templates/config/plugins/pem.conf
 #usr/share/strongswan/templates/config/plugins/pgp.conf
 #usr/share/strongswan/templates/config/plugins/pkcs1.conf