[pkg-wpa-devel] r1535 - in /wpasupplicant/trunk: debian/ debian/patches/ wpa_supplicant/ wpa_supplicant/dbus/ wpa_supplicant/wpa_gui-qt4/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun May 2 01:26:13 UTC 2010
Author: kelmo-guest
Date: Sun May 2 01:26:12 2010
New Revision: 1535
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1535
Log:
Add 11_wpa_supplicant_enable_network_tweak.patch to fix semantics of
enable_network command.
Added:
wpasupplicant/trunk/debian/patches/11_wpa_supplicant_enable_network_tweak.patch
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/patches/series
wpasupplicant/trunk/wpa_supplicant/Makefile
wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1535&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun May 2 01:26:12 2010
@@ -27,8 +27,10 @@
* Install pm-utils action script to notify wpa_supplicant of susepnd
and resume events.
* Remove pm-utils stuff from debian/ifupdown/action_wpa.sh.
-
- -- Kel Modderman <kel at otaku42.de> Sun, 02 May 2010 10:54:24 +1000
+ * Add 11_wpa_supplicant_enable_network_tweak.patch to fix semantics of
+ enable_network command.
+
+ -- Kel Modderman <kel at otaku42.de> Sun, 02 May 2010 11:26:02 +1000
wpasupplicant (0.6.10-2) unstable; urgency=low
Added: wpasupplicant/trunk/debian/patches/11_wpa_supplicant_enable_network_tweak.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/11_wpa_supplicant_enable_network_tweak.patch?rev=1535&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/11_wpa_supplicant_enable_network_tweak.patch (added)
+++ wpasupplicant/trunk/debian/patches/11_wpa_supplicant_enable_network_tweak.patch Sun May 2 01:26:12 2010
@@ -1,0 +1,29 @@
+Description: Enable a network block, even if there is a current configuration,
+ if it was disabled.
+From: Kel Modderman <kel at otaku42.de>
+---
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -1392,13 +1392,15 @@ void wpa_supplicant_enable_network(struc
+ }
+ if (wpa_s->reassociate)
+ wpa_supplicant_req_scan(wpa_s, 0, 0);
+- } else if (wpa_s->current_ssid == NULL && ssid->disabled) {
+- /*
+- * Try to reassociate since there is no current configuration
+- * and a new network was made available.
+- */
+- wpa_s->reassociate = 1;
+- wpa_supplicant_req_scan(wpa_s, 0, 0);
++ } else if (ssid->disabled) {
++ if (wpa_s->current_ssid == NULL) {
++ /*
++ * Try to reassociate since there is no current configuration
++ * and a new network was made available.
++ */
++ wpa_s->reassociate = 1;
++ wpa_supplicant_req_scan(wpa_s, 0, 0);
++ }
+
+ was_disabled = ssid->disabled;
+
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1535&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sun May 2 01:26:12 2010
@@ -3,3 +3,4 @@
06_wpa_gui_menu_exec_path.patch
07_dbus_service_syslog.patch
10_wpa_gui_qt4_network_id_qregexp.patch
+11_wpa_supplicant_enable_network_tweak.patch
Modified: wpasupplicant/trunk/wpa_supplicant/Makefile
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/Makefile?rev=1535&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/Makefile (original)
+++ wpasupplicant/trunk/wpa_supplicant/Makefile Sun May 2 01:26:12 2010
@@ -687,7 +687,7 @@
#dynamic symbol loading that is now used in pcsc_funcs.c
#LIBS += -lwinscard
else
-LIBS += -lpcsclite -lpthread
+LIBS += $(shell pkg-config --libs libpcsclite)
endif
endif
Modified: wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf?rev=1535&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf (original)
+++ wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf Sun May 2 01:26:12 2010
@@ -14,6 +14,14 @@
<allow send_interface="fi.w1.wpa_supplicant1"/>
<allow receive_sender="fi.w1.wpa_supplicant1" receive_type="signal"/>
</policy>
+ <policy group="netdev">
+ <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
+ <allow send_interface="fi.epitest.hostap.WPASupplicant"/>
+
+ <allow send_destination="fi.w1.wpa_supplicant1"/>
+ <allow send_interface="fi.w1.wpa_supplicant1"/>
+ <allow receive_sender="fi.w1.wpa_supplicant1" receive_type="signal"/>
+ </policy>
<policy context="default">
<deny own="fi.epitest.hostap.WPASupplicant"/>
<deny send_destination="fi.epitest.hostap.WPASupplicant"/>
Modified: wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service?rev=1535&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service (original)
+++ wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service Sun May 2 01:26:12 2010
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
-Exec=/sbin/wpa_supplicant -u
+Exec=/sbin/wpa_supplicant -u -s
User=root
Modified: wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service?rev=1535&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service (original)
+++ wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service Sun May 2 01:26:12 2010
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=fi.w1.wpa_supplicant1
-Exec=/sbin/wpa_supplicant -u
+Exec=/sbin/wpa_supplicant -u -s
User=root
Modified: wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop?rev=1535&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop Sun May 2 01:26:12 2010
@@ -2,7 +2,7 @@
Version=1.0
Name=wpa_gui
Comment=Graphical user interface for wpa_supplicant
-Exec=wpa_gui
+Exec=/usr/share/wpagui/netdev_wrapper
Icon=wpa_gui
GenericName=wpa_supplicant user interface
Terminal=false
Modified: wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp?rev=1535&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp Sun May 2 01:26:12 2010
@@ -971,17 +971,10 @@
char reply[10];
size_t reply_len = sizeof(reply);
- if (cmd.compare(tr("Select any network"))) {
+ if (cmd.contains(QRegExp("^\\d+:")))
+ cmd.truncate(cmd.indexOf(':'));
+ else
cmd = "any";
- } else {
- int pos = cmd.indexOf(':');
- if (pos < 0) {
- printf("Invalid selectNetwork '%s'\n",
- cmd.toAscii().constData());
- return;
- }
- cmd.truncate(pos);
- }
cmd.prepend("SELECT_NETWORK ");
ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
triggerUpdate();
@@ -995,14 +988,12 @@
char reply[10];
size_t reply_len = sizeof(reply);
- if (!cmd.startsWith("all")) {
- int pos = cmd.indexOf(':');
- if (pos < 0) {
- printf("Invalid enableNetwork '%s'\n",
- cmd.toAscii().constData());
- return;
- }
- cmd.truncate(pos);
+ if (cmd.contains(QRegExp("^\\d+:")))
+ cmd.truncate(cmd.indexOf(':'));
+ else if (!cmd.startsWith("all")) {
+ printf("Invalid editNetwork '%s'\n",
+ cmd.toAscii().constData());
+ return;
}
cmd.prepend("ENABLE_NETWORK ");
ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
@@ -1016,14 +1007,12 @@
char reply[10];
size_t reply_len = sizeof(reply);
- if (!cmd.startsWith("all")) {
- int pos = cmd.indexOf(':');
- if (pos < 0) {
- printf("Invalid disableNetwork '%s'\n",
- cmd.toAscii().constData());
- return;
- }
- cmd.truncate(pos);
+ if (cmd.contains(QRegExp("^\\d+:")))
+ cmd.truncate(cmd.indexOf(':'));
+ else if (!cmd.startsWith("all")) {
+ printf("Invalid editNetwork '%s'\n",
+ cmd.toAscii().constData());
+ return;
}
cmd.prepend("DISABLE_NETWORK ");
ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
@@ -1036,14 +1025,8 @@
QString cmd(sel);
int id = -1;
- if (!cmd.compare(tr("Select any network"))) {
- int pos = sel.indexOf(':');
- if (pos < 0) {
- printf("Invalid editNetwork '%s'\n",
- cmd.toAscii().constData());
- return;
- }
- cmd.truncate(pos);
+ if (cmd.contains(QRegExp("^\\d+:"))) {
+ cmd.truncate(cmd.indexOf(':'));
id = cmd.toInt();
}
@@ -1114,17 +1097,12 @@
char reply[10];
size_t reply_len = sizeof(reply);
- if (cmd.compare(tr("Select any network")))
- return;
-
- if (!cmd.startsWith("all")) {
- int pos = cmd.indexOf(':');
- if (pos < 0) {
- printf("Invalid removeNetwork '%s'\n",
- cmd.toAscii().constData());
- return;
- }
- cmd.truncate(pos);
+ if (cmd.contains(QRegExp("^\\d+:")))
+ cmd.truncate(cmd.indexOf(':'));
+ else if (!cmd.startsWith("all")) {
+ printf("Invalid editNetwork '%s'\n",
+ cmd.toAscii().constData());
+ return;
}
cmd.prepend("REMOVE_NETWORK ");
ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
Modified: wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c?rev=1535&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c Sun May 2 01:26:12 2010
@@ -1392,13 +1392,15 @@
}
if (wpa_s->reassociate)
wpa_supplicant_req_scan(wpa_s, 0, 0);
- } else if (wpa_s->current_ssid == NULL && ssid->disabled) {
- /*
- * Try to reassociate since there is no current configuration
- * and a new network was made available.
- */
- wpa_s->reassociate = 1;
- wpa_supplicant_req_scan(wpa_s, 0, 0);
+ } else if (ssid->disabled) {
+ if (wpa_s->current_ssid == NULL) {
+ /*
+ * Try to reassociate since there is no current configuration
+ * and a new network was made available.
+ */
+ wpa_s->reassociate = 1;
+ wpa_supplicant_req_scan(wpa_s, 0, 0);
+ }
was_disabled = ssid->disabled;
More information about the Pkg-wpa-devel
mailing list