Stabilise 2.0 on amd64 x86 and ppc. Drop overshadowed versions.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

9 files changed, 26 insertions, 578 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 4fc1bcb961d8..83d7c4944097 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.137 2013/04/29 18:30:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.138 2013/04/29 18:35:53 scarabeus Exp $
+
+  29 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/hostapd-1.0-libnl_path_fix.patch,
+  -files/hostapd-1.0-tls_length_fix.patch,
+  -files/hostapd-1.1-libnl_path_fix.patch,
+  -files/hostapd-1.1-tls_length_fix.patch, -hostapd-1.0-r4.ebuild,
+  -hostapd-1.1.ebuild, hostapd-2.0.ebuild:
+  Stabilise 2.0 on amd64 x86 and ppc. Drop overshadowed versions.
 
   29 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> hostapd-2.0.ebuild:
   Drop debug useflag. As without it all messages are muted, which kills any
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index c8c94ccc5307..51987f1b8f4e 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,35 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX hostapd-1.0-libnl_path_fix.patch 892 SHA256 7ec9489fed14b7f3916d0aab63e34886bcf39d07c257101df53e16ef4db2b95d SHA512 10b1db56ec2bb8a2ab04dcd50b5a0442efdd4814ef6a4effc50d0157d61fc993ebb6f2f6775566fc0341668ad314dd2d4ec4e91177d59d76c59b8ceb2bf4c2f4 WHIRLPOOL ae16d72eb649d7267191a2542c204da92493279f3d09dc9de4349ca4a8db9d7e5f46d3d824e4b22900ad257e1bdcf86b26fb46eee63cbb8af48bd739b0d27ea0
-AUX hostapd-1.0-tls_length_fix.patch 1859 SHA256 bbca0422a0babbf9d7fad2b758ecddaae45624db1b2db6d7663292548e25906a SHA512 e354e9352605003101cba296735232d11ac685f1db8718e5d59b55de1b86b55144e4871afe85cae4374f52af1b42df3ebd4747e109c86e0750ef9eb5345453d7 WHIRLPOOL 6a9379b09ffb73d13ea813952e2b39b5ab90ec98a27ed211ff2904d52e346c9e6273fe99e8ae6509773597afa352d9e77f3081103c5e5c55c86e12f8176a5419
-AUX hostapd-1.1-libnl_path_fix.patch 892 SHA256 7ec9489fed14b7f3916d0aab63e34886bcf39d07c257101df53e16ef4db2b95d SHA512 10b1db56ec2bb8a2ab04dcd50b5a0442efdd4814ef6a4effc50d0157d61fc993ebb6f2f6775566fc0341668ad314dd2d4ec4e91177d59d76c59b8ceb2bf4c2f4 WHIRLPOOL ae16d72eb649d7267191a2542c204da92493279f3d09dc9de4349ca4a8db9d7e5f46d3d824e4b22900ad257e1bdcf86b26fb46eee63cbb8af48bd739b0d27ea0
-AUX hostapd-1.1-tls_length_fix.patch 1859 SHA256 bbca0422a0babbf9d7fad2b758ecddaae45624db1b2db6d7663292548e25906a SHA512 e354e9352605003101cba296735232d11ac685f1db8718e5d59b55de1b86b55144e4871afe85cae4374f52af1b42df3ebd4747e109c86e0750ef9eb5345453d7 WHIRLPOOL 6a9379b09ffb73d13ea813952e2b39b5ab90ec98a27ed211ff2904d52e346c9e6273fe99e8ae6509773597afa352d9e77f3081103c5e5c55c86e12f8176a5419
 AUX hostapd-2.0-tls_length_fix.patch 1859 SHA256 bbca0422a0babbf9d7fad2b758ecddaae45624db1b2db6d7663292548e25906a SHA512 e354e9352605003101cba296735232d11ac685f1db8718e5d59b55de1b86b55144e4871afe85cae4374f52af1b42df3ebd4747e109c86e0750ef9eb5345453d7 WHIRLPOOL 6a9379b09ffb73d13ea813952e2b39b5ab90ec98a27ed211ff2904d52e346c9e6273fe99e8ae6509773597afa352d9e77f3081103c5e5c55c86e12f8176a5419
 AUX hostapd-conf.d 245 SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d SHA512 f07a6cd209eca351b8545017c5f025282c3fdea838ca3df49e362571ded43973281ce4ff83984b1299db15ea9b5c21a42cbda91432220af9146bf034e2265c30 WHIRLPOOL 0ab1dbd8e04df9e7b8ae875dfdfdcdd770e4fcb62197bb81e47588a9ecf0b8bb715adbde34f2be82d630fdd536e9f888f463dd12cab0c06220c345b0093a3dd5
 AUX hostapd-init.d 1022 SHA256 a220058841e66a11603df8e968ccc68945f01e1d11c1ae498922d0e01f6fa804 SHA512 0d9d3c69c7b4c50ab08a7633b3b0b2f770647045ba967de628c34bf37644dcae6ef8288cab0fd0508b8ee8eafa8f48bda0d378c5aadbbbc5cde9f5441f7c97a1 WHIRLPOOL e86f507cff5712ff2590f39c58989a379b81feb40cedcd424188e055ac38f772a7bb9c1089efabd6ff104078257aa2a20a82790e17b085c03264d35b6f4e274d
