Revision bump, add patch that fixes issues with NetworkManager (bug #320097), remove broken version.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 66 insertions, 2 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 05aca10a3fee..432edadeacd8 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,14 @@
 # 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.135 2010/05/18 08:54:58 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.136 2010/05/19 18:29:10 chutzpah Exp $
+
+*wpa_supplicant-0.7.2-r1 (19 May 2010)
+
+  19 May 2010; Patrick McLean <chutzpah@gentoo.org>
+  -wpa_supplicant-0.7.2.ebuild, +wpa_supplicant-0.7.2-r1.ebuild,
+  +files/do-not-call-dbus-functions-with-NULL-path.patch:
+  Revision bump, add patch that fixes issues with NetworkManager (bug
+  #320097), remove broken version.
 
   18 May 2010; <chainsaw@gentoo.org> +wpa_supplicant-0.7.1.ebuild,
   +files/wpa_supplicant-0.7.1-dbus_path_fix.patch:
diff --git a/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch
new file mode 100644
index 000000000000..d868f84384e0
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch
@@ -0,0 +1,53 @@
+diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
+index 06749db..1cbdee9 100644
+--- a/wpa_supplicant/dbus/dbus_new_helpers.c
++++ b/wpa_supplicant/dbus/dbus_new_helpers.c
+@@ -810,7 +810,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface,
+ 	const struct wpa_dbus_property_desc *dsc;
+ 	int i = 0;
+ 
+-	if (iface == NULL)
++	if (iface == NULL || path == NULL)
+ 		return;
+ 
+ 	dbus_connection_get_object_path_data(iface->con, path,
+diff --git a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c
+index 437a04d..9e6c762 100644
+--- a/wpa_supplicant/dbus/dbus_old.c
++++ b/wpa_supplicant/dbus/dbus_old.c
+@@ -377,7 +377,7 @@ void wpa_supplicant_dbus_notify_scan_results(struct wpa_supplicant *wpa_s)
+ 	DBusMessage *_signal;
+ 
+ 	/* Do nothing if the control interface is not turned on */
+-	if (iface == NULL)
++	if (iface == NULL || wpa_s->dbus_path == NULL)
+ 		return;
+ 
+ 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
+@@ -414,7 +414,7 @@ void wpa_supplicant_dbus_notify_state_change(struct wpa_supplicant *wpa_s,
+ 	if (wpa_s->global == NULL)
+ 		return;
+ 	iface = wpa_s->global->dbus;
+-	if (iface == NULL)
++	if (iface == NULL || wpa_s->dbus_path == NULL)
+ 		return;
+ 
+ 	/* Only send signal if state really changed */
+@@ -473,7 +473,7 @@ void wpa_supplicant_dbus_notify_scanning(struct wpa_supplicant *wpa_s)
+ 	dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;
+ 
+ 	/* Do nothing if the control interface is not turned on */
+-	if (iface == NULL)
++	if (iface == NULL || wpa_s->dbus_path == NULL)
+ 		return;
+ 
+ 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
+@@ -508,7 +508,7 @@ void wpa_supplicant_dbus_notify_wps_cred(struct wpa_supplicant *wpa_s,
+ 	if (wpa_s->global == NULL)
+ 		return;
+ 	iface = wpa_s->global->dbus;
+-	if (iface == NULL)
++	if (iface == NULL || wpa_s->dbus_path == NULL)
+ 		return;
+ 
+ 	_signal = dbus_message_new_signal(wpa_s->dbus_path,
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r1.ebuild
index bcb267a4d7c0..a799d68e0ef4 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r1.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.ebuild,v 1.1 2010/05/16 19:52:41 gurligebis Exp $
+# $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 $
 
 EAPI="2"
 
@@ -66,6 +66,9 @@ src_prepare() {
 		wpa_supplicant.conf || die
 
 	epatch "${FILESDIR}"/${P}-dbus_path_fix.patch
+
+	# bug (320097)
+	epatch "${FILESDIR}"/do-not-call-dbus-functions-with-NULL-path.patch
 }
 
 src_configure() {