[pkg-wpa-devel] r956 - in /wpasupplicant/trunk/debian: changelog patches/01_debian_wpa_roam_example.patch patches/30_id_str_wpa_gui_qt3.patch patches/series
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Thu Dec 27 12:23:09 UTC 2007
Author: kelmo-guest
Date: Thu Dec 27 12:23:09 2007
New Revision: 956
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=956
Log:
* Add an empty ssid field to the associate-to-any-open network block in the
template wpa-roam example.
* Add debian/patches/30_id_str_wpa_gui_qt3.patch to enhance the QT3 wpa_gui
with a Network ID field to represent the id_str field when adding a
network block.
Added:
wpasupplicant/trunk/debian/patches/30_id_str_wpa_gui_qt3.patch
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch
wpasupplicant/trunk/debian/patches/series
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=956&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Dec 27 12:23:09 2007
@@ -44,8 +44,13 @@
wpa_supplicant with wpa_cli and wpa_gui".
* Activate CONFIG_IEEE80211R, CONFIG_IEEE80211W and CONFIG_EAP_WSC in the
default build configuration.
-
- -- Kel Modderman <kel at otaku42.de> Thu, 27 Dec 2007 16:24:16 +1000
+ * Add an empty ssid field to the associate-to-any-open network block in the
+ template wpa-roam example.
+ * Add debian/patches/30_id_str_wpa_gui_qt3.patch to enhance the QT3 wpa_gui
+ with a Network ID field to represent the id_str field when adding a
+ network block.
+
+ -- Kel Modderman <kel at otaku42.de> Thu, 27 Dec 2007 22:19:50 +1000
wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch?rev=956&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch (original)
+++ wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch Thu Dec 27 12:23:09 2007
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/wpa_supplicant/examples/wpa-roam.conf
-@@ -0,0 +1,85 @@
+@@ -0,0 +1,86 @@
+######################## Debian wpa-roam Template #############################
+#
+# Template configuration for wpa-roam mode of Debian's wpasupplicant package.
@@ -84,5 +84,6 @@
+# networks can be configured with wpa_cli/wpa_gui.
+#
+network={
++ ssid=""
+ key_mgmt=NONE
+}
Added: wpasupplicant/trunk/debian/patches/30_id_str_wpa_gui_qt3.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/30_id_str_wpa_gui_qt3.patch?rev=956&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/30_id_str_wpa_gui_qt3.patch (added)
+++ wpasupplicant/trunk/debian/patches/30_id_str_wpa_gui_qt3.patch Thu Dec 27 12:23:09 2007
@@ -1,0 +1,209 @@
+--- a/wpa_supplicant/wpa_gui/networkconfig.ui
++++ b/wpa_supplicant/wpa_gui/networkconfig.ui
+@@ -9,7 +9,7 @@
+ <x>0</x>
+ <y>0</y>
+ <width>380</width>
+- <height>413</height>
++ <height>430</height>
+ </rect>
+ </property>
+ <property name="caption">
+@@ -43,7 +43,7 @@
+ </property>
+ <widget class="QLabel" row="0" column="0">
+ <property name="name">
+- <cstring>textLabel1</cstring>
++ <cstring>textLabel0</cstring>
+ </property>
+ <property name="text">
+ <string>SSID</string>
+@@ -62,13 +62,32 @@
+ </widget>
+ <widget class="QLabel" row="1" column="0">
+ <property name="name">
++ <cstring>textLabel1</cstring>
++ </property>
++ <property name="text">
++ <string>Network ID</string>
++ </property>
++ </widget>
++ <widget class="QLineEdit" row="1" column="1">
++ <property name="name">
++ <cstring>idstrEdit</cstring>
++ </property>
++ <property name="text">
++ <string></string>
++ </property>
++ <property name="toolTip" stdset="0">
++ <string>Network Identification String</string>
++ </property>
++ </widget>
++ <widget class="QLabel" row="2" column="0">
++ <property name="name">
+ <cstring>textLabel2</cstring>
+ </property>
+ <property name="text">
+ <string>Authentication</string>
+ </property>
+ </widget>
+- <widget class="QComboBox" row="1" column="1">
++ <widget class="QComboBox" row="2" column="1">
+ <item>
+ <property name="text">
+ <string>Plaintext or static WEP</string>
+@@ -103,7 +122,7 @@
+ <cstring>authSelect</cstring>
+ </property>
+ </widget>
+- <widget class="QLabel" row="2" column="0">
++ <widget class="QLabel" row="3" column="0">
+ <property name="name">
+ <cstring>textLabel3</cstring>
+ </property>
+@@ -111,7 +130,7 @@
+ <string>Encryption</string>
+ </property>
+ </widget>
+- <widget class="QComboBox" row="2" column="1">
++ <widget class="QComboBox" row="3" column="1">
+ <item>
+ <property name="text">
+ <string>None</string>
+@@ -136,7 +155,7 @@
+ <cstring>encrSelect</cstring>
+ </property>
+ </widget>
+- <widget class="QLabel" row="3" column="0">
++ <widget class="QLabel" row="4" column="0">
+ <property name="name">
+ <cstring>textLabel4</cstring>
+ </property>
+@@ -144,7 +163,7 @@
+ <string>PSK</string>
+ </property>
+ </widget>
+- <widget class="QLineEdit" row="3" column="1">
++ <widget class="QLineEdit" row="4" column="1">
+ <property name="name">
+ <cstring>pskEdit</cstring>
+ </property>
+@@ -161,7 +180,7 @@
+ <string></string>
+ </property>
+ </widget>
+- <widget class="QLabel" row="4" column="0">
++ <widget class="QLabel" row="5" column="0">
+ <property name="name">
+ <cstring>textLabel5</cstring>
+ </property>
+@@ -169,7 +188,7 @@
+ <string>EAP method</string>
+ </property>
+ </widget>
+- <widget class="QComboBox" row="4" column="1">
++ <widget class="QComboBox" row="5" column="1">
+ <property name="name">
+ <cstring>eapSelect</cstring>
+ </property>
+@@ -177,7 +196,7 @@
+ <bool>false</bool>
+ </property>
+ </widget>
+- <widget class="QLabel" row="5" column="0">
++ <widget class="QLabel" row="6" column="0">
+ <property name="name">
+ <cstring>textLabel6</cstring>
+ </property>
+@@ -185,7 +204,7 @@
+ <string>Identity</string>
+ </property>
+ </widget>
+- <widget class="QLineEdit" row="5" column="1">
++ <widget class="QLineEdit" row="6" column="1">
+ <property name="name">
+ <cstring>identityEdit</cstring>
+ </property>
+@@ -196,7 +215,7 @@
+ <string>Username/Identity for EAP methods</string>
+ </property>
+ </widget>
+- <widget class="QLabel" row="6" column="0">
++ <widget class="QLabel" row="7" column="0">
+ <property name="name">
+ <cstring>textLabel7</cstring>
+ </property>
+@@ -204,7 +223,7 @@
+ <string>Password</string>
+ </property>
+ </widget>
+- <widget class="QLineEdit" row="6" column="1">
++ <widget class="QLineEdit" row="7" column="1">
+ <property name="name">
+ <cstring>passwordEdit</cstring>
+ </property>
+@@ -218,7 +237,7 @@
+ <string>Password for EAP methods</string>
+ </property>
+ </widget>
+- <widget class="QLabel" row="7" column="0">
++ <widget class="QLabel" row="8" column="0">
+ <property name="name">
+ <cstring>textLabel1_2</cstring>
+ </property>
+@@ -226,7 +245,7 @@
+ <string>CA certificate</string>
+ </property>
+ </widget>
+- <widget class="QLineEdit" row="7" column="1">
++ <widget class="QLineEdit" row="8" column="1">
+ <property name="name">
+ <cstring>cacertEdit</cstring>
+ </property>
+@@ -234,7 +253,7 @@
+ <bool>false</bool>
+ </property>
+ </widget>
+- <widget class="QButtonGroup" row="8" column="0" rowspan="1" colspan="2">
++ <widget class="QButtonGroup" row="9" column="0" rowspan="1" colspan="2">
+ <property name="name">
+ <cstring>buttonGroup1</cstring>
+ </property>
+@@ -400,6 +419,7 @@
+ </connections>
+ <tabstops>
+ <tabstop>ssidEdit</tabstop>
++ <tabstop>idstrEdit</tabstop>
+ <tabstop>authSelect</tabstop>
+ <tabstop>encrSelect</tabstop>
+ <tabstop>pskEdit</tabstop>
+--- a/wpa_supplicant/wpa_gui/networkconfig.ui.h
++++ b/wpa_supplicant/wpa_gui/networkconfig.ui.h
+@@ -131,6 +131,9 @@
+
+ setNetworkParam(id, "ssid", ssidEdit->text().ascii(), true);
+
++ if (idstrEdit->isEnabled())
++ setNetworkParam(id, "id_str", idstrEdit->text().ascii(), true);
++
+ const char *key_mgmt = NULL, *proto = NULL, *pairwise = NULL;
+ switch (auth) {
+ case AUTH_NONE:
+@@ -315,6 +318,17 @@
+ *pos = '\0';
+ ssidEdit->setText(reply + 1);
+ }
++
++ snprintf(cmd, sizeof(cmd), "GET_NETWORK %d id_str", network_id);
++ reply_len = sizeof(reply) - 1;
++ if (wpagui->ctrlRequest(cmd, reply, &reply_len) >= 0 && reply_len >= 2 &&
++ reply[0] == '"') {
++ reply[reply_len] = '\0';
++ pos = strchr(reply + 1, '"');
++ if (pos)
++ *pos = '\0';
++ idstrEdit->setText(reply + 1);
++ }
+
+ snprintf(cmd, sizeof(cmd), "GET_NETWORK %d proto", network_id);
+ reply_len = sizeof(reply) - 1;
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=956&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Thu Dec 27 12:23:09 2007
@@ -3,3 +3,4 @@
02_dbus_group_policy.patch
20_madwifi_headers.patch
21_config_driver_madwifi.patch
+30_id_str_wpa_gui_qt3.patch
More information about the Pkg-wpa-devel
mailing list