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

This commit is contained in:
Arne Fitzenreiter
2012-12-17 10:15:44 +01:00
3 changed files with 13 additions and 3 deletions

View File

@@ -2,6 +2,9 @@
# Personal items to perform on logout.
# Clear console to not leak any information.
clear
echo "Bye bye."
# End ~/.bash_logout

View File

@@ -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

View File

@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--sysconfdir="/etc" \
--enable-curl \
--enable-openssl \
--enable-eap-radius \
$(PADLOCK)
cd $(DIR_APP) && make $(MAKETUNING)