1 files changed, 0 insertions, 121 deletions
diff --git a/net-wireless/wpa_supplicant/files/fix-ssid-combo.patch b/net-wireless/wpa_supplicant/files/fix-ssid-combo.patch
deleted file mode 100644
index b5d7a0280d56..000000000000
--- a/net-wireless/wpa_supplicant/files/fix-ssid-combo.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-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);