From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 16 Jul 2013 20:00:14 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
X-Git-Tag: v2.13-core72^2~23^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e9b7dd2c3c0d242c06a48450fef81fcfb5fa29a;p=people%2Fms%2Fipfire-2.x.git

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

5e9b7dd2c3c0d242c06a48450fef81fcfb5fa29a
diff --cc lfs/strongswan
index 372320705e,a6075a2893..df71a3d29e
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@@ -85,10 -84,16 +85,16 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
  		--sysconfdir="/etc" \
  		--enable-curl \
  		--enable-openssl \
+ 		--enable-xauth-eap \
  		--enable-eap-radius \
+ 		--enable-eap-tls \
+ 		--enable-eap-ttls \
+ 		--enable-eap-peap \
+ 		--enable-eap-mschapv2 \
+ 		--enable-eap-identity \
  		$(PADLOCK)
  
 -	cd $(DIR_APP) && make $(MAKETUNING)
 +	cd $(DIR_APP) && make $(MAKETUNING) LDFLAGS="-lrt"
  	cd $(DIR_APP) && make install
  
  	# Remove all library files we don't want or need.