[pkg-wpa-devel] r1472 - in /wpasupplicant/trunk/debian: changelog patches/17_wpa_msg_ctrl_wps_ap_avail.patch patches/20_wpa_msg_ctrl_wps.patch patches/series

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

Author: kelmo-guest
Date: Thu Feb 11 04:41:29 2010
New Revision: 1472

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1472
Log:
Cherry pick 20_wpa_msg_ctrl_wps.patch from upstream to avoid too frequent
logging of WPS events.

Added:
    wpasupplicant/trunk/debian/patches/20_wpa_msg_ctrl_wps.patch
Removed:
    wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.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=1472&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Feb 11 04:41:29 2010
@@ -50,19 +50,19 @@
   * Drop debian/patches/10_multi_driver.patch due to its invasiveness -
     it may make future patches which fix serious issues harder to apply
     while providing an experimental feature only.
-  * Add debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch to also use
-    wpa_msg_ctrl help for WPS_EVENT_AP_AVAIL_* events.
   * Add debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch to stop
     notifying about WPS_EVENT_AP_* events via wpa_gui tray status
     bubbles - they are too frequent.
   * Cherry pick 19_cfg80211_optimisation.patch from upstream to avoid using
     an expensive hack for cfg80211-aware kernel drivers for disconnect events.
+  * Cherry pick 20_wpa_msg_ctrl_wps.patch from upstream to avoid too frequent
+    logging of WPS events.
   * Drop debian/patches/05_qmake_version_makefile.patch, use qmake build
     class in debian/rules, Build-Depend on qt4-qmake and Build-Conflict
     with libqt3-dev.
   * Adjust debian/watch to scan for the 0.6.X stable releases only.
 
- -- Kel Modderman <kel at otaku42.de>  Thu, 11 Feb 2010 14:16:13 +1000
+ -- Kel Modderman <kel at otaku42.de>  Thu, 11 Feb 2010 14:40:14 +1000
 
 wpasupplicant (0.6.9-3) unstable; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/20_wpa_msg_ctrl_wps.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/20_wpa_msg_ctrl_wps.patch?rev=1472&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/20_wpa_msg_ctrl_wps.patch (added)
+++ wpasupplicant/trunk/debian/patches/20_wpa_msg_ctrl_wps.patch Thu Feb 11 04:41:29 2010
@@ -1,0 +1,32 @@
+From: Jouni Malinen <j at w1.fi>
+Date: Sun, 27 Dec 2009 22:44:10 +0000 (+0200)
+Subject: Use wpa_msg_ctrl() for WPS AP available events
+X-Git-Tag: hostap_0_7_1~168
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=332d630a4422e99b3c7643f9dd9d9f0afb23fc8f
+
+Use wpa_msg_ctrl() for WPS AP available events
+
+No need to include these MSG_INFO level events in stdout/syslog,
+so deliver them only to ctrl_iface monitors.
+---
+
+--- a/wpa_supplicant/wps_supplicant.c
++++ b/wpa_supplicant/wps_supplicant.c
+@@ -904,11 +904,14 @@ void wpas_wps_notify_scan_results(struct
+ 		if (!ie)
+ 			continue;
+ 		if (wps_is_selected_pbc_registrar(ie))
+-			wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PBC);
++			wpa_msg_ctrl(wpa_s, MSG_INFO,
++				     WPS_EVENT_AP_AVAILABLE_PBC);
+ 		else if (wps_is_selected_pin_registrar(ie))
+-			wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PIN);
++			wpa_msg_ctrl(wpa_s, MSG_INFO,
++				     WPS_EVENT_AP_AVAILABLE_PIN);
+ 		else
+-			wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE);
++			wpa_msg_ctrl(wpa_s, MSG_INFO,
++				     WPS_EVENT_AP_AVAILABLE);
+ 		wpabuf_free(ie);
+ 		break;
+ 	}

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1472&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Thu Feb 11 04:41:29 2010
@@ -3,6 +3,6 @@
 06_wpa_gui_menu_exec_path.patch
 07_dbus_service_syslog.patch
 11_syslog.patch
-17_wpa_msg_ctrl_wps_ap_avail.patch
 18_wpa_gui_wps_ap_avail_annoyance.patch
 19_cfg80211_optimisation.patch
+20_wpa_msg_ctrl_wps.patch