Upgrade to wpa_supplicant-2.0

[hvlinux.git] / stage2 / pkg / wpa_supplicant

diff --git a/stage2/pkg/wpa_supplicant b/stage2/pkg/wpa_supplicant
index 8578df9..5e476c7 100644 (file)
--- a/stage2/pkg/wpa_supplicant
+++ b/stage2/pkg/wpa_supplicant
@@ -5,42 +5,67 @@ hvbuild()
     cd ${LFS_TMP}/${PACKAGE}/wpa_supplicant
 
     cat > .config << "EOF"
-CONFIG_DRIVER_WEXT=y
-CONFIG_CTRL_IFACE=y
 CONFIG_BACKEND=file
+CONFIG_CTRL_IFACE=y
+CONFIG_DEBUG_FILE=y
+CONFIG_DEBUG_SYSLOG=y
+CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+CONFIG_DRIVER_NL80211=y
+CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_WIRED=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_LEAP=y
+CONFIG_EAP_MD5=y
+CONFIG_EAP_MSCHAPV2=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_PEAP=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_TTLS=y
+CONFIG_IEEE8021X_EAPOL=y
+CONFIG_LIBNL32=y
+CONFIG_PEERKEY=y
+CONFIG_PKCS12=y
+CONFIG_READLINE=y
+CONFIG_SMARTCARD=y
+CONFIG_WPS=y
+CFLAGS += -I/usr/include/libnl3
 
-CONFIG_TLS=internal
+CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS_NEW=y
+CONFIG_CTRL_IFACE_DBUS_INTRO=y
 
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomMath. Alternatively, an integrated, minimal version of
-# LibTomMath can be used. See beginning of libtommath.c for details on benefits
-# and drawbacks of this option.
-CONFIG_INTERNAL_LIBTOMMATH=y
+CONFIG_IPV6=n
+EOF
 
-# At the cost of about 4 kB of additional binary size, the internal LibTomMath
-# can be configured to include faster routines for exptmod, sqr, and div to
-# speed up DH and RSA calculation considerably
-CONFIG_INTERNAL_LIBTOMMATH_FAST=y
+    make BINDIR=/sbin LIBDIR=/lib
 
-EOF
+    install -v -m755 wpa_{cli,passphrase,supplicant} /sbin
+    install -v -m644 doc/docbook/wpa_supplicant.conf.5 /usr/share/man/man5
+    install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 \
+        /usr/share/man/man8
 
-    make
-    install -v -m 755 wpa_cli wpa_supplicant wpa_passphrase /sbin
-    install -v -m 644 doc/docbook/*8 /usr/man/man8
-    install -v -m 644 doc/docbook/wpa_supplicant.conf.5 /usr/man/man5
+    # If D-BUS support:
+    install -v -m644 \
+        dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service \
+        /usr/share/dbus-1/system-services/
+    install -v -m644 dbus/dbus-wpa_supplicant.conf \
+        /etc/dbus-1/system.d/wpa_supplicant.conf
 }
 
 hvbuild_post()
 {
-    # Create default wpa configuration file
-    cat > /etc/wpa_supplicant.conf << EOF
+    if [ ! -f /etc/wpa_supplicant.conf ]; then
+        # Create default wpa configuration file
+        cat > /etc/wpa_supplicant.conf << EOF
 ctrl_interface=/var/run/wpa_supplicant
 
+# Use wpa_passphrase to insert new network entries
+
 network={
   ssid="insert your SSID here"
-  scan_ssid=1
   key_mgmt=WPA-PSK
   psk="insert your password here"
 }
 EOF
+    fi
 }