Adding support for FAST-EAP, fixing bug #300215.

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

6 files changed, 58 insertions, 22 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index a8430351724e..6d0329977900 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.126 2009/12/14 12:50:27 gurligebis Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.127 2010/01/14 15:07:09 gurligebis Exp $
+
+  14 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  wpa_supplicant-0.6.9.ebuild, wpa_supplicant-0.7.0.ebuild,
+  wpa_supplicant-9999.ebuild, metadata.xml:
+  Adding support for FAST-EAP, fixing bug #300215
+
+  14 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  wpa_supplicant-9999.ebuild,
+  +files/wpa_supplicant-9999-dbus_path_fix.patch:
+  Fixing bugs #300633 and #300305
 
 *wpa_supplicant-0.7.0 (14 Dec 2009)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 83d80fb50e9e..abd197b3da08 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -6,6 +6,7 @@ AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f7
 AUX wpa_supplicant-0.5.10-gcc-4.3.patch 1362 RMD160 2d3e8ee4cdda932e83127203db261e8fdcb5754d SHA1 f676db4ff6938b043e654e876c8976223b181b7d SHA256 e71a75a2a16741598d7f4588537e147271e960c1d0f9991ce9e0734850ef9944
 AUX wpa_supplicant-0.5.7-gnutls.patch 375 RMD160 b8868a503a71d2cc4ebd4826430654c3a6645ec0 SHA1 fdfa5fefc507fa133f7d41a7ca75c33b14d876f7 SHA256 7d4a2a6f70fd18757e139ca1d1dc2734fe854ea1879d62d378febce49feef3aa
 AUX wpa_supplicant-0.6.3-ps3_support.patch 10930 RMD160 e572a6c024e8f8b845fd404c775813e4f65b4de5 SHA1 88f804078bb25ebc0630b2dd5a5133126d24f7ba SHA256 b4b2082a4cd25c0fd23a783d2d8d55985a1acc44e30a9c6757e6252c4405711a
+AUX wpa_supplicant-9999-dbus_path_fix.patch 836 RMD160 f8928718fff167aed2b799c87111b805b24034f2 SHA1 740a2035ed876ba410c3ba20a3af8a02bd268f8e SHA256 dbcb1a9a84b5439e1a008f5c8ce7fd4e373be63d199abefd0bcc0e86a44b08ad
 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
@@ -13,15 +14,15 @@ DIST wpa_supplicant-0.6.4.tar.gz 995486 RMD160 338b901726779a47cb3c3cb43b11d3d38
 DIST wpa_supplicant-0.6.9.tar.gz 1178238 RMD160 e8427935b17c354c2654250501236dcd3f239307 SHA1 3764f7bda4e5c87caac2b9e134cb59996f073f09 SHA256 6e5284fa3f7c56e001fae92486eaa31340db5dd925dcb38bd572d2e8ed70f570
 DIST wpa_supplicant-0.7.0.tar.gz 1666796 RMD160 fce5f77f7d85947ba22c50ea0a661ceb1b10f379 SHA1 647655f0fc194499e97976a016de67a5d4f29543 SHA256 9d34f678881b21eb685b730bfed2dc56f4c9eb50bf79245c246f0b8266b75e21
 EBUILD wpa_supplicant-0.6.4.ebuild 6465 RMD160 24e22e1c3f51df2c9edca1f4186d6c93704ccf84 SHA1 d190555fd05a1fbf591a54d9b3e50c8c551beee0 SHA256 56e3782f15e48c4315be606329383bec49d56084a3fe18dc175972fdd9eb9c88
