Bumping to 2.1, fixing bug #500756

Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x15AE484C

7 files changed, 472 insertions, 13 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 516b9da1d24e..3709c8799c69 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/wpa_supplicant
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.207 2013/12/22 14:40:18 gurligebis Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.208 2014/02/12 10:44:24 gurligebis Exp $
+
+*wpa_supplicant-2.1 (12 Feb 2014)
+
+  12 Feb 2014; <gurligebis@gentoo.org> -wpa_supplicant-2.0-r3.ebuild,
+  +wpa_supplicant-2.1.ebuild, +files/wpa_supplicant-2.1-dbus-path-fix.patch,
+  +files/wpa_supplicant-2.1-do-not-call-dbus-functions-with-NULL-path.patch,
+  +files/wpa_supplicant-2.1-fix-undefined-reference-to-random_get_bytes.patch,
+  +files/wpa_supplicant-2.1-generate-libeap-peer.patch:
+  Bumping to 2.1, fixing bug #500756
 
   22 Dec 2013; <gurligebis@gentoo.org> -wpa_supplicant-0.7.3-r5.ebuild,
   -files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch,
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 19b5a65d0705..9763d0e56b8c 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -6,20 +6,25 @@ AUX wpa_supplicant-2.0-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726
 AUX wpa_supplicant-2.0-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654
 AUX wpa_supplicant-2.0-fix-undefined-reference-to-random_get_bytes.patch 633 SHA256 29b9a9ba8d4b53313593c3f56ad13e776ee76fbd04bc33b35e1d6f61e571b496 SHA512 e6e27a982c064bff7c833d33051205ddbaf931f7116724880c9c6e676139ccc69b0302229817d6c618cb3669ec68989b347a1cb40660c4ab124df9841bc7c020 WHIRLPOOL 38950a4044cfb9b9f56852e465297fed94bb9fa76907d4247346a24a7f40457b0c34dd12338d6cff9677da6b6b9d315989f4911242d472d0dbb4f8fcb8a930c9
 AUX wpa_supplicant-2.0-generate-libeap-peer.patch 9778 SHA256 771e2392754c094a8b4bacbcbff77429946e7c4acfdef37be7deab5d6ad2994e SHA512 7ceb37e7d23864351dc4960d6e867f02bd6004b29b2b4d2ca6d9bda2a71946c2dc83d2197828c56d46420ad7c3d3309b684335009b7f9129915cd113b73e6adf WHIRLPOOL 68ee035c05a4bb79479dfd62057695862073c41f4bd9265719e01cbf29328fcea6970ffeb0903e4aec83428bfa2e62a280748bfeab668e490c6763788b903dfa
