Fixing bug #321627

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 141 insertions, 19 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/Manifest b/net-wireless/wpa_supplicant/Manifest
index 79a51c8d0d70..593b674b2ee1 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX dbus_path_fix.patch 286 RMD160 891b3b8dc1ed75089a5be31e4a6937fe52178ad0 SHA1 8bf3cc3e970a039c282ca8e01d3096273f1d19f7 SHA256 1d64d21d9a38a41665b054775bfa77c3c3849d2d60d30575434c77b3630ff52f
 AUX do-not-call-dbus-functions-with-NULL-path.patch 1931 RMD160 9ba6cc14cb6816062ba208f136785d664e58d347 SHA1 9ae40351bd125d5be0a392bff5239b6f3ce85af4 SHA256 faa5d9bbc79ff719c61ed24bc173ad07699a0b21f9fc472f09157d001299395e
+AUX fix-ssid-combo.patch 3713 RMD160 97e68ffcf2ae2a0d45ca5d868e0490ce531af8b4 SHA1 5f12d283fb7bf119807ae01783db99a1f1549c9a SHA256 68e351bf69eb9cba38c093b0f252a89d2b8794039def4697b5f6851feedc7831
 AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f74eb053183d13fcb7d039d91c01fb3765a SHA256 f6b62c8b1db53e94c49ad717d10f5cbb3b08127ba9f8ab9c72da14ba52f995d8
 AUX wpa_supplicant-0.7.1-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791
 AUX wpa_supplicant-0.7.2-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791
@@ -17,24 +18,14 @@ DIST wpa_supplicant-0.7.2.tar.gz 1634596 RMD160 d9c804dd92ef827a4640a53ae963ea52
 EBUILD wpa_supplicant-0.6.10.ebuild 7173 RMD160 44cfc0b09aae6d4e71c5c89b23a51beee9a0cced SHA1 c266129998aa32f79493652f4aae5abbd6566789 SHA256 2b65a620e335af8ea647a43e31262513d81e88636648cdfe9aa65a357068c4b2
 EBUILD wpa_supplicant-0.6.9.ebuild 7168 RMD160 7d620356257c94e507f3ac544f1fc2372e51faaf SHA1 ee6059770c14627ca69c3af9aa23029414dcef98 SHA256 e2958204f8d68cb5188cd54c73c749304b7886c150cec4f8c2af5ba795ac2a2b
 EBUILD wpa_supplicant-0.7.1.ebuild 7244 RMD160 c738048eee3a19aa1b33f0e4d290a89d0690268c SHA1 0d34dce35729c0dfd7167116be243182cd3e81b6 SHA256 177b79291cb0038ffcd8de1ab0c8ffe499d1720843ceb189563adb0258d5202a
-EBUILD wpa_supplicant-0.7.2-r1.ebuild 7334 RMD160 227e3de809f37cf6533fc07459a16285d2a06180 SHA1 679bff35940c0528d4cfaffd5d5711394d48bd5f SHA256 ac1575aa43f5eecfeac15e58d2bac08478c310c8430fa47914024e864e665e4d
+EBUILD wpa_supplicant-0.7.2-r2.ebuild 7396 RMD160 ef46b53ffac40e7840cef46e13a45d66dd5a999a SHA1 9bd1dd2a85551ad96c0dcd776bf946d5f75e6c8c SHA256 3d5c03c2792edaf8fd7e0312cbf790bbde43fb13023df4c62f82c89e4c2ce31d
 EBUILD wpa_supplicant-9999.ebuild 7529 RMD160 65051207df5cf3ede7fda795ccd67d2e70487c7b SHA1 0bb0d2213a40d158dcf706728756fe1d06eba732 SHA256 4c3e380774a16cfd5ed1122d51bf6290ab56ca4a753024d559cbc9f68336a272
-MISC ChangeLog 29559 RMD160 a8c7011b7d6e299af03d5b2527818e10f7272089 SHA1 3d8273811f4038bf2e7e3fa453860169d85bd684 SHA256 e975351730c09d686a27c40fdc5a0036080525b33746f68d960347f7d1187914
+MISC ChangeLog 29784 RMD160 5a648415b5957c5a9e8e816909676cd1ef1347f7 SHA1 632ee6bcce8dfe5c3512195504e9823f5e2096c8 SHA256 a743119affe1aa9fb55131e8f0297b37cf3d182167389ac01bc77fab052ce8b3
 MISC metadata.xml 651 RMD160 c1b0aca5e38265dbd80247ec686a0b7c3f8fb171 SHA1 6c5d98fa137ddb0f8a5866af68032cf769cc315c SHA256 88eec5cdc25fc735e42d5b581463e576a0f4a5df8e7694e1c8b9c24ea8358b93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQIcBAEBAgAGBQJL9C4iAAoJEHy/RO9cNQiDpnkQAK1owbXDCv/lQ1iKCGRDJNqR
-KTc7RQk7bV0OvxMom7576O/BIpgK1EGqZQG+D/q4PjxDK8qGusO2n8m+qjwMGE8I
-p233OZmvX3FKSjwwupvE6IlhF/BiqNr/bTFj0HaVuajC5AdD49vL2w5uHqLTPbaP
-s6TmLOnQA+pdv2r+t9/2Ax1SKy5PHHjKl+W7CHBoS2Jqtn+CCqxTIWXj+v9HVQKZ
-Mf7V2xjyJa8xRgAOQHuDqeSnuyPzQ22GweB5R1wZ3tpEnxxD/AkqgrYi16rifT58
-JdSKSIn4o5lVp+vBLlMUKx6e9LaXy22wsf2uJCXMMzImCKjeKJ841rxtP217Vgu3
-D3I1oyxOF2XhEABclmKjIorhZk1ztMi98M2I+sg0SHQCmPqaSoIOujljplKzH/RO
-g11i6vtWdAjwLDCfNhj0pAVDxHZjCCi0/pjpYTQ9YQQyXOVsA8XPCyWX+7vVjBOn
-GLZ0RkurXwqtFEReSU9qQsHh2i7ZuFm09R+qiNdmW0IezC7YC/hmUoGxCl+6qSMk
-6yr1xitRH9euJ4Jv/Y9hLM1dJKUDG3xaqex30H/h53fdr6rN0JLTKNE3hL/aLhdk
-XlZQ28+st5D/fF3kejsVyrUy3GcWLeyBlf4bznqHzGloFJwgh6Vb1jIATIodPPd1
-Udb18O/OQd3TS797/ehL
-=kTmo
+iEYEARECAAYFAkwA5H0ACgkQsR7PQhRXYEnFjACfbuCYO17PNEAVaX2qZSsmJYHG
+mqUAnj4HvR5w1jVn+IJKhCecgoYQQ4lc
+=8ygz
 -----END PGP SIGNATURE-----
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() {