[pkg-wpa-devel] r1130 - in /wpasupplicant/trunk/debian: changelog patches/40_dbus_ssid_data.patch patches/series

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Tue Feb 12 14:55:16 2008
New Revision: 1130

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1130
Log:
* Add patch to fix sending of ie data through D-Bus interface.
  - debian/patches/40_dbus_ssid_data.patch (Closes: #465338)

Added:
    wpasupplicant/trunk/debian/patches/40_dbus_ssid_data.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1130&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Tue Feb 12 14:55:16 2008
@@ -2,8 +2,10 @@
 
   * Tidy up the clean target of debian/rules. Now that the madwifi headers are
     handled differently we no longer need to do any cleanup.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 10 Feb 2008 19:31:18 +1000
+  * Add patch to fix sending of ie data through D-Bus interface.
+    - debian/patches/40_dbus_ssid_data.patch (Closes: #465338)
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 13 Feb 2008 00:51:42 +1000
 
 wpasupplicant (0.6.2+git20080206.g8c0dad4-1) unstable; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/40_dbus_ssid_data.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/40_dbus_ssid_data.patch?rev=1130&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/40_dbus_ssid_data.patch (added)
+++ wpasupplicant/trunk/debian/patches/40_dbus_ssid_data.patch Tue Feb 12 14:55:16 2008
@@ -1,0 +1,33 @@
+From: Alban Browaeys <prahal at yahoo.com>
+Reference: http://lists.shmoo.com/pipermail/hostap/2008-February/017334.html
+Description: Send requested data from ie pointer, not garbage.
+
+--- a/wpa_supplicant/ctrl_iface_dbus_handlers.c
++++ b/wpa_supplicant/ctrl_iface_dbus_handlers.c
+@@ -405,7 +405,7 @@
+ 		const char *ssid_data;
+ 		len = ie[1];
+ 		ie += 2;
+-		ssid_data = (const char *) &ie;
++		ssid_data = (const char *) ie;
+ 		if (!wpa_dbus_dict_append_byte_array(&iter_dict, "ssid",
+ 						     ssid_data, len))
+ 		goto error;
+@@ -415,7 +415,7 @@
+ 	if (ie) {
+ 		const char *wpa_ie_data;
+ 		len = 2 + ie[1];
+-		wpa_ie_data = (const char *) &ie;
++		wpa_ie_data = (const char *) ie;
+ 		if (!wpa_dbus_dict_append_byte_array(&iter_dict, "wpaie",
+ 						     wpa_ie_data, len))
+ 			goto error;
+@@ -425,7 +425,7 @@
+ 	if (ie) {
+ 		const char *rsn_ie_data;
+ 		len = 2 + ie[1];
+-		rsn_ie_data = (const char *) &ie;
++		rsn_ie_data = (const char *) ie;
+ 		if (!wpa_dbus_dict_append_byte_array(&iter_dict, "rsnie",
+ 						     rsn_ie_data, len))
+ 			goto error;

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1130&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Tue Feb 12 14:55:16 2008
@@ -6,3 +6,4 @@
 30_wpa_gui_qt4_eventhistoryui_rework.patch
 31_wpa_gui_qt4_eventhistory_always_scrollbar.patch
 32_wpa_gui_qt4_eventhistory_scroll_with_events.patch
+40_dbus_ssid_data.patch