Fixing bug #321627

(Portage version: 2.2_rc67/cvs/Linux i686)

3 files changed, 135 insertions, 4 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 432edadeacd8..7b9208ab7ac1 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.136 2010/05/19 18:29:10 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.137 2010/05/29 09:54:59 gurligebis Exp $
+
+*wpa_supplicant-0.7.2-r2 (29 May 2010)
+
+  29 May 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -wpa_supplicant-0.7.2-r1.ebuild, +wpa_supplicant-0.7.2-r2.ebuild,
+  +files/fix-ssid-combo.patch:
+  Fixing bug #321627
 
 *wpa_supplicant-0.7.2-r1 (19 May 2010)
 
diff --git a/net-wireless/wpa_supplicant/files/fix-ssid-combo.patch b/net-wireless/wpa_supplicant/files/fix-ssid-combo.patch
new file mode 100644
index 000000000000..b5d7a0280d56
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/fix-ssid-combo.patch
@@ -0,0 +1,121 @@
+From: Kel Modderman <kel@otaku42.de>
+Date: Sun, 2 May 2010 08:17:13 +0000 (+0300)
+Subject: wpa_gui-qt4: Fix network selection
+X-Git-Url: http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=1491f8a78516a5c773583125bd9691323249a6dc;hp=adc8d4a791ca7ef5245d2030d7096cf8675a3720
+
+wpa_gui-qt4: Fix network selection
+
+Use regular expression matches to see if input is not the (now translated?)
+string "Select any network" and is a "<network id>: <ssid>" string or the
+"all" keyword where that is applicable.
+
+Signed-off-by: Kel Modderman <kel@otaku42.de>
+---
+
+diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+index 94220f4..e15d751 100644
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -971,17 +971,10 @@ void WpaGui::selectNetwork( const QString &sel )
+ 	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 @@ void WpaGui::enableNetwork(const QString &sel)
+ 	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 @@ void WpaGui::disableNetwork(const QString &sel)
+ 	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 @@ void WpaGui::editNetwork(const QString &sel)
+ 	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 @@ void WpaGui::removeNetwork(const QString &sel)
+ 	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 if (!cmd.startsWith("all")) {
++		printf("Invalid editNetwork '%s'\n",
++		       cmd.toAscii().constData());
+ 		return;
+-
+-	if (!cmd.startsWith("all")) {
+-		int pos = cmd.indexOf(':');
+-		if (pos < 0) {
+-			printf("Invalid removeNetwork '%s'\n",
+-			       cmd.toAscii().constData());
+-			return;
+-		}
+-		cmd.truncate(pos);
+ 	}
+ 	cmd.prepend("REMOVE_NETWORK ");
+ 	ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r2.ebuild
index a799d68e0ef4..2fa17c153b54 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r1.ebuild,v 1.1 2010/05/19 18:29:10 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r2.ebuild,v 1.1 2010/05/29 09:54:59 gurligebis Exp $
 
 EAPI="2"
 
@@ -65,10 +65,13 @@ src_prepare() {
 		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
 		wpa_supplicant.conf || die
 
-	epatch "${FILESDIR}"/${P}-dbus_path_fix.patch
+	epatch "${FILESDIR}/${P}-dbus_path_fix.patch"
 
 	# bug (320097)
-	epatch "${FILESDIR}"/do-not-call-dbus-functions-with-NULL-path.patch
+	epatch "${FILESDIR}/do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# bug (321627)
+	epatch "${FILESDIR}/fix-ssid-combo.patch"
 }
 
 src_configure() {