Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Jul 2013 20:00:14 +0000 (22:00 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 16 Jul 2013 20:00:14 +0000 (22:00 +0200)
1  2 
config/rootfiles/common/strongswan
lfs/strongswan

Simple merge
diff --cc lfs/strongswan
index 372320705e362df96019553fafcd1a30ae3b1d23,a6075a289355ce52854a954011525ca993163984..df71a3d29ee4138b6cd672e8ab9625346f97313a
@@@ -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.