[net-wireless/wpa_supplicant] Fix for nm09 and systemd bug #371875

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

7 files changed, 133 insertions, 270 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 6bbd640e72b2..07d94c6d42e1 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.155 2011/03/25 10:37:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.156 2011/06/19 15:38:14 alexxy Exp $
+
+*wpa_supplicant-0.7.3-r3 (19 Jun 2011)
+
+  19 Jun 2011; Alexey Shvetsov <alexxy@gentoo.org>
+  -wpa_supplicant-0.6.10.ebuild, -wpa_supplicant-0.7.3.ebuild,
+  +wpa_supplicant-0.7.3-r3.ebuild,
+  +files/wpa_supplicant-0.7.3-dbus-api-changes.patch,
+  +files/wpa_supplicant.service, -files/dbus_path_fix.patch:
+  Fix for nm09 and systemd bug #371875
+
 
   25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
   wpa_supplicant-0.7.3-r2.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index cb6370bc6b71..71c81de5b0ca 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,32 +1,39 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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.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_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
 AUX wpa_supplicant-conf.d 161 RMD160 8188ddf3448d31c6288d4201cc9d10d0c4ac3ee3 SHA1 c0ca31e2ddb9b2b5cbafc3eba66316e83688b808 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90
 AUX wpa_supplicant-init.d 1249 RMD160 b91b304a2913ce47f04c625e01e5cc504922cf0f SHA1 0e158f5954e4046af3bc157a1c85aab4bbcc71cb SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0
 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a
-DIST wpa_supplicant-0.6.10.tar.gz 1190391 RMD160 3c2b5269fd261ba695a276204088588a7992c002 SHA1 d2c93758607de250a8dda7adc8f8b304d0a074ce SHA256 ac27c69c26e3f4e06fba13e0dc8e1c7ed7b0012a95263bcfcf0f39be8059f2fd
+AUX wpa_supplicant.service 261 RMD160 7de0f70342a758fdb59fdf7a83cc8daaae63fb01 SHA1 a8ed3619377c4ce3b37e0fcbeea6c22c49b2b3ed SHA256 1beb5d6dd0b871ab5e3a198445627f37c6b5dcabf0bfce5b2ca8394d2042d7ea
 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.6.10.ebuild 7174 RMD160 00bcc016cd92490a79a37d86d639368b70190b74 SHA1 3be13113ff07ce8489e5916cb22addfe723c42bf SHA256 535b47551b6044ace8cad9b9b91da37f453a2c130a6a1e846ed3f18747a2fb5e
 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.ebuild 7338 RMD160 b08afd181c20f05b73d161a8fdf7143dc8fd1422 SHA1 8fc93a2f91ec3b83b5a36bbbe7ddfed7c7627668 SHA256 da38172c49068cd9c871886fe6c4281e06c7d9ad3d51f8fd28d6f5feb6338321
-MISC ChangeLog 33043 RMD160 4d33a70ffba4162b3c515dae46af0c892a36311a SHA1 bac030436a5d542b4be7b1ca56550e2863556729 SHA256 ba821d8271633527fb0f379d1813fdd045e1da9705ad50a007a365417c24686f
+EBUILD wpa_supplicant-0.7.3-r3.ebuild 7997 RMD160 681a5dc33c5926429b7a0c7a823c8ee9eeb51302 SHA1 e832f0d03ccd7cb0474cea9b86ae8c6b67c19cc2 SHA256 50ef0fc578c5cc15c97293377f95f94d66e0d60c926033efc9d97e10571ff600
+MISC ChangeLog 33384 RMD160 fef078f35f2904277da17397dd5e479aae196d4d SHA1 8212300d1a8e2f9c7e1a908aac86b892fb263b68 SHA256 a7f3015a4d20ce193d52385dec74238bae5207986894af64a2b7cf975114609e
 MISC metadata.xml 832 RMD160 14771aa4f3533875b5f3f900ee513dcda354873d SHA1 01f054ebe9f2bebdf8814558085c65ce9d8a15f6 SHA256 a8de983e560152d0491219686afa13bde6e5aa9fcade3b79e77f179c61bb164c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2McFYACgkQIiMqcbOVdxRIDgP+PhjBjbFyZ73PcwY6fL4E2o9m