-DIST hostapd-1.0.tar.gz 1327943 SHA256 002e9dcb7e46cf82b5900a2fcf92b30fc8cdfd32a72d7fd4488588f1c013dfcc SHA512 2f189ef3d52099ee249a96820b257f331e0cb601e89dc01c583ec697d5e9a68f6b80c2913bbb4b37f18dc4a218f34ed9deb0357d55509de9d0f58dd60df33a8b WHIRLPOOL 79f0fd8b7f256d69771f8b022e74ee9908a6a613c875392cf151bdada86c077bbf8e88213547efa64c240daf9fb5e5f9bffe2fa5f7f98d5ca27d5d7058f5995a
-DIST hostapd-1.1.tar.gz 1329722 SHA256 d1ec8d2550f4f59d7611d8de68a61936cd3645fffdd2854c5b2bc758ece3b66c SHA512 449db341cbefc0d4b4925036a07b86923fcbb3d3fb59d8ecd1c6aa3605c0bd201a2011f9d8419a2ce1647d433c47691d0e215f1db487adeadb7116104ef91a0a WHIRLPOOL 5692f131d95f16c6c6f24d9f8ad400ef4e27297fac273b7e8adea7f6137315ada5c2e77a6927abb2349ee99a5c5b5da40bfb269079a96b9b1a6ed4b7cd962d3f
 DIST hostapd-2.0.tar.gz 1376203 SHA256 262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35 SHA512 25fddaaddb22903078cfaae29a1e955b60955f9f5542b52962a6a8d4c65146ca102e9ac085118ce422843c55349a74a019220dfd4926895e301d506dbc97b967 WHIRLPOOL e5ae2e760770d2f307b1c4235c9b0c9d25e1719a1d174efa30ce6bbbc07b5c46d5f7babc087b8f450f3b485fb640728ddd23761fb292bcd535ef38dc10ac1d45
