[pkg-wpa-devel] r1065 - in /wpasupplicant/trunk/debian: changelog patches/49_wpa_gui_qt4_networkconfig_wep_preseed.patch patches/series

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

Author: kelmo-guest
Date: Fri Jan 25 05:32:27 2008
New Revision: 1065

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1065
Log:
cherry pick fix from git to fix preselection of form settings when editing WEP network

Added:
    wpasupplicant/trunk/debian/patches/49_wpa_gui_qt4_networkconfig_wep_preseed.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=1065&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Jan 25 05:32:27 2008
@@ -47,8 +47,9 @@
       - debian/patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch
       - debian/patches/47_wpa_gui_qt4_networkconfig_psk_error_title.patch
       - debian/patches/48_wpa_gui_qt4_networkconfig_focus_on_error.patch
-
- -- Kel Modderman <kel at otaku42.de>  Fri, 25 Jan 2008 15:27:25 +1000
+      - debian/patches/49_wpa_gui_qt4_networkconfig_wep_preseed.patch
+
+ -- Kel Modderman <kel at otaku42.de>  Fri, 25 Jan 2008 15:31:33 +1000
 
 wpasupplicant (0.6.2-1) experimental; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/49_wpa_gui_qt4_networkconfig_wep_preseed.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/49_wpa_gui_qt4_networkconfig_wep_preseed.patch?rev=1065&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/49_wpa_gui_qt4_networkconfig_wep_preseed.patch (added)
+++ wpasupplicant/trunk/debian/patches/49_wpa_gui_qt4_networkconfig_wep_preseed.patch Fri Jan 25 05:32:27 2008
@@ -1,0 +1,11 @@
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+@@ -421,7 +421,7 @@
+ 	reply_len = sizeof(reply) - 1;
+ 	if (wpagui->ctrlRequest(cmd, reply, &reply_len) >= 0) {
+ 		reply[reply_len] = '\0';
+-		if (strstr(reply, "CCMP"))
++		if (strstr(reply, "CCMP") && auth != AUTH_NONE)
+ 			encr = 1;
+ 		else if (strstr(reply, "TKIP"))
+ 			encr = 0;

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1065&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Fri Jan 25 05:32:27 2008
@@ -23,3 +23,4 @@
 46_wpa_gui_qt4_networkconfig_check_idstr.patch
 47_wpa_gui_qt4_networkconfig_psk_error_title.patch
 48_wpa_gui_qt4_networkconfig_focus_on_error.patch
+49_wpa_gui_qt4_networkconfig_wep_preseed.patch