+AUX wpa_supplicant-2.1-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726ce5b505e87ceab4c42cee4241eba08d04391579 SHA512 7521764830b0ac27046c9030c632fe4f36937452b8352a257eaba28ff7a628b2d5d0b4187a23cdffe54c5adab42352ec9f7907e2606f68164d708cea34be5e45 WHIRLPOOL d36fa9563368e9670241fc2da4864a1cbe5e3190824d9b0d81739642d9e8f56bea1914dd44832df1f7ea7614331302259c6e1bfb668d7519c41a0e227fc05b61
+AUX wpa_supplicant-2.1-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654
+AUX wpa_supplicant-2.1-fix-undefined-reference-to-random_get_bytes.patch 633 SHA256 29b9a9ba8d4b53313593c3f56ad13e776ee76fbd04bc33b35e1d6f61e571b496 SHA512 e6e27a982c064bff7c833d33051205ddbaf931f7116724880c9c6e676139ccc69b0302229817d6c618cb3669ec68989b347a1cb40660c4ab124df9841bc7c020 WHIRLPOOL 38950a4044cfb9b9f56852e465297fed94bb9fa76907d4247346a24a7f40457b0c34dd12338d6cff9677da6b6b9d315989f4911242d472d0dbb4f8fcb8a930c9
+AUX wpa_supplicant-2.1-generate-libeap-peer.patch 9820 SHA256 46d81b152ce7bc4905ee6a79ffbf50f6cab3d2df5dfd65314d38aa8a1571a7c8 SHA512 032344070ecf0ec1af362955693fc612031176dd3cac0df0164dab18347b1d2e1f0a4941fe153ed50f329a6fe8b3a4fab6544460b8ad501c7e63acc004eee065 WHIRLPOOL 1a6647b7cdab7919776bb3e95115db2b8e8049cb3ee62b837a937d0261eb72c40dec43950558223427edbfc616b9006af94edbb82057681a027b99b48f9699cd
 AUX wpa_supplicant-conf.d 161 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90 SHA512 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 WHIRLPOOL 5508d1598bd952ec773db0d5e5ab440134337de6e26d7b8c7c6b00789c570559a54457ac507357b65e8604da849f9ab52dff90d27197d9be11ed2cc66eaae1e7
 AUX wpa_supplicant-init.d 1249 SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0 SHA512 6b245dad8861f71bab7187d9349464d4ae5986202d097928886e26db9ca9c08dedd82852c52dd72d232bd23139f47a76cd8c87e020596796b403fd0c4ac0ffc7 WHIRLPOOL d5edcd9842d3039cbc9b57e24a770b6443a1e869ab3492a86eac60f920aa2a4537b0fdb3d73cbf4b8f85dd257a529839786e16e98ddd4556445d464c43deb012
 AUX wpa_supplicant.conf 183 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8 WHIRLPOOL 4615456a07dfc81139d350cb7618fc204008ae9cfa118f5966f923d758d1339a2d17eb79b631d8eb094225fac583a74705ed5ca4d348554f6b2435f166c16548
 AUX wpa_supplicant.service 264 SHA256 aa76e01677a755270147bcda08dbd8283ba37dc15e384869e874585cf5720c39 SHA512 b5ff8db22a7e23e8a54a6bd018c495093c7d31f5734eb83cb652184193193d7cd0c03b7ca286eeef59b0a12f1472d5fa37990d7c10511e22f2eaf410ee15d056 WHIRLPOOL f29f175636def13bedd8519d9837fffb802dcc219e3714ac8b285ae1d411a2c19f55ae1d8c1bad3446a4172dd28ff3d5d9d8baedfdea29e2a057678b82589e3c
 AUX wpa_supplicant_at.service 314 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb743eaf868cd311a5128c13ac0c SHA512 400e2e4b69408a4fe044409fee9639338e1fd6423e00a544b46065fe1d0215717b17b44ce1abadf0ce5da365724977ea0beffbf75d96c0c6ee1f24618c92428d WHIRLPOOL 1603e4651072e0dfb5381c9a063db64bb412c2bc640226137b7cfd56f2525a6c1e198cb042553f5a25fc234773d1d9438eea09d65fdde71d81dddfd86b5273b0
 DIST wpa_supplicant-2.0.tar.gz 2044281 SHA256 2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09 SHA512 c3a599e1dfa5e0bb4b8d35ed49501696ce68c807ff458c1e3bff9ed5619c780f7117c6d8d7cb9a11351e9fad27cf83fc114f255c92552e7ba084de70c5f8e254 WHIRLPOOL 603f9ac54505166690516a0f1e3112a8279a7184a54066699ad24b1f6269ad90c46a01a87d23bb62df782cdf561aa6f8b5a11e7ee59914cb36be8daea470389e
+DIST wpa_supplicant-2.1.tar.gz 2222066 SHA256 91632e7e3b49a340ce408e2f978a93546a697383abf2e5a60f146faae9e1b277 SHA512 eb1075623502d3e8f02c803ce31487fe5efce172e30d6b818ac835f7bbfe0140a225f95573ba4557f29e54d4623be2eb4a6ee18675ae6a676ccd46c33b0b3843 WHIRLPOOL a96f6544abe640c2f246e6bad5056344ca29214a8e2703e887e10640ee35eb8d8fb42e4c2416d313d3a2d8dd89ed3876ff0a981fac7a6b77be9597bc9730dbe6
 EBUILD wpa_supplicant-2.0-r2.ebuild 9086 SHA256 a8b7ce63e9ba7b62487e11139f7de923506f5e8a072a3e452f4be45382b45567 SHA512 9dbe3a9cd9a7e1305ea0666f3f457dfe4f7944eff7cf7b597fe41a16ca6e606f0ce69d467e2c0f767eedb2d5742bed3d8207e8ec922d872e41518dda9699de32 WHIRLPOOL c7e95a15ab9a76f21af1eaf8731d059c8aaed61599013c4468dd6802293b154aa5f28314915d17ebfb5d7640680f2fd51c49f3fad2e1c1f9318512234003fe90