-EBUILD hostapd-1.0-r4.ebuild 5350 SHA256 e064cb83f035e661ab7823061072982fbe3266b13944ceb223989acf1b0b937c SHA512 cac546fa46ac64e9dfc3100f1eecb8d29bd9a8f8694fbf70d3f232345971df1fa0050592d0eb51a8f9faf221fc5e753eace072d2418e46ace318518fcb206610 WHIRLPOOL d3a9d376fc7839635c54eb85bc52f6bed3a0a3889be8c1c1bae338b5146da09a782b3754fc0901850ae816cfefb0de24abfe34db90b365ddb87f626081053142
-EBUILD hostapd-1.1.ebuild 5352 SHA256 551eeb6dc17260026c16993b43a5cede14257d4a2b68392cb2cc6755680503d4 SHA512 38598cfbdcc1797a33ec7531cb5752befd499245170e926f94818e4b3f7d5a57ab00aa547a21f71554ce504c6d104cddff9e672c46e9bf9c81d0e77a2b43c650 WHIRLPOOL 0752ade6653eddee4de28890e18067b6170c5ab019b1bebc7de4504602cf88563a45efd0f1f6ff3024985fa489fde0ecc3a1e02999a8467c8c3d11839aa46d5b
-EBUILD hostapd-2.0.ebuild 5223 SHA256 63cb797083ffb6a13ac8bb533ffb913c929c0098b8faf4589451b4a06923ab2b SHA512 3c540decd228750066e6b459d016373c13525356e363c8d1096ff3a6c7bedb0e4ff6805bd215b58e9eb5ec71dba8490867b27f698b9b6b2714acd65145fc845b WHIRLPOOL 7b87d59130346dbfeee5bf85ee21ee9d74b7952c18ebe0215965f97f173d86617cbc2cde273db692b8ab6c96d256af1f3ad61997f70ea80e046bb687014cf47b
-MISC ChangeLog 24106 SHA256 5e6d799ddd5536c2d63842473e8ff6cef15134562d5d52d684db345543ee5950 SHA512 e187511fc48bc62b3e5ddc0dde2fec6fc710a24f3e434220e343af24fd4cf58d505bec5fb123c8ed02864f159378b4fc511813f706ace241d1adfa7d15c74f38 WHIRLPOOL d8f6a2571e104370a25c44ee3ee29c8008a8fcc7c7f886c53958328aa05e1de12d2ebc233a799983138a409ceb7ce3e20ca3a5b29d9bed57ac8c7c88ee295b9f
+EBUILD hostapd-2.0.ebuild 5220 SHA256 39a664ffe26617aa9dd82430c6bc9b12af3708c69bbd16cb203cb3767dce99ac SHA512 9989a617a7b5b42df69d947b4f58eb809b0ff8c5072e257932ba0f8a796c5f1489b7d8b13010e3da56c0a6c7070c59939b681e74bccc4d5fd202b743b6423382 WHIRLPOOL 3fde7a021d5503f68d260dbf11220b6de7683af6b712984b92c5891e90bf6eaf7dd39070c18342100b9b7b4b219ae1edbd71b8edb79f98b5c28cef6eb7726d19
+MISC ChangeLog 24467 SHA256 a48d0074d22858c8d73ae058afed056e6718030aff3d2b58cf06f9253ec5ee19 SHA512 3e0205d75b4a6a32213f053c77f824be24ee186a920f5bbbb75ea51637f537cf0a885e8e21ee069f63d85be6bae6cf04f26933a3b68fc553703cf616657370c7 WHIRLPOOL 7f315d96b249b8fdfb8c0f38859f6f478ae8adaa623282fe1c4b9355ecf7754df755108fe517d000f90968703f1a9235d51ff95d37a2162cb25ee83ecc88eacd
 MISC metadata.xml 776 SHA256 9abc5582d361e2903d96271db27246f4b242d1c7986ba655d172dc0bd8969a0e SHA512 0b5546175cc3287ad92f33bc737ed205b447d4686bf425bf9e4ec9a335e243855e7bd9fcc3c066747acb1efb9d79182f85aed98356d82b3c5477daba9a39e34b WHIRLPOOL 5672b09ce4dbce807ab5b6b12177f00c963588f1e92bf005f67daf394848c48b2d907b2afa82edd8c5144875c2d26ad8faf03dc20aef827c8bc4b96e8104e873
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRfrxUAAoJEOSiRoyO7jvoe9UP/iz1Dc/AqQ0X6uJbQS07/61R
-/Er7rhvdhpzpf1Mps/wJuiZPo81stoiZC7kW5Llom3XW8GhNCO/h8QBMatFoo9Pq
-FgEM6r0B5KWcgGMcJCdM2mz2B5IeupOvMi12xYP4xSIQfcirOGLtPuyvQvheDhkT
-2L+N3ro++i6D6P8ve3O//oohw/T+8jdrQhJIbQLxWIVCsVrSVKtwUCVKulgDXNFQ
-rlpK0zHbcr7vNvPDnU4j1ffEBhjtyi6hRDZJyaI0aTnGlfsvurZuat49mmTebkke
-uSvD1MBFTgJDIdcJyRvmBnmtPah1y/9Iuml+iEpCWwqlH2mBt/qR4w6yTPedMrZd
-Wv9EYBxZ0gMDD4KEii+OsmAZrtjPpy27LEvDCA7y7ZKfoHcvcINId21yJS1LgqRc
-6gxCu13po53IZYIeGkoRF45oD3sCaLrvb8zyAV8kvuozaza3ahoWTyeO6Fg/oTmm
-d5yjFt37a48Xo5Ac1sDGRnhe9rl33adq3ORsUWZRcLVyqDr/xq53/ksLW6hp0aW3
-upxLl4uHnGlYxrigsFOZD85BLKHxG1M/Tnp3q+n9u75nVkFQCt9Kx4s6ZOhzcEeN
-gX7SHWkBDKU90xolsS+UqgQvyTv63CGrvvWV2vsDZBsk+2mjGQMU86tZxSA/ZuuM
-FM1cyxs/5FUyky+E2Wi0
-=2lLT
+iQIcBAEBCAAGBQJRfr2KAAoJEOSiRoyO7jvogEgP/jQTSOTHDd9GPKS8NyBHflYc
+vZpgdO35Ilnxq860G/BtRvMqrkKcbAF/WdBfDWA65b3BSqmX1BBcXqG/CBoUSVd/
+XcAkpVZL0wt/fczz25zjkyoEVuE1zj1Mskh0YuWjq44ptAa5y1i2npB4f1Pfky7x
+v/Cl7ZW7+KEmU74/0L0n3DLualgXfEm3S6hKXC5qlxU8RgKOAg9r9sV3iLAy/gYf
+W/DyO9Bno6ySPBOxzYOguo3MeORbFR92CTAI4yB3Ac05OPSR6HbQIaHUo4RQ3p5Q
+RbrqHONCpkKfBYt9w0c4e730Odp4ayBU0HR6c3sZ9YTsRP+UXU0oeE+hUW6mYVZI
+J6Apdr+9gBpbwVlEmlGkKCkpU1RGohustEzzQ1ZS3fBoAPofg8W2A7Yf8cXDVCyr
+zgNJAyB4JuNrucI1AlXUShh+JZnkq3WxE2TZyzuFe7oCPATsC31bzajIJ9Er/xXr
+aTra4KWj+QtETUstNWb46JtLLQ/m+7FLuxDVdD+fOp/sejBvxZOVNIEW7cXrzIAC
+N6FQqbpYNCPLG2CkuOqlzMUVJVz3mW9GnScbZslRCY4QXiECiFK5lyP6gGUSowve
+l51IFmmOv0rxCbZSsgNVVNCtr06mVMEjclrowZ4wrHLOnh+R5yI5b2KSMipHqIos
+94HJ7XgQ9eCNs6jT/o/K
+=u+aL
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/hostapd/files/hostapd-1.0-libnl_path_fix.patch b/net-wireless/hostapd/files/hostapd-1.0-libnl_path_fix.patch
deleted file mode 100644
index abf15a6e7e07..000000000000
--- a/net-wireless/hostapd/files/hostapd-1.0-libnl_path_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aurp a/src/drivers/drivers.mak b/src/drivers/drivers.mak
---- a/src/drivers/drivers.mak	2012-10-03 19:42:16.387634128 +0000
-+++ b/src/drivers/drivers.mak	2012-10-03 19:43:16.246693744 +0000
-@@ -48,7 +48,7 @@ NEED_RFKILL=y
- ifdef CONFIG_LIBNL32
-   DRV_LIBS += -lnl-3
-   DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
- else
-   ifdef CONFIG_LIBNL_TINY
-     DRV_LIBS += -lnl-tiny
-diff -aurp a/src/drivers/drivers.mk b/src/drivers/drivers.mk
---- a/src/drivers/drivers.mk	2012-10-03 19:42:16.385634126 +0000
-+++ b/src/drivers/drivers.mk	2012-10-03 19:43:23.333700780 +0000
-@@ -48,7 +48,7 @@ NEED_RFKILL=y
- ifdef CONFIG_LIBNL32
-   DRV_LIBS += -lnl-3
-   DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
- else
-   ifdef CONFIG_LIBNL_TINY
-     DRV_LIBS += -lnl-tiny
diff --git a/net-wireless/hostapd/files/hostapd-1.0-tls_length_fix.patch b/net-wireless/hostapd/files/hostapd-1.0-tls_length_fix.patch
deleted file mode 100644
index bda92cf405fa..000000000000
--- a/net-wireless/hostapd/files/hostapd-1.0-tls_length_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 586c446e0ff42ae00315b014924ec669023bd8de Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 7 Oct 2012 20:06:29 +0300
-Subject: [PATCH] EAP-TLS server: Fix TLS Message Length validation
-
-EAP-TLS/PEAP/TTLS/FAST server implementation did not validate TLS
-Message Length value properly and could end up trying to store more
-information into the message buffer than the allocated size if the first
-fragment is longer than the indicated size. This could result in hostapd
-process terminating in wpabuf length validation. Fix this by rejecting
-messages that have invalid TLS Message Length value.
-
-This would affect cases that use the internal EAP authentication server
-in hostapd either directly with IEEE 802.1X or when using hostapd as a
-RADIUS authentication server and when receiving an incorrectly
-constructed EAP-TLS message. Cases where hostapd uses an external
-authentication are not affected.
-
-Thanks to Timo Warns for finding and reporting this issue.
-
-Signed-hostap: Jouni Malinen <j@w1.fi>
-intended-for: hostap-1
----
- src/eap_server/eap_server_tls_common.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/src/eap_server/eap_server_tls_common.c b/src/eap_server/eap_server_tls_common.c
-index 31be2ec..46f282b 100644
---- a/src/eap_server/eap_server_tls_common.c
-+++ b/src/eap_server/eap_server_tls_common.c
-@@ -228,6 +228,14 @@ static int eap_server_tls_process_fragment(struct eap_ssl_data *data,
- 			return -1;
- 		}
- 
-+		if (len > message_length) {
-+			wpa_printf(MSG_INFO, "SSL: Too much data (%d bytes) in "
-+				   "first fragment of frame (TLS Message "
-+				   "Length %d bytes)",
-+				   (int) len, (int) message_length);
-+			return -1;
-+		}
-+
- 		data->tls_in = wpabuf_alloc(message_length);
- 		if (data->tls_in == NULL) {
- 			wpa_printf(MSG_DEBUG, "SSL: No memory for message");
--- 
-1.7.4-rc1
-
diff --git a/net-wireless/hostapd/files/hostapd-1.1-libnl_path_fix.patch b/net-wireless/hostapd/files/hostapd-1.1-libnl_path_fix.patch
deleted file mode 100644
index abf15a6e7e07..000000000000
--- a/net-wireless/hostapd/files/hostapd-1.1-libnl_path_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aurp a/src/drivers/drivers.mak b/src/drivers/drivers.mak
---- a/src/drivers/drivers.mak	2012-10-03 19:42:16.387634128 +0000
-+++ b/src/drivers/drivers.mak	2012-10-03 19:43:16.246693744 +0000
-@@ -48,7 +48,7 @@ NEED_RFKILL=y
- ifdef CONFIG_LIBNL32
-   DRV_LIBS += -lnl-3
-   DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
- else
-   ifdef CONFIG_LIBNL_TINY
-     DRV_LIBS += -lnl-tiny
-diff -aurp a/src/drivers/drivers.mk b/src/drivers/drivers.mk
---- a/src/drivers/drivers.mk	2012-10-03 19:42:16.385634126 +0000
-+++ b/src/drivers/drivers.mk	2012-10-03 19:43:23.333700780 +0000
-@@ -48,7 +48,7 @@ NEED_RFKILL=y
- ifdef CONFIG_LIBNL32
-   DRV_LIBS += -lnl-3
-   DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
- else
-   ifdef CONFIG_LIBNL_TINY
-     DRV_LIBS += -lnl-tiny
diff --git a/net-wireless/hostapd/files/hostapd-1.1-tls_length_fix.patch b/net-wireless/hostapd/files/hostapd-1.1-tls_length_fix.patch
deleted file mode 100644
index bda92cf405fa..000000000000
--- a/net-wireless/hostapd/files/hostapd-1.1-tls_length_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 586c446e0ff42ae00315b014924ec669023bd8de Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 7 Oct 2012 20:06:29 +0300
-Subject: [PATCH] EAP-TLS server: Fix TLS Message Length validation
-
-EAP-TLS/PEAP/TTLS/FAST server implementation did not validate TLS
-Message Length value properly and could end up trying to store more
-information into the message buffer than the allocated size if the first
-fragment is longer than the indicated size. This could result in hostapd
-process terminating in wpabuf length validation. Fix this by rejecting
-messages that have invalid TLS Message Length value.
-
-This would affect cases that use the internal EAP authentication server
-in hostapd either directly with IEEE 802.1X or when using hostapd as a
-RADIUS authentication server and when receiving an incorrectly
-constructed EAP-TLS message. Cases where hostapd uses an external
-authentication are not affected.
-
-Thanks to Timo Warns for finding and reporting this issue.
-
-Signed-hostap: Jouni Malinen <j@w1.fi>
-intended-for: hostap-1
----
- src/eap_server/eap_server_tls_common.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/src/eap_server/eap_server_tls_common.c b/src/eap_server/eap_server_tls_common.c
-index 31be2ec..46f282b 100644
---- a/src/eap_server/eap_server_tls_common.c
-+++ b/src/eap_server/eap_server_tls_common.c
-@@ -228,6 +228,14 @@ static int eap_server_tls_process_fragment(struct eap_ssl_data *data,
- 			return -1;
- 		}
- 
-+		if (len > message_length) {
-+			wpa_printf(MSG_INFO, "SSL: Too much data (%d bytes) in "
-+				   "first fragment of frame (TLS Message "
-+				   "Length %d bytes)",
-+				   (int) len, (int) message_length);
-+			return -1;
-+		}
-+
- 		data->tls_in = wpabuf_alloc(message_length);
- 		if (data->tls_in == NULL) {
- 			wpa_printf(MSG_DEBUG, "SSL: No memory for message");
--- 
-1.7.4-rc1
-
diff --git a/net-wireless/hostapd/hostapd-1.0-r4.ebuild b/net-wireless/hostapd/hostapd-1.0-r4.ebuild
deleted file mode 100644
index 1cce5b6e03e0..000000000000
--- a/net-wireless/hostapd/hostapd-1.0-r4.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-1.0-r4.ebuild,v 1.4 2012/10/12 00:52:20 blueness Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE="debug ipv6 logwatch madwifi +ssl +wps +crda"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	kernel_linux? (
-		dev-libs/libnl:3
-		crda? ( net-wireless/crda )
-	)
-	madwifi? ( ||
-		( >net-wireless/madwifi-ng-tools-0.9.3
-		net-wireless/madwifi-old ) )"
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-src_prepare() {
-	cd ..
-	epatch "${FILESDIR}/${P}-libnl_path_fix.patch"
-	epatch "${FILESDIR}/${P}-tls_length_fix.patch"
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		"${S}/hostapd.conf" || die
-}
-
-src_configure() {
-	local CONFIG="${S}/.config"
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-	fi
-
-	if use wps; then
-		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG}
-		echo "CONFIG_WPS2=y" >> ${CONFIG}
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-		einfo "Enabling Wi-Fi Protected Setup support"
-	fi
-
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-
-	einfo "Enabling drivers: "
-
-	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-	einfo "  Prism54 driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
-	einfo "  None driver enabled"
-
-	if use madwifi; then
-		# Add include path for madwifi-driver headers
-		einfo "  Madwifi driver enabled"
-		echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG}
-		echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
-	else
-		einfo "  Madwifi driver disabled"
-	fi
-
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-	echo "LIBS += -L/usr/lib" >> ${CONFIG}
-
-	# misc
-	echo "CONFIG_PKCS12=y" >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_IAPP=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
-	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
-
-	if use ipv6; then
-		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	if ! use debug; then
-		echo "CONFIG_NO_STDOUT_DEBUG=y" >> ${CONFIG}
-	fi
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# Removed for now, since the 3.2 version is broken, and we don't
-	# support it.
-	if has_version ">=dev-libs/libnl-3.2"; then
-		echo "CONFIG_LIBNL32=y" >> .config
-	fi
-
-	# TODO: Add support for BSD drivers
-
-	default_src_configure
-}
-
-src_compile() {
-	emake V=1
-
-	if use ssl; then
-		emake V=1 nt_password_hash
-		emake V=1 hlr_auc_gw
-	fi
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
-
-	fperms -R 600 /etc/${PN}
-
-	dosbin ${PN}
-	dobin ${PN}_cli
-
-	use ssl && dobin nt_password_hash hlr_auc_gw
-
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-
-	doman ${PN}{.8,_cli.1}
-
-	dodoc ChangeLog README
-	use wps && dodoc README-WPS
-
-	docinto examples
-	dodoc wired.conf
-
-	if use logwatch; then
-		insinto /etc/log.d/conf/services/
-		doins logwatch/${PN}.conf
-
-		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/${PN}
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "In order to use ${PN} you need to set up your wireless card"
-	einfo "for master mode in /etc/conf.d/net and then start"
-	einfo "/etc/init.d/${PN}."
-	einfo
-	einfo "Example configuration:"
-	einfo
-	einfo "config_wlan0=( \"192.168.1.1/24\" )"
-	einfo "channel_wlan0=\"6\""
-	einfo "essid_wlan0=\"test\""
-	einfo "mode_wlan0=\"master\""
-	einfo
-	if use madwifi; then
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should remerge ${PN} after upgrading these packages."
-		einfo
-		einfo "Since you are using the madwifi-ng driver, you should disable or"
-		einfo "comment out wme_enabled from ${PN}.conf, since it will"
-		einfo "cause problems otherwise (see bug #260377"
-	fi
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
-	#	einfo "This package now compiles against the headers installed by"
-	#	einfo "the kernel source for the mac80211 driver. You should "
-	#	einfo "re-emerge ${PN} after upgrading your kernel source."
-	#fi
-
-	if use wps; then
-		einfo "You have enabled Wi-Fi Protected Setup support, please"
-		einfo "read the README-WPS file in /usr/share/doc/${P}"
-		einfo "for info on how to use WPS"
-	fi
-}
diff --git a/net-wireless/hostapd/hostapd-1.1.ebuild b/net-wireless/hostapd/hostapd-1.1.ebuild
deleted file mode 100644
index 76620b5d05a4..000000000000
--- a/net-wireless/hostapd/hostapd-1.1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-1.1.ebuild,v 1.1 2012/12/03 09:18:15 gurligebis Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="debug ipv6 logwatch madwifi +ssl +wps +crda"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	kernel_linux? (
-		dev-libs/libnl:3
-		crda? ( net-wireless/crda )
-	)
-	madwifi? ( ||
-		( >net-wireless/madwifi-ng-tools-0.9.3
-		net-wireless/madwifi-old ) )"
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-src_prepare() {
-	cd ..
-	epatch "${FILESDIR}/${P}-libnl_path_fix.patch"
-	epatch "${FILESDIR}/${P}-tls_length_fix.patch"
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		"${S}/hostapd.conf" || die
-}
-
-src_configure() {
-	local CONFIG="${S}/.config"
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-
-	if use ssl; then
-		# SSL authentication methods
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-	fi
-
-	if use wps; then
-		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG}
-		echo "CONFIG_WPS2=y" >> ${CONFIG}
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-		einfo "Enabling Wi-Fi Protected Setup support"
-	fi
-
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-
-	einfo "Enabling drivers: "
-
-	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-	einfo "  Prism54 driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
-	einfo "  None driver enabled"
-
-	if use madwifi; then
-		# Add include path for madwifi-driver headers
-		einfo "  Madwifi driver enabled"
-		echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG}
-		echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
-	else
-		einfo "  Madwifi driver disabled"
-	fi
-
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-	echo "LIBS += -L/usr/lib" >> ${CONFIG}
-
-	# misc
-	echo "CONFIG_PKCS12=y" >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_IAPP=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
-	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
-
-	if use ipv6; then
-		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	if ! use debug; then
-		echo "CONFIG_NO_STDOUT_DEBUG=y" >> ${CONFIG}
-	fi
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# Removed for now, since the 3.2 version is broken, and we don't
-	# support it.
-	if has_version ">=dev-libs/libnl-3.2"; then
-		echo "CONFIG_LIBNL32=y" >> .config
-	fi
-
-	# TODO: Add support for BSD drivers
-
-	default_src_configure
-}
-
-src_compile() {
-	emake V=1
-
-	if use ssl; then
-		emake V=1 nt_password_hash
-		emake V=1 hlr_auc_gw
-	fi
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
-
-	fperms -R 600 /etc/${PN}
-
-	dosbin ${PN}
-	dobin ${PN}_cli
-
-	use ssl && dobin nt_password_hash hlr_auc_gw
-
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-
-	doman ${PN}{.8,_cli.1}
-
-	dodoc ChangeLog README
-	use wps && dodoc README-WPS
-
-	docinto examples
-	dodoc wired.conf
-
-	if use logwatch; then
-		insinto /etc/log.d/conf/services/
-		doins logwatch/${PN}.conf
-
-		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/${PN}
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "In order to use ${PN} you need to set up your wireless card"
-	einfo "for master mode in /etc/conf.d/net and then start"
-	einfo "/etc/init.d/${PN}."
-	einfo
-	einfo "Example configuration:"
-	einfo
-	einfo "config_wlan0=( \"192.168.1.1/24\" )"
-	einfo "channel_wlan0=\"6\""
-	einfo "essid_wlan0=\"test\""
-	einfo "mode_wlan0=\"master\""
-	einfo
-	if use madwifi; then
-		einfo "This package compiles against the headers installed by"
-		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
-		einfo "You should remerge ${PN} after upgrading these packages."
-		einfo
-		einfo "Since you are using the madwifi-ng driver, you should disable or"
-		einfo "comment out wme_enabled from ${PN}.conf, since it will"
-		einfo "cause problems otherwise (see bug #260377"
-	fi
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
-	#	einfo "This package now compiles against the headers installed by"
-	#	einfo "the kernel source for the mac80211 driver. You should "
-	#	einfo "re-emerge ${PN} after upgrading your kernel source."
-	#fi
-
-	if use wps; then
-		einfo "You have enabled Wi-Fi Protected Setup support, please"
-		einfo "read the README-WPS file in /usr/share/doc/${P}"
-		einfo "for info on how to use WPS"
-	fi
-}
diff --git a/net-wireless/hostapd/hostapd-2.0.ebuild b/net-wireless/hostapd/hostapd-2.0.ebuild
index c1f8c68dae88..4d94030c02e0 100644
--- a/net-wireless/hostapd/hostapd-2.0.ebuild
+++ b/net-wireless/hostapd/hostapd-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.0.ebuild,v 1.2 2013/04/29 18:30:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.0.ebuild,v 1.3 2013/04/29 18:35:53 scarabeus Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 IUSE="ipv6 logwatch madwifi +ssl +wps +crda"
 
 DEPEND="ssl? ( dev-libs/openssl )