-qhbv0LkHYiATV8KmB5EY3qbZhcKV32tb7yaMYwX8vGouT1UZe5q7XoAqQxGcz2pW
-QhzT8tkv2phOchvHrfJHv4TLmDyG3GHu1lIfIIYBxcDvsxniT7Cjz5/VBnaFM8Pv
-mPpRvTAAIav7Tl4IuPs=
-=SIAd
+iQIcBAEBCAAGBQJN/hfkAAoJEOf+E+/4L5LmfWQP/0pKKhJDykRw4ODB0OxEWuLg
+Kjh5QQJ9bZe/dtaaAwi8/W/rU6ECV9tnUFSbeP/VpGbW8cogXkXc3tfuzNyoTeKr
+hZRmec1VuBtkm+MgHzGiZLwQz3ObzVbfZ43EN56dboNveMQ/d1/h0+U5tGqOgktf
+8GxoqHqcTcp6Hq6rImdhFnrNm/PiaOn3o5W1gv+HH3e0Xg/BfHsQRDbcsz9JuTkJ
+uv+EKRz8da07Qv467iaSTmSMEPzeditMCvssuco8Roye1qwTLp1Gl1gkeAMJklWQ
+Tbducnm9n5CdYPsOu17nj0Mk7MW7b2RD3YwUUuI0kS/0aaa0GvG8Ze+9folE7Yu6
+nxHQ622nl4ARGfQxDMX0CTeK1HqFpfsO0JpkT/sn4882hRtRduycZUQLD+nNZRWJ
+mBfgdNMVhlkbuaRxsI+OV02/RwVWTn4GyPVnwazgeo4qnOJSpiuI6J17M5dDCc74
+kC99v8XyOdRVnSnOSwiqSwwCrYX4Bk4R/4nxef1s8ub78eXTjmhNp9yfZsKk+NfG
+wof+uV6UI7bTJHRvHSzkKpX84JvLHF7zxTXFyzlRDrlefWq+L91ugkHImFpoWJ4e
+BL937hlT/XOV3/hcjBcfcvDZN85dgcEQpRNr+0CIOJFZ7OYpa91cELCXYZ5MVC0v
+bhRG4RYNBV4FqS5JZ39w
+=E7YQ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/files/dbus_path_fix.patch b/net-wireless/wpa_supplicant/files/dbus_path_fix.patch
deleted file mode 100644
index e6348894cccd..000000000000
--- a/net-wireless/wpa_supplicant/files/dbus_path_fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- dbus-wpa_supplicant.service.old	2009-04-15 23:16:19.000000000 +0000
-+++ dbus-wpa_supplicant.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.3-dbus-api-changes.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-api-changes.patch
new file mode 100644
index 000000000000..2ec1a97e9fbc
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-api-changes.patch
@@ -0,0 +1,66 @@
+Taken from:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=644634
+
+
+From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Fri, 17 Dec 2010 15:56:01 +0200
+Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
+
+The supplicant was not emitting property changed events when the BSSs
+property changed.
+
+Signed-off-by: Dan Williams <dcbw@redhat.com>
+(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
+---
+ wpa_supplicant/dbus/dbus_new.c |    6 ++++++
+ wpa_supplicant/dbus/dbus_new.h |    1 +
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
+index bdfbbac..c66640a 100644
+--- a/wpa_supplicant/dbus/dbus_new.c
++++ b/wpa_supplicant/dbus/dbus_new.c
+@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
+ 			wpas_dbus_getter_current_network;
+ 		prop = "CurrentNetwork";
+ 		break;
++	case WPAS_DBUS_PROP_BSSS:
++		getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
++		prop = "BSSs";
++		break;
+ 	default:
+ 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
+ 			   __func__, property);
+@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ }
+@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
+ 	}
+ 
+ 	wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
++	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+ 
+ 	return 0;
+ 
+diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
+index 80ea98c..9cdefcb 100644
+--- a/wpa_supplicant/dbus/dbus_new.h
++++ b/wpa_supplicant/dbus/dbus_new.h
+@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
+ 	WPAS_DBUS_PROP_STATE,
+ 	WPAS_DBUS_PROP_CURRENT_BSS,
+ 	WPAS_DBUS_PROP_CURRENT_NETWORK,
++	WPAS_DBUS_PROP_BSSS,
+ };
+ 
+ enum wpas_dbus_bss_prop {
+-- 
+1.7.4-rc1
+
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant.service b/net-wireless/wpa_supplicant/files/wpa_supplicant.service
new file mode 100644
index 000000000000..4cdf16a4632e
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=WPA supplicant
+
+[Service]
+Type=dbus
+BusName=fi.epitest.hostap.WPASupplicant
+ExecStart=/usr/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant.conf -u
+
+[Install]
+WantedBy=network.target
+Alias=dbus-fi.epitest.hostap.WPASupplicant.service
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10.ebuild
deleted file mode 100644
index 9ed3ee4710fe..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10.ebuild
+++ /dev/null
@@ -1,245 +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.6.10.ebuild,v 1.8 2010/09/08 17:34:33 gurligebis Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs qt4
-
-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}/dbus_path_fix.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
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use qt4 ; then
-		cd "${S}"/wpa_gui-qt4
-		eqmake4 wpa_gui.pro
-		emake || die "Qt4 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
-	fi
-
-	if use qt4 ; then
-		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
-		insinto /etc/dbus-1/system.d
-		newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die
-		insinto /usr/share/dbus-1/system-services
-		newins dbus-wpa_supplicant.service '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.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r3.ebuild
index 223a2a169901..036e6b203fd5 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.ebuild,v 1.1 2010/09/08 17:34:33 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r3.ebuild,v 1.1 2011/06/19 15:38:14 alexxy Exp $
 
 EAPI="2"
 
