wpa_supplicant 0.7.3-1 ajout port

10 files changed, 301 insertions, 0 deletions

diff --git a/wpa_supplicant/.footprint.i686 b/wpa_supplicant/.footprint.i686
new file mode 100644
index 0000000..d4986df
--- /dev/null
+++ b/wpa_supplicant/.footprint.i686
@@ -0,0 +1,27 @@
+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_gui
+-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/wpa_supplicant/.footprint.x86_64 b/wpa_supplicant/.footprint.x86_64
new file mode 100644
index 0000000..d4986df
--- /dev/null
+++ b/wpa_supplicant/.footprint.x86_64
@@ -0,0 +1,27 @@
+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_gui
+-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/wpa_supplicant/.md5sum.i686 b/wpa_supplicant/.md5sum.i686
new file mode 100644
index 0000000..376e8c5
--- /dev/null
+++ b/wpa_supplicant/.md5sum.i686
@@ -0,0 +1,6 @@
+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/wpa_supplicant/.md5sum.x86_64 b/wpa_supplicant/.md5sum.x86_64
new file mode 100644
index 0000000..376e8c5
--- /dev/null
+++ b/wpa_supplicant/.md5sum.x86_64
@@ -0,0 +1,6 @@
+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/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile
new file mode 100644
index 0000000..7751a67
--- /dev/null
+++ b/wpa_supplicant/Pkgfile
@@ -0,0 +1,53 @@
+# Description: Utilitaire permettant la négociation WPA pour les réseaux sans fils
+# URL: http://hostap.epitest.fi/wpa_supplicant
+# Maintainer: NuTyX core team 
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: libnl, qt, dbus, openssl
+# Run on: libnl,qt,dbus,openssl
+
+name=wpa_supplicant
+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
+	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 eapol_test
+	cd wpa_gui
+	qmake
+	make
+	cd ..
+
+	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 wpa_gui/wpa_gui $PKG/usr/sbin
+	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/wpa_supplicant/WEP232.patch b/wpa_supplicant/WEP232.patch
new file mode 100644
index 0000000..bbb5b8f
--- /dev/null
+++ b/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/wpa_supplicant/bss-changed-prop-notify.patch b/wpa_supplicant/bss-changed-prop-notify.patch
new file mode 100644
index 0000000..4c50020
--- /dev/null
+++ b/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/wpa_supplicant/config b/wpa_supplicant/config
new file mode 100644
index 0000000..f093117
--- /dev/null
+++ b/wpa_supplicant/config
@@ -0,0 +1,42 @@
+CONFIG_DRIVER_HOSTAP=y
+CONFIG_DRIVER_PRISM54=y
+#CONFIG_DRIVER_HERMES=y
+CONFIG_DRIVER_ATMEL=y
+CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_NDISWRAPPER=y
+#CONFIG_DRIVER_BROADCOM=y
+CONFIG_DRIVER_IPW=y
+CONFIG_DRIVER_RALINK=y
+CONFIG_DRIVER_WIRED=y
+CONFIG_DRIVER_NL80211=y
+
+CONFIG_WIRELESS_EXTENSION=y
+CONFIG_IEEE8021X_EAPOL=y
+CONFIG_EAP_MD5=y
+CONFIG_MSCHAPV2=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_PEAP=y
+CONFIG_EAP_FAST=y
+CONFIG_EAP_TTLS=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_SIM=y
+CONFIG_EAP_AKA=y
+CONFIG_EAP_PSK=y
+CONFIG_EAP_PAX=y
+CONFIG_EAP_LEAP=y
+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
+CONFIG_BACKEND=file
+CONFIG_PKCS12=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/wpa_supplicant/dbus-null-error.patch b/wpa_supplicant/dbus-null-error.patch
new file mode 100644
index 0000000..5ca070d
--- /dev/null
+++ b/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/wpa_supplicant/dbus-service-file-args.patch b/wpa_supplicant/dbus-service-file-args.patch
new file mode 100644
index 0000000..e18b9ab
--- /dev/null
+++ b/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