wpa_supplicant 0.7.3-1 màj port

10 files changed, 231 insertions, 303 deletions

diff --git a/extra/wpa_supplicant/.footprint.i686 b/extra/wpa_supplicant/.footprint.i686
index 1dafb48c6..cbab74630 100644
--- a/extra/wpa_supplicant/.footprint.i686
+++ b/extra/wpa_supplicant/.footprint.i686
@@ -1,16 +1,26 @@
 drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/dbus-1/
+drwxr-xr-x	root/root	etc/dbus-1/system.d/
+-rw-r--r--	root/root	etc/dbus-1/system.d/wpa_supplicant.conf
 -rw-r--r--	root/root	etc/wpa_supplicant.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/eapol_test
 -rwxr-xr-x	root/root	usr/sbin/wpa_cli
 -rwxr-xr-x	root/root	usr/sbin/wpa_passphrase
 -rwxr-xr-x	root/root	usr/sbin/wpa_supplicant
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/dbus-1/
+drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
+-rw-r--r--	root/root	usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
+-rw-r--r--	root/root	usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/wpa_supplicant.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/wpa_background.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wpa_cli.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/wpa_gui.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wpa_passphrase.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/wpa_priv.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wpa_supplicant.8.gz
diff --git a/extra/wpa_supplicant/.footprint.x86_64 b/extra/wpa_supplicant/.footprint.x86_64
index 1dafb48c6..cbab74630 100644
--- a/extra/wpa_supplicant/.footprint.x86_64
+++ b/extra/wpa_supplicant/.footprint.x86_64
@@ -1,16 +1,26 @@
 drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/dbus-1/
+drwxr-xr-x	root/root	etc/dbus-1/system.d/
+-rw-r--r--	root/root	etc/dbus-1/system.d/wpa_supplicant.conf
 -rw-r--r--	root/root	etc/wpa_supplicant.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/eapol_test
 -rwxr-xr-x	root/root	usr/sbin/wpa_cli
 -rwxr-xr-x	root/root	usr/sbin/wpa_passphrase
 -rwxr-xr-x	root/root	usr/sbin/wpa_supplicant
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/dbus-1/
+drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
+-rw-r--r--	root/root	usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
+-rw-r--r--	root/root	usr/share/dbus-1/system-services/fi.w1.wpa_supplicant1.service
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/wpa_supplicant.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/wpa_background.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wpa_cli.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/wpa_gui.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wpa_passphrase.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/wpa_priv.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/wpa_supplicant.8.gz
diff --git a/extra/wpa_supplicant/.md5sum.i686 b/extra/wpa_supplicant/.md5sum.i686
index fc71f3a4f..376e8c546 100644
--- a/extra/wpa_supplicant/.md5sum.i686
+++ b/extra/wpa_supplicant/.md5sum.i686
@@ -1 +1,6 @@
-0efb8fcedf0a8acf6f423dfdb0658fdd  wpa_supplicant-0.6.9.tar.gz
+51f2a016daddf7f2a70f39b4194a05c5  WEP232.patch
+6973ebe2c2c7b44c938737971c7bd641  bss-changed-prop-notify.patch
+1a6c0717fa5f9a07fa0b48e46b393d05  config
+398a05a0c957073500a571bac154cb05  dbus-null-error.patch
+0518c80f93dd601e923a3fed72d14b99  dbus-service-file-args.patch
+f516f191384a9a546e3f5145c08addda  wpa_supplicant-0.7.3.tar.gz
diff --git a/extra/wpa_supplicant/.md5sum.x86_64 b/extra/wpa_supplicant/.md5sum.x86_64
index fc71f3a4f..376e8c546 100644
--- a/extra/wpa_supplicant/.md5sum.x86_64
+++ b/extra/wpa_supplicant/.md5sum.x86_64
@@ -1 +1,6 @@
-0efb8fcedf0a8acf6f423dfdb0658fdd  wpa_supplicant-0.6.9.tar.gz
+51f2a016daddf7f2a70f39b4194a05c5  WEP232.patch
+6973ebe2c2c7b44c938737971c7bd641  bss-changed-prop-notify.patch
+1a6c0717fa5f9a07fa0b48e46b393d05  config
+398a05a0c957073500a571bac154cb05  dbus-null-error.patch
+0518c80f93dd601e923a3fed72d14b99  dbus-service-file-args.patch
+f516f191384a9a546e3f5145c08addda  wpa_supplicant-0.7.3.tar.gz
diff --git a/extra/wpa_supplicant/Pkgfile b/extra/wpa_supplicant/Pkgfile
index 2d282240a..6722e182f 100644
--- a/extra/wpa_supplicant/Pkgfile
+++ b/extra/wpa_supplicant/Pkgfile
@@ -2,27 +2,47 @@
 # URL: http://hostap.epitest.fi/wpa_supplicant
 # Maintainer: NuTyX core team 
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libnl
-# Run on: libnl
+# Depends on: libnl, dbus, openssl
+# Run on: libnl,dbus,openssl
 
 name=wpa_supplicant