-EBUILD wpa_supplicant-2.0-r3.ebuild 9215 SHA256 0bdb32f7e92d3575ce0166de13083b4c98f08ad77622ab3714611d333fb78be1 SHA512 47b71f7fc1dc26d2696cbf162c8338fcbb118547049dd46f2e5dd4cb122830bbde51f6f7de3487066d42c40f95621c470bd316d8a2c145a96638509d4d1d2464 WHIRLPOOL d7b00daf3ed94bd276073d15e2703349f96a43700b8958d28f6b3dc2588ddbef6d3c0f64677403b523b75cdd57dfcb554961067c36c3dc6304350da0bb016653
-MISC ChangeLog 42527 SHA256 b31a75984b6c4a58a70fa73543902e646ebe6864dddf1b8ab7adfde916a7075e SHA512 e27339fd39c909ff37f19efaa59af9981a8d5d9e4c4c421ba398a772b5fbf3dd923492b68660f45d5151d8a6a990218c7fcc5fa94fb34c6f6e2f0faa835c967f WHIRLPOOL 021ad0261cd270de3a3e5271ca54a5c15a0c43274535f9effa596d1ea1996444d0365effa3a97480d2a7415295637651525d0b64a01a420e98589a0067d4c04d
+EBUILD wpa_supplicant-2.1.ebuild 9065 SHA256 cd68f4c8cca90fa304efc4c39f7bda20f8ec75063d49f8970b2e9a3518def1b4 SHA512 3408cdfca8045953a826f3b3a64dd5c05d7e5728d1c2ac7635751e51cca35eb5556538739eadce40c09a94f7c8e5fbe470db493f612f7cc47b8d4b87d8fecb00 WHIRLPOOL 5c9247f9357bb643257fe9049ba4e83b3503861aced4fd43afa159511c60f59a2db8339c13ba3154af7e0143026255219bce51f97f95e8a1cb2437d5b5b16867
+MISC ChangeLog 42959 SHA256 e30490df3d1b6cf13a1a73192a6a9d6c438a0e321c5ef8c9d3cde002eca28de9 SHA512 d9a0d0b4db0a3c8f4d2fa81d05575aaca59d6ab5204e7357f34c0aa24a3cdd55995de86b60ad1de876b0b56986285fda1504598dfadd731b12adddf6583328a6 WHIRLPOOL ee99576061a5982303880a996340bcafc65723b89ad5ec2e2d58aaebcb192c0c5854c47be0cfaaacdd155eb24416e89f527539be97793240a43be205fc67d4c8
 MISC metadata.xml 1107 SHA256 eae15b505a1ed1406d589cd6dc9227a87340119331e8373ff25302f6a9c098c8 SHA512 bcca37682eae987546d19d7b43cf62d5dabb5d905b392728b17590a5d0692c5019bc1c29513799a5c4f8c4177e42de0397cfb1387cb56463a7fa47f0425fcae8 WHIRLPOOL 13218a055188f39f11f005885bc5a80ea63f3984cab53b73a9d0190ef3c164a2be4448902217e9913f65c14b32e8cceaa0b1a65df5e7acb8e9eac39a614a1a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK2+dMACgkQsR7PQhRXYElVDQCdHhebaxyL0BvX6rk24fMpbnqo