-EBUILD wpa_supplicant-0.6.9.ebuild 7211 RMD160 23e79b285214864ac67a52887d035fc6c5ce5449 SHA1 5abae798141667e8197d6eedbda6c88afdbe5109 SHA256 52e61e1616a47c3799700db4229f65222bac7cd6b7114e425e5ff55a292594c9
-EBUILD wpa_supplicant-0.7.0.ebuild 7215 RMD160 a738fd429958ad798d246689202733a0c5f2c978 SHA1 414910ab9cc9101656ac1af054cbabcd538a4415 SHA256 848d8c9cb42936f6c2f04001cf099a7630a049a03682ce59f0f40aee981613cb
-EBUILD wpa_supplicant-9999.ebuild 7581 RMD160 b988d4b5427c8b5b3c8716d76f07a857685b6aa5 SHA1 908209ae2fe0bf625d84c32f0575063e2eca02b2 SHA256 e35822c796849541ed403f4ca6b9487f3d2bcb28347087c3db975222e3d707d7
-MISC ChangeLog 27090 RMD160 1bd5c208fc1d2773fc8ba77213e73e25329723fe SHA1 c1e3197be47df06a4a5e96656f9ccfb2c0180ea0 SHA256 949324ccace9e68dd4e47c37a89e12cb05ed52adb473cacc3afff4c407a9a75c
-MISC metadata.xml 571 RMD160 71dd26fb78e0841fdf8094e70f69ed8f3467767f SHA1 d506d908102c64873349b144915070b19bdd5fda SHA256 d51b505588babd99225c67330dcb85a438c3739e8aa56c2b65c14a91a46aa4fa
+EBUILD wpa_supplicant-0.6.9.ebuild 7495 RMD160 1b8dc5990a9b5c59eb1389c6955c009f0f9b27d1 SHA1 230f6db17a68906857253716032324a9c28a9155 SHA256 38ef6700a3533c05ace4a5671810a5d5cf2ed3092537a4e1d73c99cb1d8ca3a0
+EBUILD wpa_supplicant-0.7.0.ebuild 7499 RMD160 91b0cd9e0933c1f0e18e5a871e895bd5f737694c SHA1 429711e4a01adc3dda22b69688763155c1abc69b SHA256 06066af11c539975e3d5ecdb88742e32f62af47bf634d9c5bb05d0dec98232de
+EBUILD wpa_supplicant-9999.ebuild 7878 RMD160 ec136e51cfa64dc5d68a671ac9c2400a688cc1d8 SHA1 cabfd7e45a19d033a9f5635db911b9896ab8be1f SHA256 cab8903bdeff0f0f918d98eacdfb4fd78492a97b641e8fcff001a68488da67f2
+MISC ChangeLog 27484 RMD160 1fa937867a1e7a1bf374350d7393142536f72562 SHA1 5e1e09b09b5b7708e846fd744e3fba87c1227ff2 SHA256 6a3c4a5e2f519c23841bde9ad6e38a37b5ac1fbd3aa4df0b683d12db7c00bb9a
+MISC metadata.xml 651 RMD160 c1b0aca5e38265dbd80247ec686a0b7c3f8fb171 SHA1 6c5d98fa137ddb0f8a5866af68032cf769cc315c SHA256 88eec5cdc25fc735e42d5b581463e576a0f4a5df8e7694e1c8b9c24ea8358b93
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEUEARECAAYFAksmNKAACgkQsR7PQhRXYEkr/ACffTORPBzLCXucQ/PAL2fD5tc1
-S8QAl0lrsf+q7tt9qDupeBs3jfq4wIc=
-=itJ8
+iEYEARECAAYFAktPMywACgkQsR7PQhRXYEkq5ACaArB6dRAUzxdmU0+tEztWrO7q
+rf8AnR8N5AMZXi5p12lZNMdwzQS/G6Zt
+=mqjc
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index 8a9e4de0af3f..efaff3713119 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -8,6 +8,7 @@
 	<herd>mobile</herd>
 	<use>
 		<flag name='eap-sim'>Add support for EAP-SIM authentication algorithm</flag>
+		<flag name='fasteap'>Add support for FAST-EAP authentication algorithm</flag>
 		<flag name='madwifi'>Add support for madwifi (Atheros chipset)</flag>
 		<flag name='ps3'>Add support for ps3 hypervisor driven gelic wifi</flag>
 		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
index 79b2403f454b..8aa889c99359 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.9.ebuild,v 1.8 2009/11/21 12:03:21 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild,v 1.9 2010/01/14 15:07:09 gurligebis Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
+IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
 
 DEPEND="dev-libs/libnl
 	dbus? ( sys-apps/dbus )
@@ -37,6 +37,10 @@ RDEPEND="${DEPEND}"
 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
@@ -110,6 +114,10 @@ src_configure() {
 		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
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild
index e9f844bf7499..80efa9aa077e 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2009/12/14 12:50:27 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild,v 1.2 2010/01/14 15:07:09 gurligebis Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
+IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
 
 DEPEND="dev-libs/libnl
 	dbus? ( sys-apps/dbus )
@@ -37,6 +37,10 @@ RDEPEND="${DEPEND}"
 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
@@ -110,6 +114,10 @@ src_configure() {
 		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
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index 9bcba97f3d62..0e9deb9418a0 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-9999.ebuild,v 1.2 2009/05/22 08:11:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild,v 1.3 2010/01/14 15:07:09 gurligebis Exp $
 
 EAPI="2"
 
 inherit eutils toolchain-funcs qt3 qt4
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://w1.fi/hostap.git"
+	EGIT_REPO_URI="git://w1.fi/srv/git/hostap.git"
 	inherit git
 	SRC_URI=""
 	S="${WORKDIR}/${P}/${PN}/${PN}"
@@ -23,7 +23,7 @@ LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
 KEYWORDS="-*"
-IUSE="dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
+IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
 
 DEPEND="dev-libs/libnl
 	dbus? ( sys-apps/dbus )
@@ -58,6 +58,10 @@ src_unpack() {
 }
 
 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
@@ -88,7 +92,7 @@ src_prepare() {
 		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
 		wpa_supplicant.conf || die
 
-	epatch "${FILESDIR}"/dbus_path_fix.patch
+	epatch "${FILESDIR}"/${P}-dbus_path_fix.patch
 }
 
 src_configure() {
@@ -134,6 +138,10 @@ src_configure() {
 		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