-version=0.6.9
+version=0.7.3
 release=1
 madwifi_ver=0.9.4
 source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz \
-	)
+	config
+	dbus-service-file-args.patch
+	dbus-null-error.patch
+	WEP232.patch
+	bss-changed-prop-notify.patch)
 
 build() {
-	cd $name-$version/$name
-	cp defconfig ./.config
-	echo "CONFIG_READLINE=y" >> .config
-	sed -i 's@/usr/local@$(PREFIX)@g' Makefile
+	cd $name-$version
+	patch -p1 < $SRC/bss-changed-prop-notify.patch
+	patch -p1 < $SRC/dbus-service-file-args.patch
+	patch -p1 < $SRC/dbus-null-error.patch
+	patch -p1 < $SRC/WEP232.patch
+
+	cd $name
+	perl -pi -e '$_ = "# $_" if /^\s*network\s*=\s*{/ .. /^\s*}/' wpa_supplicant.conf
+	cp $SRC/config .config
+
 	make
-	make PREFIX=/usr DESTDIR=$PKG install
-	install -D -m644 wpa_supplicant.conf $PKG/etc/wpa_supplicant.conf
-	install -d -m755 $PKG/usr/share/man/man{5,8}
-	install -m644 doc/docbook/wpa_supplicant.conf.5 $PKG/usr/share/man/man5
-	install -m644 doc/docbook/{wpa_background,wpa_cli,wpa_passphrase,wpa_supplicant}.8 \
-	$PKG/usr/share/man/man8
+	make eapol_test
+
+	mkdir -p $PKG/usr/sbin
+	mkdir -p $PKG/etc/dbus-1/system.d/
+	mkdir -p $PKG/usr/share/dbus-1/system-services/
+
+	cp wpa_supplicant $PKG/usr/sbin
+	cp wpa_cli $PKG/usr/sbin
+	cp wpa_passphrase $PKG/usr/sbin
+	cp wpa_supplicant.conf $PKG/etc
+	cp eapol_test $PKG/usr/sbin
+	install -m 0644 dbus/dbus-wpa_supplicant.conf $PKG/etc/dbus-1/system.d/wpa_supplicant.conf
+	install -m 0644 dbus/fi.epitest.hostap.WPASupplicant.service $PKG/usr/share/dbus-1/system-services
+	install -m 0644 dbus/fi.w1.wpa_supplicant1.service $PKG/usr/share/dbus-1/system-services
+	mkdir -p $PKG/usr/share/man/man{5,8}
+	cp doc/docbook/*.8 $PKG/usr/share/man/man8
+	cp doc/docbook/*.5 $PKG/usr/share/man/man5
 }
-  
diff --git a/extra/wpa_supplicant/WEP232.patch b/extra/wpa_supplicant/WEP232.patch
new file mode 100644
index 000000000..bbb5b8f4f
--- /dev/null
+++ b/extra/wpa_supplicant/WEP232.patch
@@ -0,0 +1,12 @@
+diff -p -up wpa_supplicant-0.6.3/wpa_supplicant/config_ssid.h.WEP232 wpa_supplicant-0.6.3/wpa_supplicant/config_ssid.h
+--- wpa_supplicant-0.6.3/wpa_supplicant/config_ssid.h.WEP232	2008-02-23 03:45:24.000000000 +0100
++++ wpa_supplicant-0.6.3/wpa_supplicant/config_ssid.h	2008-03-31 22:28:29.000000000 +0200
+@@ -189,7 +189,7 @@ struct wpa_ssid {
+ #endif /* IEEE8021X_EAPOL */
+ 
+ #define NUM_WEP_KEYS 4
+-#define MAX_WEP_KEY_LEN 16
++#define MAX_WEP_KEY_LEN 32
+ 	/**
+ 	 * wep_key - WEP keys
+ 	 */
diff --git a/extra/wpa_supplicant/bss-changed-prop-notify.patch b/extra/wpa_supplicant/bss-changed-prop-notify.patch
new file mode 100644
index 000000000..4c5002003
--- /dev/null
+++ b/extra/wpa_supplicant/bss-changed-prop-notify.patch
@@ -0,0 +1,61 @@
+From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Fri, 17 Dec 2010 15:56:01 +0200
+Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
+
+The supplicant was not emitting property changed events when the BSSs
+property changed.
+
+Signed-off-by: Dan Williams <dcbw@redhat.com>
+(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
+---
+ wpa_supplicant/dbus/dbus_new.c |    6 ++++++
+ wpa_supplicant/dbus/dbus_new.h |    1 +
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
+index bdfbbac..c66640a 100644
+--- a/wpa_supplicant/dbus/dbus_new.c
++++ b/wpa_supplicant/dbus/dbus_new.c
+@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
+ 			wpas_dbus_getter_current_network;
+ 		prop = "CurrentNetwork";
+ 		break;
++	case WPAS_DBUS_PROP_BSSS:
++		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
++		prop = "BSSs";
++		break;
+ 	default:
+ 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
+ 			   __func__, property);
+@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ }
+@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ 
+diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
+index 80ea98c..9cdefcb 100644
+--- a/wpa_supplicant/dbus/dbus_new.h
++++ b/wpa_supplicant/dbus/dbus_new.h
+@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
+ 	WPAS_DBUS_PROP_STATE,
+ 	WPAS_DBUS_PROP_CURRENT_BSS,
+ 	WPAS_DBUS_PROP_CURRENT_NETWORK,
++	WPAS_DBUS_PROP_BSSS,
+ };
+ 
+ enum wpas_dbus_bss_prop {
+-- 
+1.7.4-rc1
+
diff --git a/extra/wpa_supplicant/config b/extra/wpa_supplicant/config
index 0577dad2c..f093117d1 100644
--- a/extra/wpa_supplicant/config
+++ b/extra/wpa_supplicant/config
@@ -1,304 +1,42 @@
-# Example wpa_supplicant build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cases, these lines should use += in order not
-# to override previous values of the variables.
-
-
-# Uncomment following two lines and fix the paths if you have installed OpenSSL
-# or GnuTLS in non-default location
-#CFLAGS += -I/usr/local/openssl/include
-#LIBS += -L/usr/local/openssl/lib
-
-# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
-# the kerberos files are not in the default include path. Following line can be
-# used to fix build issues on such systems (krb5.h not found).
-#CFLAGS += -I/usr/include/kerberos
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-#	-I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-
-# Driver interface for Host AP driver
 CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-CONFIG_DRIVER_MADWIFI=y
-# Change include directories to match with the local setup
-CFLAGS += -I../madwifi
-
-# Driver interface for Prism54 driver
-# (Note: Prism54 is not yet supported, i.e., this will not work as-is and is
-# for developers only)
 CONFIG_DRIVER_PRISM54=y
-
-# Driver interface for ndiswrapper
-CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
+#CONFIG_DRIVER_HERMES=y
 CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for Broadcom driver
+CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_NDISWRAPPER=y
 #CONFIG_DRIVER_BROADCOM=y
-# Example path for wlioctl.h; change to match your configuration
-#CFLAGS += -I/opt/WRT54GS/release/src/include
-
-# Driver interface for Intel ipw2100/2200 driver
 CONFIG_DRIVER_IPW=y
-
-# Driver interface for generic Linux wireless extensions
-CONFIG_DRIVER_WEXT=y
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-
-# Driver interface for Windows NDIS
-#CONFIG_DRIVER_NDIS=y
-#CFLAGS += -I/usr/include/w32api/ddk
-#LIBS += -L/usr/local/lib
-# For native build using mingw
-#CONFIG_NATIVE_WINDOWS=y
-# Additional directories for cross-compilation on Linux host for mingw target
-#CFLAGS += -I/opt/mingw/mingw32/include/ddk
-#LIBS += -L/opt/mingw/mingw32/lib
-#CC=mingw32-gcc
-# By default, driver_ndis uses WinPcap for low-level operations. This can be
-# replaced with the following option which replaces WinPcap calls with NDISUIO.
-# However, this requires that WZC is disabled (net stop wzcsvc) before starting
-# wpa_supplicant.
-# CONFIG_USE_NDISUIO=y
-
-# Driver interface for development testing
-#CONFIG_DRIVER_TEST=y
-
-# Driver interface for wired Ethernet drivers
+CONFIG_DRIVER_RALINK=y
 CONFIG_DRIVER_WIRED=y
+CONFIG_DRIVER_NL80211=y
 
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
+CONFIG_WIRELESS_EXTENSION=y
 CONFIG_IEEE8021X_EAPOL=y
-
-# EAP-MD5
 CONFIG_EAP_MD5=y
-
-# EAP-MSCHAPv2
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-TLS
+CONFIG_MSCHAPV2=y
 CONFIG_EAP_TLS=y
-
-# EAL-PEAP
 CONFIG_EAP_PEAP=y
-
-# EAP-TTLS
+CONFIG_EAP_FAST=y
 CONFIG_EAP_TTLS=y
-
-# EAP-GTC
 CONFIG_EAP_GTC=y
-
-# EAP-OTP
 CONFIG_EAP_OTP=y
-
-# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
-
-# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-PAX
-#CONFIG_EAP_PAX=y
-
-# LEAP
+CONFIG_EAP_SIM=y
+CONFIG_EAP_AKA=y
+CONFIG_EAP_PSK=y
+CONFIG_EAP_PAX=y
 CONFIG_EAP_LEAP=y
-
-# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-#CONFIG_EAP_AKA=y
-
-# EAP-SAKE
-#CONFIG_EAP_SAKE=y
-
-# EAP-GPSK
-#CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
-# engine.
+CONFIG_EAP_SAKE=y
+CONFIG_EAP_GPSK=y
+CONFIG_EAP_GPSK_SHA256=y
+CONFIG_EAP_TNC=y
+CONFIG_EAP_IKEV2=y
+CONFIG_WPS=y
 CONFIG_SMARTCARD=y
-
-# PC/SC interface for smartcards (USIM, GSM SIM)
-# Enable this if EAP-SIM or EAP-AKA is included
-#CONFIG_PCSC=y
-
-# Development testing
-#CONFIG_EAPOL_TEST=y
-
-# Replace native Linux implementation of packet sockets with libdnet/libpcap.
-# This will be automatically set for non-Linux OS.
-#CONFIG_DNET_PCAP=y
-
-# Select control interface backend for external programs, e.g, wpa_cli:
-# unix = UNIX domain sockets (default for Linux/*BSD)
-# udp = UDP sockets (default for Windows)
-# y = use default (backwards compatibility)
-# If this option is commented out, control interface is not included in the
-# build.
-CONFIG_CTRL_IFACE=y
-
-# Include support for GNU Readline and History Libraries in wpa_cli.
-# When building a wpa_cli binary for distribution, please note that these
-# libraries are licensed under GPL and as such, BSD license may not apply for
-# the resulting binary.
-#CONFIG_READLINE=y
-
-# Remove debugging code that is printing out debug message to stdout.
-# This can be used to reduce the size of the wpa_supplicant considerably
-# if debugging code is not needed. The size reduction can be around 35%
-# (e.g., 90 kB).
-#CONFIG_NO_STDOUT_DEBUG=y
-
-# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
-# 35-50 kB in code size.
-#CONFIG_NO_WPA=y
-
-# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
-# save about 1 kB in code size when building only WPA-Personal (no EAP support)
-# or 6 kB if building for WPA-Enterprise.
-#CONFIG_NO_WPA2=y
-
-# Remove AES extra functions. This can be used to reduce code size by about
-# 1.5 kB by removing extra AES modes that are not needed for commonly used
-# client configurations (they are needed for some EAP types).
-#CONFIG_NO_AES_EXTRAS=y
-
-# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf)
-# winreg = Windows registry (see win_example.reg for an example)
 CONFIG_BACKEND=file
+CONFIG_PKCS12=y
 
-# Select program entry point implementation:
-# main = UNIX/POSIX like main() function (default)
-# main_winsvc = Windows service (read parameters from registry)
-# main_none = Very basic example (development use only)
-#CONFIG_MAIN=main
-
-# Select wrapper for operatins system and C library specific functions
-# unix = UNIX/POSIX like systems (default)
-# win32 = Windows systems
-# none = Empty template
-#CONFIG_OS=unix
-
-# Select event loop implementation
-# eloop = select() loop (default)
-# eloop_win = Windows events and WaitForMultipleObject() loop
-# eloop_none = Empty template
-#CONFIG_ELOOP=eloop
-
-# Select layer 2 packet implementation
-# linux = Linux packet socket (default)
-# pcap = libpcap/libdnet/WinPcap
-# freebsd = FreeBSD libpcap
-# winpcap = WinPcap with receive thread
-# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
-# none = Empty template
-#CONFIG_L2_PACKET=linux
-
-# IEEE 802.11i/IEEE 802.11e STAKey negotiation for direct link connection
-#CONFIG_STAKEY=y
-
-# Proposed replacement for STAKey negotiation: PeerKey handshake for
-# Station to Station Link
-CONFIG_PEERKEY=y
-
-# Select TLS implementation
-# openssl = OpenSSL (default)
-# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
-# internal = Internal TLSv1 implementation (experimental)
-# none = Empty template
-#CONFIG_TLS=openssl
-
-# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
-# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
-# even though the core GnuTLS library is released under LGPL, this extra
-# library uses GPL and as such, the terms of GPL apply to the combination
-# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
-# apply for distribution of the resulting binary.
-#CONFIG_GNUTLS_EXTRA=y
-
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomCrypt and TomsFastMath.
-#LTC_PATH=/usr/src/libtomcrypt-1.11
-#TFM_PATH=/usr/src/tomsfastmath-0.09
-#CFLAGS += -I$(LTC_PATH)/src/headers
-#LIBS += -L$(LTC_PATH) -L$(TFM_PATH)
-#LIBS_p += -L$(LTC_PATH) -L$(TFM_PATH)
-
-# Integrate ndis_events.exe functionality into wpa_supplicant.
-# This is only for Windows builds and requires WMI-related header files and
-# WbemUuid.Lib from Platform SDK even when building with MinGW.
-#CONFIG_NDIS_EVENTS_INTEGRATED=y
-#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
-
-# Add support for DBus control interface
-#CONFIG_CTRL_IFACE_DBUS=y
-
-# Add support for loading EAP methods dynamically as shared libraries.
-# When this option is enabled, each EAP method can be either included
-# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
-# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
-# be loaded in the beginning of the wpa_supplicant configuration file
-# (see load_dynamic_eap parameter in the example file) before being used in
-# the network blocks.
-#
-# Note that some shared parts of EAP methods are included in the main program
-# and in order to be able to use dynamic EAP methods using these parts, the
-# main program must have been build with the EAP method enabled (=y or =dyn).
-# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
-# unless at least one of them was included in the main build to force inclusion
-# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
-# in the main build to be able to load these methods dynamically.
-#
-# Please also note that using dynamic libraries will increase the total binary
-# size. Thus, it may not be the best option for targets that have limited
-# amount of memory/flash.
-CONFIG_DYNAMIC_EAP_METHODS=y
-
-# Include client MLME (management frame processing).
-# This can be used to move MLME processing of Devicescape IEEE 802.11 stack
-# into user space.
-#CONFIG_CLIENT_MLME=y
-
-
+CONFIG_EAPOL_TEST=y
+CONFIG_CTRL_IFACE=y
+CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS_NEW=y
+CONFIG_BGSCAN_SIMPLE=y
diff --git a/extra/wpa_supplicant/dbus-null-error.patch b/extra/wpa_supplicant/dbus-null-error.patch
new file mode 100644
index 000000000..5ca070d3d
--- /dev/null
+++ b/extra/wpa_supplicant/dbus-null-error.patch
@@ -0,0 +1,47 @@
+commit 8ee69e06336d65b15364f4db82d91775d0fe47c6
+Author: Paul Stewart <pstew@google.com>
+Date:   Sat Oct 9 17:29:51 2010 +0300
+
+    dbus_new_handlers: Don't send NULL to dbus_message_new_error
+    
+    The new DBus API helper function wpas_dbus_error_unknown_error
+    function can be called as a result of a failure within internal
+    getter calls, which will call this function with a NULL message
+    parameter.  However, dbus_message_new_error looks very unkindly
+    (i.e, abort()) on a NULL message, so in this case, we should not
+    call it.
+    
+    I've observed this course of events during a call to
+    wpas_dbus_getter_bss_wpa with a faileld parse of the IE parameter.
+    We got here through a call to fill_dict_with_properties which
+    explicitly calls getters with a NULL message parameter.  Judging
+    from the way it is called, this could easily occur if an AP sends
+    out a malformed (or mis-received) probe response.  I usually run
+    into this problem while driving through San Francisco, so I'm
+    exposed to any number of base stations along this path.
+
+Index: wpa_supplicant/dbus/dbus_new_handlers.c
+===================================================================
+--- a/wpa_supplicant/dbus/dbus_new_handlers.c
++++ b/wpa_supplicant/dbus/dbus_new_handlers.c	2011-06-19 22:42:06.912577474 -0300
+@@ -117,6 +117,20 @@
+ DBusMessage * wpas_dbus_error_unknown_error(DBusMessage *message,
+ 					    const char *arg)
+ {
++	/*
++	 * This function can be called as a result of a failure
++	 * within internal getter calls, which will call this function
++	 * with a NULL message parameter.  However, dbus_message_new_error
++	 * looks very unkindly (i.e, abort()) on a NULL message, so
++	 * in this case, we should not call it.
++	 */
++	if (message == NULL) {
++		wpa_printf(MSG_INFO, "dbus: wpas_dbus_error_unknown_error "
++				"called with NULL message (arg=%s)",
++				arg ? arg : "N/A");
++		return NULL;
++	}
++
+ 	return dbus_message_new_error(message, WPAS_DBUS_ERROR_UNKNOWN_ERROR,
+ 				      arg);
+ }
diff --git a/extra/wpa_supplicant/dbus-service-file-args.patch b/extra/wpa_supplicant/dbus-service-file-args.patch
new file mode 100644
index 000000000..e18b9abcf
--- /dev/null
+++ b/extra/wpa_supplicant/dbus-service-file-args.patch
@@ -0,0 +1,20 @@
+Index: wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
+===================================================================
+--- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
++++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service	2011-06-21 08:27:46.286668386 -0300
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=fi.epitest.hostap.WPASupplicant
+-Exec=/sbin/wpa_supplicant -u
++Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant.conf -u -P /var/run/wpa_supplicant.pid
+ User=root
+Index: wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
+===================================================================
+--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
++++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service	2011-06-21 08:27:58.906008351 -0300
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=fi.w1.wpa_supplicant1
+-Exec=/sbin/wpa_supplicant -u
++Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant.conf -u -P /var/run/wpa_supplicant.pid
+ User=root