Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen

diff --git a/config/bash/dot_bash_logout b/config/bash/dot_bash_logout
index 3762d94b56d9d8c98cc78e973a2ee8f5c39509b4..d56620d6bd57c43869bbb70fae7a716a449acd05 100644 (file)
--- a/config/bash/dot_bash_logout
+++ b/config/bash/dot_bash_logout
@@ -2,6 +2,9 @@
 
 # Personal items to perform on logout.
 
+# Clear console to not leak any information.
+clear
+
 echo "Bye bye."
 
 # End ~/.bash_logout

diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 18d7582b1ee4f0aa0abeb06713abe7fffd488dd0..9dbf4fb66516f9a6c4d404a1bfc6890099bf3db4 100644 (file)
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -13,17 +13,22 @@ etc/strongswan.conf
 #usr/lib/ipsec
 #usr/lib/ipsec/libcharon.a
 #usr/lib/ipsec/libcharon.la
-#usr/lib/ipsec/libcharon.so
+usr/lib/ipsec/libcharon.so
 usr/lib/ipsec/libcharon.so.0
 usr/lib/ipsec/libcharon.so.0.0.0
 #usr/lib/ipsec/libhydra.a
 #usr/lib/ipsec/libhydra.la
-#usr/lib/ipsec/libhydra.so
+usr/lib/ipsec/libhydra.so
 usr/lib/ipsec/libhydra.so.0
 usr/lib/ipsec/libhydra.so.0.0.0
+#usr/lib/ipsec/libradius.a
+#usr/lib/ipsec/libradius.la
+usr/lib/ipsec/libradius.so
+usr/lib/ipsec/libradius.so.0
+usr/lib/ipsec/libradius.so.0.0.0
 #usr/lib/ipsec/libstrongswan.a
 #usr/lib/ipsec/libstrongswan.la
-#usr/lib/ipsec/libstrongswan.so
+usr/lib/ipsec/libstrongswan.so
 usr/lib/ipsec/libstrongswan.so.0
 usr/lib/ipsec/libstrongswan.so.0.0.0
 #usr/lib/ipsec/plugins
@@ -34,6 +39,7 @@ usr/lib/ipsec/plugins/libstrongswan-constraints.so
 usr/lib/ipsec/plugins/libstrongswan-curl.so
 usr/lib/ipsec/plugins/libstrongswan-des.so
 usr/lib/ipsec/plugins/libstrongswan-dnskey.so
+usr/lib/ipsec/plugins/libstrongswan-eap-radius.so
 usr/lib/ipsec/plugins/libstrongswan-fips-prf.so
 usr/lib/ipsec/plugins/libstrongswan-gmp.so
 usr/lib/ipsec/plugins/libstrongswan-hmac.so

diff --git a/lfs/strongswan b/lfs/strongswan
index e6be0c235e8598c8337ca8b177fdea83e2d6db71..39459c878fe8e3f031deee1af00e4ba59d9ac225 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --sysconfdir="/etc" \
                --enable-curl \
                --enable-openssl \
+               --enable-eap-radius \
                $(PADLOCK)
 
        cd $(DIR_APP) && make $(MAKETUNING)