-H7EAn3D9FMwSOfVXK900pMlIe5/czuKO
-=GuzE
+iEYEAREIAAYFAlL7UIkACgkQsR7PQhRXYEl33QCfe5vFCKIrEKI1l0gZsyYPucjs
+S30An05ISofddkh7KjKrDEAouLkm1WxH
+=IPQu
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-dbus-path-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-dbus-path-fix.patch
new file mode 100644
index 000000000000..976d71b0ec39
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-dbus-path-fix.patch
@@ -0,0 +1,20 @@
+diff -aurp a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
+--- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2012-05-15 09:00:03.048545044 +0000
++++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in	2012-05-15 09:01:19.759550509 +0000
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=fi.epitest.hostap.WPASupplicant
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=/usr/sbin/wpa_supplicant -u
+ User=root
+ SystemdService=wpa_supplicant.service
+diff -aurp a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
+--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2012-05-15 09:00:03.048545044 +0000
++++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in	2012-05-15 09:01:28.727551913 +0000
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+ Name=fi.w1.wpa_supplicant1
+-Exec=@BINDIR@/wpa_supplicant -u
++Exec=/usr/sbin/wpa_supplicant -u
+ User=root
+ SystemdService=wpa_supplicant.service
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-do-not-call-dbus-functions-with-NULL-path.patch
new file mode 100644
index 000000000000..bbff73e13d42
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-do-not-call-dbus-functions-with-NULL-path.patch
@@ -0,0 +1,60 @@
+diff -aurp a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
+--- a/wpa_supplicant/dbus/dbus_new_helpers.c	2012-05-15 07:28:37.616150164 +0000
++++ b/wpa_supplicant/dbus/dbus_new_helpers.c	2012-05-15 07:30:21.904157611 +0000
+@@ -882,7 +882,7 @@ void wpa_dbus_mark_property_changed(stru
+ 	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 -aurp a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c
+--- a/wpa_supplicant/dbus/dbus_old.c	2012-05-15 07:28:29.502149373 +0000
++++ b/wpa_supplicant/dbus/dbus_old.c	2012-05-15 07:30:48.859162441 +0000
+@@ -379,7 +379,7 @@ void wpa_supplicant_dbus_notify_scan_res
+ 	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,
+@@ -419,7 +419,7 @@ void wpa_supplicant_dbus_notify_state_ch
+ 	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 */
+@@ -478,7 +478,7 @@ void wpa_supplicant_dbus_notify_scanning
+ 	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,
+@@ -513,7 +513,7 @@ void wpa_supplicant_dbus_notify_wps_cred
+ 	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,
+@@ -564,7 +564,7 @@ void wpa_supplicant_dbus_notify_certific
+ 	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/files/wpa_supplicant-2.1-fix-undefined-reference-to-random_get_bytes.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-fix-undefined-reference-to-random_get_bytes.patch
new file mode 100644
index 000000000000..def43a2ae314
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-fix-undefined-reference-to-random_get_bytes.patch
@@ -0,0 +1,19 @@
+diff -Naur a/src/eap_peer/Makefile b/src/eap_peer/Makefile
+--- a/src/eap_peer/Makefile	2013-05-17 09:51:55.000000000 +0000
++++ b/src/eap_peer/Makefile	2013-05-17 09:54:03.010830904 +0000
+@@ -36,6 +36,7 @@
+ OBJS_both += ../utils/wpa_debug.o
+ OBJS_both += ../utils/base64.o
+ OBJS_both += ../utils/wpabuf.o
++OBJS_both += ../utils/eloop.o
+ OBJS_both += ../crypto/md5.o
+ ifneq ($(CONFIG_TLS), openssl)
+ OBJS_both += ../crypto/sha1.o
+@@ -48,6 +49,7 @@
+ OBJS_both += ../crypto/aes-omac1.o
+ OBJS_both += ../crypto/ms_funcs.o
+ OBJS_both += ../crypto/sha256.o
++OBJS_both += ../crypto/random.o
+ 
+ 
+ OBJS_both += ../eap_common/eap_peap_common.o
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-generate-libeap-peer.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-generate-libeap-peer.patch
new file mode 100644
index 000000000000..391338b302cd
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.1-generate-libeap-peer.patch
@@ -0,0 +1,349 @@
+diff -Naurp a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c
+--- a/src/eap_peer/eap_methods.c	2012-05-15 08:23:17.151386999 +0000
++++ b/src/eap_peer/eap_methods.c	2012-05-15 08:23:57.403389760 +0000
+@@ -342,6 +342,120 @@ int eap_peer_method_register(struct eap_
+ 
+ 
+ /**
++ * eap_peer_register_methods - Register all known EAP peer methods
++ *
++ * This function is called at program start to register all compiled
++ * in EAP peer methods.
++ */
++int eap_peer_register_methods(void)
++{
++	int ret = 0;
++
++#ifdef EAP_MD5
++	if (ret == 0)
++		ret = eap_peer_md5_register();
++#endif /* EAP_MD5 */
++
++#ifdef EAP_TLS
++	if (ret == 0)
++		ret = eap_peer_tls_register();
++#endif /* EAP_TLS */
++
++#ifdef EAP_MSCHAPv2
++	if (ret == 0)
++		ret = eap_peer_mschapv2_register();
++#endif /* EAP_MSCHAPv2 */
++
++#ifdef EAP_PEAP
++	if (ret == 0)
++		ret = eap_peer_peap_register();
++#endif /* EAP_PEAP */
++
++#ifdef EAP_TTLS
++	if (ret == 0)
++		ret = eap_peer_ttls_register();
++#endif /* EAP_TTLS */
++
++#ifdef EAP_GTC
++	if (ret == 0)
++		ret = eap_peer_gtc_register();
++#endif /* EAP_GTC */
++
++#ifdef EAP_OTP
++	if (ret == 0)
++		ret = eap_peer_otp_register();
++#endif /* EAP_OTP */
++
++#ifdef EAP_SIM
++	if (ret == 0)
++		ret = eap_peer_sim_register();
++#endif /* EAP_SIM */
++
++#ifdef EAP_LEAP
++	if (ret == 0)
++		ret = eap_peer_leap_register();
++#endif /* EAP_LEAP */
++
++#ifdef EAP_PSK
++	if (ret == 0)
++		ret = eap_peer_psk_register();
++#endif /* EAP_PSK */
++
++#ifdef EAP_AKA
++	if (ret == 0)
++		ret = eap_peer_aka_register();
++#endif /* EAP_AKA */
++
++#ifdef EAP_AKA_PRIME
++	if (ret == 0)
++		ret = eap_peer_aka_prime_register();
++#endif /* EAP_AKA_PRIME */
++
++#ifdef EAP_FAST
++	if (ret == 0)
++		ret = eap_peer_fast_register();
++#endif /* EAP_FAST */
++
++#ifdef EAP_PAX
++	if (ret == 0)
++		ret = eap_peer_pax_register();
++#endif /* EAP_PAX */
++
++#ifdef EAP_SAKE
++	if (ret == 0)
++		ret = eap_peer_sake_register();
++#endif /* EAP_SAKE */
++
++#ifdef EAP_GPSK
++	if (ret == 0)
++		ret = eap_peer_gpsk_register();
++#endif /* EAP_GPSK */
++
++#ifdef EAP_WSC
++	if (ret == 0)
++		ret = eap_peer_wsc_register();
++#endif /* EAP_WSC */
++
++#ifdef EAP_IKEV2
++	if (ret == 0)
++		ret = eap_peer_ikev2_register();
++#endif /* EAP_IKEV2 */
++
++#ifdef EAP_VENDOR_TEST
++	if (ret == 0)
++		ret = eap_peer_vendor_test_register();
++#endif /* EAP_VENDOR_TEST */
++
++#ifdef EAP_TNC
++	if (ret == 0)
++		ret = eap_peer_tnc_register();
++#endif /* EAP_TNC */
++
++	return ret;
++}
++
++
++/**
+  * eap_peer_unregister_methods - Unregister EAP peer methods
+  *
+  * This function is called at program termination to unregister all EAP peer
+diff -Naurp a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h
+--- a/src/eap_peer/eap_methods.h	2012-05-15 08:23:17.151386999 +0000
++++ b/src/eap_peer/eap_methods.h	2012-05-15 08:23:57.404389735 +0000
+@@ -32,6 +32,7 @@ EapType eap_peer_get_type(const char *na
+ const char * eap_get_name(int vendor, EapType type);
+ size_t eap_get_names(char *buf, size_t buflen);
+ char ** eap_get_names_as_string_array(size_t *num);
++int eap_peer_register_methods(void);
+ void eap_peer_unregister_methods(void);
+ 
+ #else /* IEEE8021X_EAPOL */
+diff -Naurp a/src/eap_peer/libeap0.pc b/src/eap_peer/libeap0.pc
+--- a/src/eap_peer/libeap0.pc	1970-01-01 00:00:00.000000000 +0000
++++ b/src/eap_peer/libeap0.pc	2012-05-15 08:23:57.404389735 +0000
+@@ -0,0 +1,10 @@
++prefix=/usr
++exec_prefix=/usr
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include/eap_peer
++
++Name: libeap0
++Description: EAP Peer Library API
++Version: 0.7.2
++Libs: -L${libdir} -leap
++Cflags: -I${includedir}
+diff -Naurp a/src/eap_peer/Makefile b/src/eap_peer/Makefile
+--- a/src/eap_peer/Makefile	2012-05-15 08:23:17.152386964 +0000
++++ b/src/eap_peer/Makefile	2012-05-15 08:23:57.403389760 +0000
+@@ -1,11 +1,188 @@
+-all:
+-	@echo Nothing to be made.
++LIBEAP_NAME = libeap
++LIBEAP_CURRENT = 0
++LIBEAP_REVISION = 0
++LIBEAP_AGE = 0
++
++LIBEAP = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT).$(LIBEAP_REVISION).$(LIBEAP_AGE)
++LIBEAP_SO = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT)
++
++.PHONY: all clean install uninstall
++
++all: $(LIBEAP)
++
++ifndef CC
++CC=gcc
++endif
++
++ifndef CFLAGS
++CFLAGS = -MMD -O0 -Wall -g
++endif
++
++CONFIG_TLS=openssl
++
++INCLUDE_INSTALL_DIR=/usr/include/eap_peer
++
++# Got to use override all across the board, otherwise a 'make
++# CFLAGS=XX' will kill us because the command line's CFLAGS will
++# overwrite Make's and we'll loose all the infrastructure it sets.
++override CFLAGS += -I. -I.. -I../crypto -I../utils -I../common
++
++# at least for now, need to include config_ssid.h and config_blob.h from
++# wpa_supplicant directory
++override CFLAGS += -I ../../wpa_supplicant
++
++OBJS_both += ../utils/common.o
++OBJS_both += ../utils/os_unix.o
++OBJS_both += ../utils/wpa_debug.o
++OBJS_both += ../utils/base64.o
++OBJS_both += ../utils/wpabuf.o
++OBJS_both += ../crypto/md5.o
++ifneq ($(CONFIG_TLS), openssl)
++OBJS_both += ../crypto/sha1.o
++endif
++OBJS_both += ../crypto/sha1-tlsprf.o
++OBJS_both += ../crypto/aes-encblock.o
++OBJS_both += ../crypto/aes-wrap.o
++OBJS_both += ../crypto/aes-ctr.o
++OBJS_both += ../crypto/aes-eax.o
++OBJS_both += ../crypto/aes-omac1.o
++OBJS_both += ../crypto/ms_funcs.o
++OBJS_both += ../crypto/sha256.o
++
++
++OBJS_both += ../eap_common/eap_peap_common.o
++OBJS_both += ../eap_common/eap_psk_common.o
++OBJS_both += ../eap_common/eap_pax_common.o
++OBJS_both += ../eap_common/eap_sake_common.o
++OBJS_both += ../eap_common/eap_gpsk_common.o
++OBJS_both += ../eap_common/chap.o
++
++OBJS_peer += ../eap_peer/eap_tls.o
++OBJS_peer += ../eap_peer/eap_peap.o
++OBJS_peer += ../eap_peer/eap_ttls.o
++OBJS_peer += ../eap_peer/eap_md5.o
++OBJS_peer += ../eap_peer/eap_mschapv2.o
++OBJS_peer += ../eap_peer/mschapv2.o
++OBJS_peer += ../eap_peer/eap_otp.o
++OBJS_peer += ../eap_peer/eap_gtc.o
++OBJS_peer += ../eap_peer/eap_leap.o
++OBJS_peer += ../eap_peer/eap_psk.o
++OBJS_peer += ../eap_peer/eap_pax.o
++OBJS_peer += ../eap_peer/eap_sake.o
++OBJS_peer += ../eap_peer/eap_gpsk.o
++OBJS_peer += ../eap_peer/eap.o
++OBJS_peer += ../eap_common/eap_common.o
++OBJS_peer += ../eap_peer/eap_methods.o
++OBJS_peer += ../eap_peer/eap_tls_common.o
++
++override CFLAGS += -DEAP_TLS
++override CFLAGS += -DEAP_PEAP
++override CFLAGS += -DEAP_TTLS
++override CFLAGS += -DEAP_MD5
++override CFLAGS += -DEAP_MSCHAPv2
++override CFLAGS += -DEAP_GTC
++override CFLAGS += -DEAP_OTP
++override CFLAGS += -DEAP_LEAP
++override CFLAGS += -DEAP_PSK
++override CFLAGS += -DEAP_PAX
++override CFLAGS += -DEAP_SAKE
++override CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256
++override CFLAGS += -DEAP_TLS_FUNCS
++
++override CFLAGS += -DIEEE8021X_EAPOL
++
++ifeq ($(CONFIG_TLS), openssl)
++override CFLAGS += -DEAP_TLS_OPENSSL
++OBJS_both += ../crypto/tls_openssl.o
++OBJS_both += ../crypto/crypto_openssl.o
++LIBS += -lssl -lcrypto
++override CFLAGS += -DINTERNAL_SHA256
++endif
++
++ifeq ($(CONFIG_TLS), internal)
++OBJS_both += ../crypto/tls_internal.o
++OBJS_both += ../tls/tlsv1_common.o ../../tls/tlsv1_record.o
++OBJS_both += ../tls/tlsv1_cred.o
++OBJS_both += ../tls/asn1.o ../../tls/x509v3.o
++OBJS_both += ../crypto/crypto_internal.o ../../tls/rsa.o ../../tls/bignum.o
++
++OBJS_peer += ../tls/tlsv1_client.o
++OBJS_peer += ../tls/tlsv1_client_write.o ../../tls/tlsv1_client_read.o
++override CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
++
++OBJS_server += ../tls/tlsv1_server.o
++OBJS_server += ../tls/tlsv1_server_write.o ../../tls/tlsv1_server_read.o
++override CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
++
++override CFLAGS += -DCONFIG_TLS_INTERNAL
++override CFLAGS += -DCONFIG_CRYPTO_INTERNAL
++override CFLAGS += -DCONFIG_INTERNAL_X509
++override CFLAGS += -DINTERNAL_AES
++override CFLAGS += -DINTERNAL_SHA1
++override CFLAGS += -DINTERNAL_SHA256
++override CFLAGS += -DINTERNAL_MD5
++override CFLAGS += -DINTERNAL_MD4
++override CFLAGS += -DINTERNAL_DES
++ifdef CONFIG_INTERNAL_LIBTOMMATH
++override CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
++else
++LIBS += -ltommath
++endif
++endif
++
++ifndef LDO
++LDO=$(CC)
++endif
++
++
++OBJS_lib=$(OBJS_both) $(OBJS_peer)
++
++ #$(OBJS_server)
++
++override CFLAGS  += -fPIC -DPIC
++LDFLAGS += -shared
++
++$(LIBEAP): $(OBJS_lib)
++	$(LDO) $(LDFLAGS) $(OBJS_lib) -Wl,-soname -Wl,$(LIBEAP_SO) -o $(LIBEAP) $(LIBS)
++
++
++UTIL_HEADERS = ../utils/includes.h ../utils/common.h \
++	../utils/wpabuf.h ../utils/build_config.h \
++	../utils/os.h ../utils/wpa_debug.h
++COMMON_HEADERS = ../common/defs.h 
++EAP_COMMON_HEADERS = ../eap_common/eap_defs.h 
++MAIN_HEADERS = eap.h eap_methods.h eap_config.h
++CRYPTO_HEADERS =  ../crypto/tls.h  
++
++install: 
++
++	mkdir -p $(DESTDIR)/usr/lib
++#	copy the lib file to std lib location
++	cp $(LIBEAP) $(DESTDIR)/usr/lib
++	ln -fs $(LIBEAP_SO) $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so
++	ln -fs $(LIBEAP_NAME).so.0.0.0 $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so.0
++
++#	copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include
++	mkdir -p \
++		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common \
++		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common \
++		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util \
++		$(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
++	install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common
++	install -m 0644 $(COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common
++	install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto
++	install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util
++	install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/
++
++	mkdir -p $(DESTDIR)/usr/lib/pkgconfig
++	cp libeap0.pc $(DESTDIR)/usr/lib/pkgconfig
++
++uninstall: 
++
++	rm $(DESTDIR)/usr/lib/$(LIBEAP)
++	rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR)
++	rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc
+ 
+ clean:
+-	rm -f *~ *.o *.so *.d *.gcno *.gcda *.gcov
++	rm -f *~ *.o *.so *.d *.gcno *.gcda *.gcov libeap.a $(LIBEAP) $(OBJS_lib)
+ 
+-install:
+-	if ls *.so >/dev/null 2>&1; then \
+-		install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \
+-		cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \
+-	; fi
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.1.ebuild
index cb199eacfcfa..8e5d305f13b7 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r3.ebuild,v 1.1 2013/12/13 19:36:05 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.1.ebuild,v 1.1 2014/02/12 10:44:24 gurligebis Exp $
 
 EAPI=4
 
@@ -111,6 +111,7 @@ src_configure() {
 	echo "CONFIG_EAP_PAX=y"         >> .config
 	echo "CONFIG_EAP_PSK=y"         >> .config
 	echo "CONFIG_EAP_TLV=y"         >> .config
+	echo "CONFIG_EAP_EXE=y"         >> .config
 	echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
 	echo "CONFIG_PKCS12=y"          >> .config
 	echo "CONFIG_PEERKEY=y"         >> .config
@@ -167,13 +168,9 @@ src_configure() {
 	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