Cleaning bug and fixing bugs #373921 and #374089

Package-Manager: portage-2.2.0_alpha43/cvs/Linux i686

9 files changed, 141 insertions, 426 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 3b1589cc9fab..bdf14d397f07 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.159 2011/07/01 20:01:04 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.160 2011/07/07 07:54:54 gurligebis Exp $
+
+*wpa_supplicant-0.7.3-r4 (07 Jul 2011)
+
+  07 Jul 2011; <gurligebis@gentoo.org> -wpa_supplicant-0.7.2-r3.ebuild,
+  -files/wpa_supplicant-0.7.2-dbus_path_fix.patch,
+  -files/wpa_supplicant-0.7.2-no-crash.patch, -wpa_supplicant-0.7.3-r3.ebuild,
+  +wpa_supplicant-0.7.3-r4.ebuild,
+  +files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch,
+  -files/fix-ssid-combo.patch, files/wpa_cli.sh:
+  Cleaning bug and fixing bugs #373921 and #374089
 
   01 Jul 2011; <gurligebis@gentoo.org> wpa_supplicant-0.7.3-r3.ebuild:
   Fixing multilib-strict problem (bug #373685)
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 6790655c634d..e2ee0b2bb2b5 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -2,10 +2,8 @@
 Hash: SHA1
 
 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.2-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791
-AUX wpa_supplicant-0.7.2-no-crash.patch 601 RMD160 ade21c632516b4ea179a9bc361d5f8944f5541f4 SHA1 8da52f09f7402dc78b71e39cb5c097169fc7dfa3 SHA256 58922437ffa6be06dd3f6f4e8ae9598c342d6e865f2b43442655666eab3e6611
+AUX wpa_cli.sh 1393 RMD160 a4d8a940431303b2e48f4e98cdf93c333a3b0ab3 SHA1 e55b02773565577e8f04acd1270bb2dbc3bef0e4 SHA256 145286ede3a3bf23054ebb82da092e4b101d61a55643d6bd8e3d35c8e16f7ee9
+AUX wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch 4706 RMD160 4937ee5e20a4a390bd7ec0c93f22d806284aa271 SHA1 fe1e33fb4b4ce81020cfef8b31a35c0a4078b336 SHA256 6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a
 AUX wpa_supplicant-0.7.3-dbus-api-changes.patch 2011 RMD160 fd32ef8d213ccbda661fb5ddadc2d58386d2e374 SHA1 3511ababf0e32b0db9e3f00ec4dcd09d97220131 SHA256 5ccb8169d0c10ba3003d3626f89a210aa26713f860ca07c8e4602a9b2ea821fe
 AUX wpa_supplicant-0.7.3-dbus_path_fix.patch 616 RMD160 5617e365bfcdb0b213e243bfa76eba2b9a976146 SHA1 d982ce9dcc6d1903030d697b279fc3d5e23c4dfe SHA256 340a4f04107be23063520e58cecae9f40e9cdc9375e6d644ba32076815fe6c90
 AUX wpa_supplicant-0.7.3-generate-libeap-peer.patch 11149 RMD160 7598acdba1e561fda981dca063ced10eb064048e SHA1 e1625b02c33caa3212255804f8e1335213a4ee39 SHA256 aaaf08dc2149c0ce8d6622c2cf6b893ba899baf3df0087725974c22f44543f56
@@ -14,17 +12,15 @@ AUX wpa_supplicant-init.d 1249 RMD160 b91b304a2913ce47f04c625e01e5cc504922cf0f S
 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a
 AUX wpa_supplicant.service 261 RMD160 7de0f70342a758fdb59fdf7a83cc8daaae63fb01 SHA1 a8ed3619377c4ce3b37e0fcbeea6c22c49b2b3ed SHA256 1beb5d6dd0b871ab5e3a198445627f37c6b5dcabf0bfce5b2ca8394d2042d7ea
 AUX wpa_supplicant_at.service 311 RMD160 3d379f0e6fcd24197c01290b9d75443dc2cb837d SHA1 d317686301933297a56c545068c7c7eb0a44753b SHA256 8eda723e1d4a3ac5b967acaba04d39237cf286233ca03fd660c6e6d9ea60c7fa
-DIST wpa_supplicant-0.7.2.tar.gz 1634596 RMD160 d9c804dd92ef827a4640a53ae963ea520e2fdb99 SHA1 188dd2f0a53982a84ee6fb87ffb3d7eca4bcf42b SHA256 df002a75376fc3f8bc0082771d1accadf60891515e08ac5b7ca044fa9985dcbe
 DIST wpa_supplicant-0.7.3.tar.gz 1638224 RMD160 e22f0440d64c943e4b0886eefa3418e75ea01b60 SHA1 ca51db8931fabf386352c87422f3e62fb44c3fe3 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443
-EBUILD wpa_supplicant-0.7.2-r3.ebuild 7452 RMD160 146b6a75921a123a2e03af560359a513fe316603 SHA1 6ce002f0b54305a1d86e12d9002581a979f7d778 SHA256 8bae50364de36069e48e71f6efd09be55301f35630e568a2aeae3fefb35dea20
 EBUILD wpa_supplicant-0.7.3-r2.ebuild 7820 RMD160 76c94f7b223a56af3150112c617786a9d45c848f SHA1 7e1449e58dc00f630183ceff217eb02ca86d5110 SHA256 7ea8c17af237876f7b6955ca87d3c20da9d84c45226313fd5e5ed5a1e3ffb1da
-EBUILD wpa_supplicant-0.7.3-r3.ebuild 8215 RMD160 fb8f433c1160f2248358ac1fb9445d62fb77a31c SHA1 d7462b15b8747fb5c42d3738f5ac8ca5a99764b2 SHA256 f716850661d2ff6035be0cc92a470ca8da241999aa1cc443105ef9bc9fe8e896
-MISC ChangeLog 33770 RMD160 8374389fca3522396456a5ae8deb03927d2533de SHA1 59d5af52d3a94db3d734e5ae14ad242f78c67b86 SHA256 037af1dbd10a3191afdb71953b5afa16d2b83290864b00b6b5e4fd2e3d4e60de
+EBUILD wpa_supplicant-0.7.3-r4.ebuild 8279 RMD160 91dae35741c1d44c0300922f3901de0c5a91bc5d SHA1 0d8e3977dda0ece6ffe406db560dc9a3656ac534 SHA256 afa9b8adbae07ac3533a83c83694a150702f3d6ffb44b047773aaf1ec1f6c38d
+MISC ChangeLog 34200 RMD160 24b4c0b04b4ca0afb7f7ef21a398fe950a176ae2 SHA1 bf976d9351eb9b7db32d89de834d78dc97ff6375 SHA256 5a46a877aee0e3ecebb097246bfccf5488d7a325e67660dc5f281595174c0312
 MISC metadata.xml 832 RMD160 14771aa4f3533875b5f3f900ee513dcda354873d SHA1 01f054ebe9f2bebdf8814558085c65ce9d8a15f6 SHA256 a8de983e560152d0491219686afa13bde6e5aa9fcade3b79e77f179c61bb164c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4OJ3gACgkQsR7PQhRXYEk+/gCdH7dOVcUzvr6MyjTJ+LH/eYw7
-ETUAn0PUb0Ilqbi48MRHruWL8mKv/NfO
-=aIi7
+iEYEARECAAYFAk4VZj0ACgkQsR7PQhRXYElhwQCeJu0hnnqMxkHonOXWgwa+QGGv
+MDkAnj4n4JOCvDv+i0s6DJb2lm+uRwik
+=10Xt
 -----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
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);
diff --git a/net-wireless/wpa_supplicant/files/wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_cli.sh
index d7d340b90bb6..4b1da4307ca5 100644
--- a/net-wireless/wpa_supplicant/files/wpa_cli.sh
+++ b/net-wireless/wpa_supplicant/files/wpa_cli.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Written by Roy Marples <uberlord@gentoo.org>
 # Distributed under the terms of the GNU General Public License v2
 # Alternatively, this file may be distributed under the terms of the BSD License
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v 1.1 2006/07/11 15:07:16 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v 1.2 2011/07/07 07:54:55 gurligebis Exp $
 
 if [ -z "$1" -o -z "$2" ]; then
 	logger -t wpa_cli "Insufficient parameters"
