From d134a28134a495dda5d39fc766869ee6d8ba6927 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Fri, 30 Aug 2013 08:32:42 -0400
Subject: [PATCH] Upgrade to wpa_supplicant-2.0

---
 config/packages-list      |  3 +-
 stage2/hv-install-2       |  1 +
 stage2/packages-update    |  2 ++
 stage2/pkg/wpa_supplicant | 64 +++++++++++++++++++++++++++------------
 4 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index 0a418a3..c2ac8c5 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -226,6 +226,7 @@ LIBID3TAG="libid3tag-0.15.1b"
 LIBJPEG="libjpeg-turbo-1.3.0"
 LIBMAD="libmad-0.15.1b"
 LIBMNG="libmng-1.0.10"
+LIBNL="libnl-3.2.22"
 LIBNOTIFY="libnotify-0.5.2"
 LIBOGG="libogg-1.3.0"
 LIBOIL="liboil-0.3.17"
@@ -423,7 +424,7 @@ WINDOWMAKER="WindowMaker-0.95.4"
 WINDOWMAKER_EXTRA="WindowMaker-extra-0.1"
 WIRELESS_TOOLS="wireless_tools.29"
 WMNOTIFY="wmnotify-1.0.0"
-WPA_SUPPLICANT="wpa_supplicant-1.0"
+WPA_SUPPLICANT="wpa_supplicant-2.0"
 WV="wv-1.2.9"
 WXGTK="wxGTK-2.8.12"
 
diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index 71ca365..2c731a3 100755
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -45,6 +45,7 @@ ipkg ${GRUB} --disable-werror
 ipkg -m acnb ${DHCP}
 
 if [ -n "${WIFI_SUPPORT}" ]; then
+    ipkg -m acnb ${LIBNL} "--disable-static"
     PREFIX=/usr ipkg -m noac -s wireless-tools ${WIRELESS_TOOLS}
     ipkg -m noac ${WPA_SUPPLICANT}
 
diff --git a/stage2/packages-update b/stage2/packages-update
index 524aac9..d0ed09f 100755
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -72,6 +72,8 @@ fpkg -m gnu ${GROFF}
 fpkg -s "linux/utils/net/iproute2" ${IPROUTE2} ${KERNEL_URL}
 
 if [ -n "${WIFI_SUPPORT}" ]; then
+    fpkg -e "tar.gz" ${LIBNL} \
+        "http://www.infradead.org/~tgr/libnl/files"
     fpkg -e "tar.gz" ${WIRELESS_TOOLS} \
         "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux"
     fpkg -e "tar.gz" ${WPA_SUPPLICANT} "http://hostap.epitest.fi/releases"
diff --git a/stage2/pkg/wpa_supplicant b/stage2/pkg/wpa_supplicant
index 555034a..5e476c7 100644
--- a/stage2/pkg/wpa_supplicant
+++ b/stage2/pkg/wpa_supplicant
@@ -5,41 +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"
   key_mgmt=WPA-PSK
   psk="insert your password here"
 }
 EOF
+    fi
 }
-- 
2.20.1