-inherit eutils toolchain-funcs qt4-r2
+inherit eutils toolchain-funcs qt4-r2 systemd
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
@@ -13,7 +13,7 @@ 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"
+IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline ssl wimax wps kernel_linux kernel_FreeBSD"
 
 RDEPEND="dbus? ( sys-apps/dbus )
 	kernel_linux? (
@@ -28,6 +28,7 @@ RDEPEND="dbus? ( sys-apps/dbus )
 	qt4? ( x11-libs/qt-gui:4
 		x11-libs/qt-svg:4 )
 	readline? ( sys-libs/ncurses sys-libs/readline )
+	wimax? ( !net-wireless/libeap )
 	ssl? ( dev-libs/openssl )
 	!ssl? ( gnutls? ( net-libs/gnutls ) )
 	!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
@@ -67,8 +68,15 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-dbus_path_fix.patch"
 
+	if use wimax; then
+		cd "${WORKDIR}/${P}"
+		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
+	fi
+
 	# bug (320097)
 	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"
 }
 
 src_configure() {
@@ -99,6 +107,8 @@ src_configure() {
 
 	if use dbus ; then
 		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
+		echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config
+		echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config
 	fi
 
 	if use debug ; then
@@ -180,6 +190,11 @@ src_compile() {
 	einfo "Building wpa_supplicant"
 	emake || die "emake failed"
 
+	if use wimax; then
+		emake -C ../src/eap_peer clean || die "emake failed"
+		emake -C ../src/eap_peer || die "emake failed"
+	fi
+
 	if use qt4 ; then
 		cd "${S}"/wpa_gui-qt4
 		einfo "Building wpa_gui"
@@ -219,14 +234,21 @@ src_install() {
 		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
 	fi
 
+	if use wimax; then
+		emake DESTDIR="${D}" -C ../src/eap_peer install || die
+	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
+		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service || die
 		keepdir /var/run/wpa_supplicant
 	fi
+
+	# SystemD stuff
+	doservice "${FILESDIR}"/wpa_supplicant.service
 }
 
 pkg_postinst() {