@@ -41,5 +41,6 @@ esac
 # stopping the interface and a background process - like wpa_cli - is.
 export IN_BACKGROUND=true
 
-logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"
-${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"
+# Removed, since stopping /etc/init.d/net.wlanX stops the network completly.
+#logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"
+#${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-dbus_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-dbus_path_fix.patch
deleted file mode 100644
index eb4a1c01a5e0..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-dbus_path_fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- dbus/fi.epitest.hostap.WPASupplicant.service	2009-04-15 23:16:19.000000000 +0000
-+++ dbus/fi.epitest.hostap.WPASupplicant.service	2009-04-15 23:16:29.000000000 +0000
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=fi.epitest.hostap.WPASupplicant
--Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -u
- User=root
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch
deleted file mode 100644
index 2d3ba1a28188..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.2-no-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ../src/rsn_supp/preauth.c	2010-01-16 12:04:38.000000000 -0500
-+++ ../src/rsn_supp/preauth.c	2010-02-01 10:08:48.862052876 -0500
-@@ -49,8 +49,10 @@ void pmksa_candidate_free(struct wpa_sm 
- 		return;
- 
- 	dl_list_for_each_safe(entry, n, &sm->pmksa_candidates,
--			      struct rsn_pmksa_candidate, list)
-+			      struct rsn_pmksa_candidate, list) {
-+		dl_list_del(&entry->list);
- 		os_free(entry);
-+	}
- }
- 
- 
-@@ -378,6 +380,7 @@ void pmksa_candidate_add(struct wpa_sm *
- 	}
- 
- 	if (cand) {
-+		dl_list_del(&cand->list);
- 		if (prio < PMKID_CANDIDATE_PRIO_SCAN)
- 			cand->priority = prio;
- 	} else {
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch
new file mode 100644
index 000000000000..3920da63f383
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch
@@ -0,0 +1,115 @@
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure	2011-04-09 14:04:43.108343777 -0400
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c	2011-04-09 14:44:09.808372285 -0400
+@@ -33,6 +33,14 @@
+ #include "dbus_new_handlers.h"
+ #include "dbus_dict_helpers.h"
+ 
++/* The getters in this file can also be invoked when building a signal
++ * message to send out spontaneously. In this case, no message is passed
++ * in and if we try to call dbus_message_new_error(), we'll get an
++ * assertion failure. So, #define dbus_message_new_error() to a more
++ * tolerant cut-and-paste version
++ */
++#define dbus_message_new_error wpa_dbus_message_new_error
++
+ extern int wpa_debug_level;
+ extern int wpa_debug_show_keys;
+ extern int wpa_debug_timestamp;
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure	2011-04-09 14:04:18.293117234 -0400
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c	2011-04-09 14:51:48.464204876 -0400
+@@ -22,6 +22,42 @@
+ #include "dbus_new.h"
+ #include "dbus_new_helpers.h"
+ 
++/* This is exactly like dbus_message_new_error, but returns a
++ * (partially filled in) error message in the case reply_to is
++ * NULL rather than failing with an assertion message. This is
++ * useful for getters that we recycle when sending out signals.
++ *
++ * Contains code cut-and-pasted from dbus_message_new_error()
++ * Copyright (C) 2002, 2003, 2004, 2005  Red Hat Inc.
++ * Copyright (C) 2002, 2003  CodeFactory AB
++ */
++DBusMessage*
++wpa_dbus_message_new_error (DBusMessage *reply_to,
++			    const char  *error_name,
++			    const char  *error_message)
++{
++	if (reply_to) {
++		return dbus_message_new_error(reply_to, error_name, error_message);
++	} else {
++		DBusMessage *message = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR);
++		DBusMessageIter iter;
++
++		dbus_message_set_error_name(message, error_name);
++		dbus_message_set_no_reply(message, TRUE);
++
++		if (error_message != NULL) {
++			dbus_message_iter_init_append(message, &iter);
++			if (!dbus_message_iter_append_basic(&iter,
++							    DBUS_TYPE_STRING,
++							    &error_message)) {
++				dbus_message_unref(message);
++				return NULL;
++			}
++		}
++
++		return message;
++	}
++}
+ 
+ /**
+  * recursive_iter_copy - Reads arguments from one iterator and
+@@ -86,6 +122,7 @@ static void recursive_iter_copy(DBusMess
+ 
+ 
+ static unsigned int fill_dict_with_properties(
++	DBusMessage *message,
+ 	DBusMessageIter *dict_iter, const struct wpa_dbus_property_desc *props,
+ 	const char *interface, const void *user_data)
+ {
+@@ -98,7 +135,7 @@ static unsigned int fill_dict_with_prope
+ 		if (!os_strncmp(dsc->dbus_interface, interface,
+ 				WPAS_DBUS_INTERFACE_MAX) &&
+ 		    dsc->access != W && dsc->getter) {
+-			reply = dsc->getter(NULL, user_data);
++			reply = dsc->getter(message, user_data);
+ 			if (!reply)
+ 				continue;
+ 
+@@ -160,7 +197,8 @@ static DBusMessage * get_all_properties(
+ 					 DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
+ 					 &dict_iter);
+ 
+-	props_num = fill_dict_with_properties(&dict_iter, obj_dsc->properties,
++	props_num = fill_dict_with_properties(message,
++					      &dict_iter, obj_dsc->properties,
+ 					      interface, obj_dsc->user_data);
+ 
+ 	dbus_message_iter_close_container(&iter, &dict_iter);
+@@ -870,6 +908,7 @@ void wpa_dbus_get_object_properties(stru
+ 		return;
+ 	}
+ 
+-	fill_dict_with_properties(dict_iter, obj_desc->properties,
++	fill_dict_with_properties(NULL,
++				  dict_iter, obj_desc->properties,
+ 				  interface, obj_desc->user_data);
+ }
+diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h
+--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure	2011-04-09 14:04:25.130180461 -0400
++++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h	2011-04-09 14:38:53.092075181 -0400
+@@ -112,6 +112,10 @@ struct wpa_dbus_property_desc {
+ #define WPA_DBUS_PROPERTIES_SET "Set"
+ #define WPA_DBUS_PROPERTIES_GETALL "GetAll"
+ 
++DBusMessage* wpa_dbus_message_new_error (DBusMessage *reply_to,
++					 const char  *error_name,
++					 const char  *error_message);
++
+ void free_dbus_object_desc(struct wpa_dbus_object_desc *obj_dsc);
+ 
+ int wpa_dbus_ctrl_iface_init(struct wpas_dbus_priv *iface, char *dbus_path,
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild
deleted file mode 100644
index f8a2b2d3ca99..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r3.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# 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-r3.ebuild,v 1.6 2010/09/26 11:52:03 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs qt4-r2
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-	kernel_linux? (
-		eap-sim? ( sys-apps/pcsc-lite )
-		madwifi? ( ||
-			( >net-wireless/madwifi-ng-tools-0.9.3
-			net-wireless/madwifi-old )
-		)
-		dev-libs/libnl
-	)
-	!kernel_linux? ( net-libs/libpcap )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-svg:4 )
-	readline? ( sys-libs/ncurses sys-libs/readline )
-	ssl? ( dev-libs/openssl )
-	!ssl? ( gnutls? ( net-libs/gnutls ) )
-	!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${P}/${PN}"
-
-pkg_setup() {
-	if use fasteap && (use gnutls || use ssl) ; then
-		die "If you use fasteap, you must build with wpa_supplicant's internal TLS implementation.  That is, both 'gnutls' and 'ssl' USE flags must be disabled"
-	fi
-
-	if use gnutls && use ssl ; then
-		einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
-	fi
-}
-
-src_prepare() {
-	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-	sed -i \
-		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
-		../src/l2_packet/l2_packet_freebsd.c || die
-
-	# People seem to take the example configuration file too literally (bug #102361)
-	sed -i \
-		-e "s:^\(opensc_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_engine_path\):#\1:" \
-		-e "s:^\(pkcs11_module_path\):#\1:" \
-		wpa_supplicant.conf || die
-
-	# Change configuration to match Gentoo locations (bug #143750)
-	sed -i \
-		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
-		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
-		wpa_supplicant.conf || die
-
-	epatch "${FILESDIR}/${P}-dbus_path_fix.patch"
-
-	# bug (320097)
-	epatch "${FILESDIR}/do-not-call-dbus-functions-with-NULL-path.patch"
-
-	# bug (321627)
-	epatch "${FILESDIR}/fix-ssid-combo.patch"
-
-	# bug (330085)
-	epatch "${FILESDIR}/${P}-no-crash.patch"
-}
-
-src_configure() {
-	# Toolchain setup
-	echo "CC = $(tc-getCC)" > .config
-
-	# Basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> .config
-	echo "CONFIG_BACKEND=file" >> .config
-
-	# Basic authentication methods
-	# NOTE: we don't set GPSK or SAKE as they conflict
-	# with the below options
-	echo "CONFIG_EAP_GTC=y"         >> .config
-	echo "CONFIG_EAP_MD5=y"         >> .config
-	echo "CONFIG_EAP_OTP=y"         >> .config
-	echo "CONFIG_EAP_PAX=y"         >> .config
-	echo "CONFIG_EAP_PSK=y"         >> .config
-	echo "CONFIG_EAP_TLV=y"         >> .config
-	echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
-	echo "CONFIG_PKCS12=y"          >> .config
-	echo "CONFIG_PEERKEY=y"         >> .config
-	echo "CONFIG_EAP_LEAP=y"        >> .config
-	echo "CONFIG_EAP_MSCHAPV2=y"    >> .config
-	echo "CONFIG_EAP_PEAP=y"        >> .config
-	echo "CONFIG_EAP_TLS=y"         >> .config
-	echo "CONFIG_EAP_TTLS=y"        >> .config
-
-	if use dbus ; then
-		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
-	fi
-
-	if use debug ; then
-		echo "CONFIG_DEBUG_FILE=y" >> .config
-	fi
-
-	if use eap-sim ; then
-		# Smart card authentication
-		echo "CONFIG_EAP_SIM=y"       >> .config
-		echo "CONFIG_EAP_AKA=y"       >> .config
-		echo "CONFIG_EAP_AKA_PRIME=y" >> .config
-		echo "CONFIG_PCSC=y"          >> .config
-	fi
-
-	if use fasteap ; then
-		echo "CONFIG_EAP_FAST=y" >> .config
-	fi
-
-	if use readline ; then
-		# readline/history support for wpa_cli
-		echo "CONFIG_READLINE=y" >> .config
-	fi
-
-	# SSL authentication methods
-	if use ssl ; then
-		echo "CONFIG_TLS=openssl"    >> .config
-		echo "CONFIG_SMARTCARD=y"    >> .config
-	elif use gnutls ; then
-		echo "CONFIG_TLS=gnutls"     >> .config
-		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
-	else
-		echo "CONFIG_TLS=internal"   >> .config
-	fi
-
-	if use kernel_linux ; then
-		# Linux specific drivers
-		echo "CONFIG_DRIVER_ATMEL=y"       >> .config
-		#echo "CONFIG_DRIVER_BROADCOM=y"   >> .config
-		#echo "CONFIG_DRIVER_HERMES=y"	   >> .config
-		echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
-		echo "CONFIG_DRIVER_IPW=y"         >> .config
-		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
-		echo "CONFIG_DRIVER_NL80211=y"     >> .config
-		#echo "CONFIG_DRIVER_PRISM54=y"    >> .config
-		echo "CONFIG_DRIVER_RALINK=y"      >> .config
-		echo "CONFIG_DRIVER_WEXT=y"        >> .config
-		echo "CONFIG_DRIVER_WIRED=y"       >> .config
-
-		if use madwifi ; then
-			# Add include path for madwifi-driver headers
-			echo "CFLAGS += -I/usr/include/madwifi" >> .config
-			echo "CONFIG_DRIVER_MADWIFI=y"          >> .config
-		fi
-
-		if use ps3 ; then
-			echo "CONFIG_DRIVER_PS3=y" >> .config
-		fi
-
-	elif use kernel_FreeBSD ; then
-		# FreeBSD specific driver
-		echo "CONFIG_DRIVER_BSD=y" >> .config
-	fi
-
-	# Wi-Fi Protected Setup (WPS)
-	if use wps ; then
-		echo "CONFIG_WPS=y" >> .config
-	fi
-
-	# Enable mitigation against certain attacks against TKIP
-	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
-
-	if use qt4 ; then
-		cd "${S}"/wpa_gui-qt4
-		eqmake4 wpa_gui.pro
-	fi
-}
-
-src_compile() {
-	einfo "Building wpa_supplicant"
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		cd "${S}"/wpa_gui-qt4
-		einfo "Building wpa_gui"
-		emake || die "wpa_gui compilation failed"
-	fi
-}
-
-src_install() {
-	dosbin wpa_supplicant || die
-	dobin wpa_cli wpa_passphrase || die
-
-	# baselayout-1 compat
-	if has_version "<sys-apps/baselayout-2.0.0"; then
-		dodir /sbin
-		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die
-		dodir /bin
-		dosym /usr/bin/wpa_cli /bin/wpa_cli || die
-	fi
-
-	if has_version ">=sys-apps/openrc-0.5.0"; then
-		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
-		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
-	fi
-
-	exeinto /etc/wpa_supplicant/
-	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
-
-	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
-		wpa_supplicant.conf || die "dodoc failed"
-
-	doman doc/docbook/*.{5,8} || die "doman failed"
-
-	if use qt4 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui || die
-		doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found"
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
-	fi
-
-	if use dbus ; then
-		cd "${S}"/dbus
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die
-		insinto /usr/share/dbus-1/system-services
-		doins fi.epitest.hostap.WPASupplicant.service || die
-		keepdir /var/run/wpa_supplicant
-	fi
-}
-
-pkg_postinst() {
-	einfo "If this is a clean installation of wpa_supplicant, you"
-	einfo "have to create a configuration file named"
-	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
-	einfo
-	einfo "An example configuration file is available for reference in"
-	einfo "/usr/share/doc/${PF}/"
-
-	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
-		echo
-		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
-		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
-	fi
-
-	if use madwifi ; then
-		echo
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should re-emerge ${PN} after upgrading these packages."
-	fi
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild
index f577ebc1e013..49ae8d88a996 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.3-r3.ebuild,v 1.4 2011/07/01 20:01:04 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild,v 1.1 2011/07/07 07:54:54 gurligebis Exp $
 
 EAPI="2"
 
@@ -80,6 +80,8 @@ src_prepare() {
 	epatch "${FILESDIR}/do-not-call-dbus-functions-with-NULL-path.patch"
 	# https://bugzilla.gnome.org/show_bug.cgi?id=644634
 	epatch "${FILESDIR}/${P}-dbus-api-changes.patch"
+	# bug (374089)
+	epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
 }
 
 src_configure() {