# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1366664752 -7200
# Node ID 01ad1e61b761ac72d26ca47955409b1d788c895f
# Parent  bf53d191d5bddc0b83e0409e8843d8cb32aa2aeb
Up: wpa_supplicant (1.11)

diff -r bf53d191d5bd -r 01ad1e61b761 wpa_supplicant/receipt
--- a/wpa_supplicant/receipt	Mon Apr 22 22:23:56 2013 +0200
+++ b/wpa_supplicant/receipt	Mon Apr 22 23:05:52 2013 +0200
@@ -1,18 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="wpa_supplicant"
-VERSION="1.0"
+VERSION="1.1"
 CATEGORY="utilities"
 SHORT_DESC="WPA Supplicant with support for WPA and WPA2"
 MAINTAINER="0dddba11@googlemail.com"
-DEPENDS="libssl slitaz-base-files libcrypto libnl"
-BUILD_DEPENDS="openssl-dev libcrypto libcrypto-dev libnl-dev"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://hostap.epitest.fi/wpa_supplicant/"
 WGET_URL="http://hostap.epitest.fi/releases/$TARBALL"
 CONFIG_FILES="/etc/wpa_supplicant.conf"
 TAGS="wireless"
 
+DEPENDS="libssl slitaz-base-files libcrypto libnl"
+BUILD_DEPENDS="openssl-dev libcrypto libcrypto-dev libnl-dev dbus-dev"
+
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -21,28 +22,44 @@
 	sed 's/-lnl-3-genl/-lnl-genl-3/g' -i ../src/drivers/drivers.mak
 	cp -a ./defconfig ./.config
 	cat >> .config << EOF
+CONFIG_AP=y
+CONFIG_BGSCAN_SIMPLE=y
+CONFIG_CTRL_IFACE_DBUS=y
+CONFIG_CTRL_IFACE_DBUS_NEW=y
+CONFIG_CTRL_IFACE_DBUS_INTRO=y
 CONFIG_LIBNL20=y
 CFLAGS += -I/usr/include/libnl3
 EOF
-	make
+	make BINDIR=/usr/bin LIBDIR=/lib
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
+	# commands
 	mkdir -p $fs/usr/bin
-	mkdir -p $fs/etc
-	cp -a $src/$PACKAGE/wpa_cli $fs/usr/bin
-	cp -a $src/$PACKAGE/wpa_supplicant $fs/usr/bin
-	cp -a $src/$PACKAGE/wpa_passphrase $fs/usr/bin
+	install -v -m755 $src/$PACKAGE/wpa_cli $fs/usr/bin
+	install -v -m755 $src/$PACKAGE/wpa_supplicant $fs/usr/bin
+	install -v -m755 $src/$PACKAGE/wpa_passphrase $fs/usr/bin
 
-	# dont copy the original
-	# cp -a $src/$PACKAGE/wpa_supplicant.conf $fs/etc
+	# D-Bus control
+	mkdir -p $fs/usr/share/dbus-1/system-services
+	install -v -m644 \
+		$src/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service \
+		$fs/usr/share/dbus-1/system-services
+	install -v -m644 \
+		$src/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service \
+		$fs/usr/share/dbus-1/system-services
+
+	mkdir -p $fs/etc/dbus-1/system.d
+	install -v -m644 \
+		$src/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
+		$fs/etc/dbus-1/system.d/wpa_supplicant.conf
 
 	# Startup script and cleaned up wpa_supplicant.conf
 	cp -a stuff/etc $fs
-
-
+	# dont copy the original
+	# cp -a $src/$PACKAGE/wpa_supplicant.conf $fs/etc
 }
 
 # Pre and post install commands for Tazpkg.
@@ -50,7 +67,7 @@
 {
 	grep -q ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> $1/etc/daemons.conf <<EOT
 # wpa_supplicant daemon options
-WPA_OPTIONS="-B -P/var/run/wpa_supplicant.pid -c/etc/wpa_supplicant.conf -i\$(. /etc/network.conf ; echo \$WIFI_INTERFACE)"
+WPA_OPTIONS="-B -u -P /var/run/wpa_supplicant.pid -c /etc/wpa_supplicant.conf -i \$(. /etc/network.conf ; echo \$WIFI_INTERFACE)"
 
 EOT
 	# 'w' option dont exist anymore with < 0.6.9
diff -r bf53d191d5bd -r 01ad1e61b761 wpa_supplicant/stuff/etc/wpa_supplicant.conf
--- a/wpa_supplicant/stuff/etc/wpa_supplicant.conf	Mon Apr 22 22:23:56 2013 +0200
+++ b/wpa_supplicant/stuff/etc/wpa_supplicant.conf	Mon Apr 22 23:05:52 2013 +0200
@@ -106,7 +106,7 @@
 #    the driver reports successful association; each network block should have
 #    explicit security policy (i.e., only one option in the lists) for
 #    key_mgmt, pairwise, group, proto variables
-ap_scan=1
+ap_scan=0
 
 # EAP fast re-authentication
 # By default, fast re-authentication is enabled for all EAP methods that