Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fbb51abb580558cbccc86c4af2cb44dc220d235
commit 5fbb51abb580558cbccc86c4af2cb44dc220d235
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sun May 29 22:14:34 2011 +0200
wpa_supplicant-0.7.3-4-i686
*added dbus fix
diff --git a/source/base/wpa_supplicant/FrugalBuild
b/source/base/wpa_supplicant/FrugalBuild
index 752ac5c..4f77ba2 100644
--- a/source/base/wpa_supplicant/FrugalBuild
+++ b/source/base/wpa_supplicant/FrugalBuild
@@ -12,7 +12,7 @@ USE_DEBUG=${USE_DEBUG:-"y"}
pkgname=wpa_supplicant
pkgver=0.7.3
-pkgrel=3
+pkgrel=4
pkgdesc="Linux WPA/WPA2/IEEE 802.1X Supplicant"
url="http://hostap.epitest.fi/wpa_supplicant/";
depends=('openssl>=1.0.0' 'libnl')
@@ -25,10 +25,11 @@ groups=('base')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump $url |grep -1 stable|sed -n 's/.*-\(.*\)\.t.*/\1/;3 p'"
source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz \
- config nm.diff)
+ config nm.diff dbus.diff)
sha1sums=('ca51db8931fabf386352c87422f3e62fb44c3fe3' \
'afde5abc911f18cf7871df8cbf21735b35af4a03' \
- 'f253705e39900dc6e65dd48f1a6fb23c465f8f0c')
+ 'f253705e39900dc6e65dd48f1a6fb23c465f8f0c' \
+ '45980b4f69a65199c7c462595ed63d951095083c')
options=('scriptlet')
if Fuse $USE_GUI; then
diff --git a/source/base/wpa_supplicant/dbus.diff
b/source/base/wpa_supplicant/dbus.diff
new file mode 100644
index 0000000..ede6006
--- /dev/null
+++ b/source/base/wpa_supplicant/dbus.diff
@@ -0,0 +1,47 @@
+commit 8ee69e06336d65b15364f4db82d91775d0fe47c6
+Author: Paul Stewart <ps...@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.
+
+diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c
b/wpa_supplicant/dbus/dbus_new_handlers.c
+index 73f4e44..0ad51a0 100644
+--- a/wpa_supplicant/dbus/dbus_new_handlers.c
++++ b/wpa_supplicant/dbus/dbus_new_handlers.c
+@@ -117,6 +117,20 @@ static char * wpas_dbus_new_decompose_object_path(const
char *path,
+ 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);
+ }
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
