Bumping to 2.2, fixing #512606

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

4 files changed, 14 insertions, 49 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 1671d6ab8c68..5bf9f10aabd6 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.148 2014/05/01 01:22:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.149 2014/06/06 16:23:18 gurligebis Exp $
+
+*hostapd-2.2 (06 Jun 2014)
+
+  06 Jun 2014; <gurligebis@gentoo.org> -hostapd-2.1-r1.ebuild,
+  +hostapd-2.2.ebuild, -files/hostapd-2.1-Fix-nt_password_hash-build.patch:
+  Bumping to 2.2, fixing #512606
 
   01 May 2014; Mike Frysinger <vapier@gentoo.org>
   +files/hostapd-2.1-Fix-nt_password_hash-build.patch, hostapd-2.1-r1.ebuild:
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 39528561bbcc..eb8138e45d35 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -2,30 +2,19 @@
 Hash: SHA256
 
 AUX hostapd-2.0-tls_length_fix.patch 1859 SHA256 bbca0422a0babbf9d7fad2b758ecddaae45624db1b2db6d7663292548e25906a SHA512 e354e9352605003101cba296735232d11ac685f1db8718e5d59b55de1b86b55144e4871afe85cae4374f52af1b42df3ebd4747e109c86e0750ef9eb5345453d7 WHIRLPOOL 6a9379b09ffb73d13ea813952e2b39b5ab90ec98a27ed211ff2904d52e346c9e6273fe99e8ae6509773597afa352d9e77f3081103c5e5c55c86e12f8176a5419
-AUX hostapd-2.1-Fix-nt_password_hash-build.patch 653 SHA256 0bfbe9928b9bf7660bf9c452a92e4b65bb4b0377ff420b5778d1f6641e2664f8 SHA512 ebf2633faa25f1f2252f286324ec04687b58122084f306f81c99c5b93c7b884734473ea1b4bb1c13841a678cd82ebd59eefaf555f6dcf14189496a967ddfc930 WHIRLPOOL 1d2a635c5282277f1984a9c2f52559cd3b6e1dfdc92fe270e44eb33347e7d85bd5febc1a848780aa6f802512be5ab63f9ea1bd6d2980ce8bb577d8040b269225
 AUX hostapd-conf.d 245 SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d SHA512 f07a6cd209eca351b8545017c5f025282c3fdea838ca3df49e362571ded43973281ce4ff83984b1299db15ea9b5c21a42cbda91432220af9146bf034e2265c30 WHIRLPOOL 0ab1dbd8e04df9e7b8ae875dfdfdcdd770e4fcb62197bb81e47588a9ecf0b8bb715adbde34f2be82d630fdd536e9f888f463dd12cab0c06220c345b0093a3dd5
 AUX hostapd-init.d 858 SHA256 b9701b9ea509638ee1ed74bec38a22e6bd7358763497ce53c146d2faf9e97a61 SHA512 f34c28422aad0ccc7f144ce391f908d38cac2a04785358337f962da401449ca83e310714f9d852cec9c119d7d2457b9264309b87a553f194b3cde66686000c2d WHIRLPOOL 456dd8982344e31a9c198fbc66d27e2f5080abcf974bced857ecfc5825ac8212829383525cbe81edfda01323133414a62eada9af84f3c80424077dcb7d822217
 AUX hostapd.service 213 SHA256 16f0612c192fb5d7e7de716f25fdfc2ccecc35a00ff745ae67e02d7292558d8f SHA512 4d1a1619c49ad0272f360d2c9d79f2fd30503786fe8f22dd3fc4abcc39176029fe907c79d22f168c100b0d7b4ac969b5f4b5815d5ebe6805db5881dda69eef29 WHIRLPOOL 3e415fa8068aa429cb37c7957d396d5e261b5843ae06eb81370728be36573e59e90707c7047b336eb82562e98017608e712ceb28afe2bae385b2821e1cdbd856
 DIST hostapd-2.0.tar.gz 1376203 SHA256 262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35 SHA512 25fddaaddb22903078cfaae29a1e955b60955f9f5542b52962a6a8d4c65146ca102e9ac085118ce422843c55349a74a019220dfd4926895e301d506dbc97b967 WHIRLPOOL e5ae2e760770d2f307b1c4235c9b0c9d25e1719a1d174efa30ce6bbbc07b5c46d5f7babc087b8f450f3b485fb640728ddd23761fb292bcd535ef38dc10ac1d45
-DIST hostapd-2.1.tar.gz 1490215 SHA256 5c7110f55b6092e5277e26edc961eda2def12b94218129d116f5681e34bb2f88 SHA512 d39291fd7b7b886de54dbf64740b5404f6b154af35dc568c51dbd90584b352c2422d1f89ae25ca705ecd6a55ca011b1f3efad8eaa450e6077a322bf7f3551b7f WHIRLPOOL f2342a71f61d9453a41657f5b603ff11b97402eafbbad1c43525fd8e85d96cdccc457123d55660d1abe01963d517961b5be08d77f1282d7ae24c8f843a25e8a6
+DIST hostapd-2.2.tar.gz 1586482 SHA256 f15b6bcb434378860ea5b88dffed7f54d8cb71fff2146de0f006977a5e25a882 SHA512 d232442bed447218bcdee820c3ffcb1f87e0fe32c1ece8667c7ce411f7647a53dd19ead5570d5dec275da8cbdee10d5d8545cb6d44eba143bb6beb581594f696 WHIRLPOOL 7b88c14f9714c28d7b6d2cf3007a9e07aa1e5393dcc4e3b234307bbd07844c44c456fc5b01fb11a5d26f47e22d66625f93bfa5bae1359c4e4c8fd59258117c56
 EBUILD hostapd-2.0-r1.ebuild 5305 SHA256 fd9f173491b4b778b5a94f3366f273a0d875bdd453f5ad0cb70d4d3eb3dba8cc SHA512 66458b93a1c8cfc0ea3d2eebf67d836459a470b0016b33e3de658122ec66e0ee617d08102b7c6dcccb009b38617c73aa681854479c107631ff5a1608185837ff WHIRLPOOL d478bd9477a45c6ed1ae0cde85990561444f86d957695c3f2029cde0eed6f1940b6250c1d27197b507f4538e650396ce75985c3be15b2c3495e69411820002d7
-EBUILD hostapd-2.1-r1.ebuild 5422 SHA256 b07b58db1b1772d59b202b32140467c98810a91365ecb920ec66446701c5ec79 SHA512 b27213c27e856120e2cb1a805f59fb90d7dae94e0a5b9884cdf0e50fa1aa4fa271828148f688f3472a48d6e8e28250b9182a4472d15c3a76eac1a6850a00fe9a WHIRLPOOL a975e6e7f56ec4e40d746e369c87ed2dc0000f37253d975d4be02b86c6b00fa3b06db4dc8316f584055ae16ca01e6a4668b0fc25850da169f701b8f94fc653dd
-MISC ChangeLog 25830 SHA256 0445a315bcd657bb04be9c95c1b22b5913826084d5d4ce15963b9bb64e43877d SHA512 d68e3da765a2be58fb0c3d1d5ae2b7eb681e0a4d0d80b87e402552d62a3b89afddcefca032e51073a31fef50784b4d22e2d328d34082349b1242387c60b2f195 WHIRLPOOL 6d117074943d1ed930b7627e53d5bf4a2836d1052d4a16dcaffd7c470d019b2b20f530cb85e7085d9f91e4cef2bd39291d4baaf42b6de9193dc716bf84284c44
+EBUILD hostapd-2.2.ebuild 5363 SHA256 be41bb2791fe5cadf909c0e02452f4a739dc7d54a45895906b5978bb3abe2e0f SHA512 c30e152553d31f28542097919077705882a343c45f8a29d6785357de47fc6b758f0198ed52cb85a3a9ad2094101ee8b6bd348ce58c9218e95ab79f2a0b3f93ca WHIRLPOOL 7f6bfb0b60df9ca7099611bbc69f8315853f4f6ccdb7f64c03f4355c3605078b42b64b8e64bc2abcda9c1028669f3484c5223a7c9193406a0f12f69d4aebc55d
+MISC ChangeLog 26035 SHA256 2f0014587513078d74c84de3a0e0b245c0b58bdc7d6481988c282d78168704e4 SHA512 4955be6ceb96ec5564c3c1c936953fa46b53aa3e5f46c2501b85a4d3ea982a05423718b066de144bd632c9b1a79c22b33cb12f6eb014ee5093fd16f8a30cb735 WHIRLPOOL 0f6283ae089302fe60ea0cac36a7d979904be25072c118208dcfa6009a654e0da52715aada34a5d4eac432a7248c50f87b26661c28f1ffca6d60adcae9321a61
 MISC metadata.xml 730 SHA256 0bb3f91ee921b846bebb28e76e38c4e6245ae00980c9ae3406e412ccde4a3df5 SHA512 590f1ade1d08af7f408893973fdb7589e30f6a9485a7d121581f15287075d2707fa1c0d54a666dd0ff217bc375c5d6064d652185a7649e425702b8f723e5a606 WHIRLPOOL ae4488bcbd1e0ea7f1529fb9627599a2c4a5de31747739256bb6373e9338ec23f8538ce841d6beacdaf46752815d0e8112cf28da683749c42bf18bcaa7dfebde
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTYaHrAAoJEPGu1DbS6WIAbKYQAJgPWGqktGmZBRwruUStk24r
-fXmBGTwRT3cOXFqquzKryGKf0RBcYMaXgoAZJNu7lHk+wpAuSpaJ2e+rzngw1pZv
-ax81r6UIVh+WDOADV0wiD5mcG8zAYdRQMYOvitSliCXsXkpPCZqQX1K3gjFFCuxb
-THwy5p/5cAth/GoIUe/I74iqcchTaSxG074YsJkKcC0PH2Y/c0sFX+c5e+kQ4oaj
-SyKn/CbJ5ao8FubyN+X7CXnIwNmQkk7FUG+Wzp/Z/p0s7qQPJfYX5l4ZTQQ6I8+i
-dVC2AOZHNLxfP/x3u4WiFv7iPkfCUk5bQXQw/ViedYmS0mji9WXWnN+EwjKgvuHx
-FJjKwLS8ECUyXLev4LOzohJ+JRLjZsk1wSC7a6J2VXucOtu27XRgg8a5r63rjXVC
-CVICzrx25I+ZQ/Yfy3ma93b8HRr6kTbAE3SIC6tQxzFmx5pAUPsLSSh/MUhtG5LL
-wsfkujEvvCc0XjUe4o7fdgRHb5kgQctAm+zw6DbLUfDGBF32wWbaKKbN6HI4o6G+
-v/yTJ8E+CT73h9RgfqLzFlaqc0ljd8I4WXwCDEjpA9Edea38Nf16z0bODEjKhdqD
-m3lF4hG8RRkUZLYAYrU3ht3P/Di2/kXQELVPk331h4VxZcepfp+NUMVzsXZwkmWQ
-ql8xjk/0AfoMVeEogKOn
-=Uq8h
+iEYEAREIAAYFAlOR6vcACgkQsR7PQhRXYElUMACcDUBkRu0HnOFga85JcRs422Yv
+hPEAnAwUK6bWHJ71gdu5wGjl9Ds9hM8B
+=HvO6
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/hostapd/files/hostapd-2.1-Fix-nt_password_hash-build.patch b/net-wireless/hostapd/files/hostapd-2.1-Fix-nt_password_hash-build.patch
deleted file mode 100644
index c8f745fef17d..000000000000
--- a/net-wireless/hostapd/files/hostapd-2.1-Fix-nt_password_hash-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-fix from upstream git repo
-
-From 9aab81145a6ce26272b198419d288a0417e683c5 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sat, 15 Feb 2014 11:49:09 +0200
-Subject: [PATCH] Fix nt_password_hash build
-
-This needs librt on some systems for clock_gettime().
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- hostapd/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hostapd/Makefile b/hostapd/Makefile
-index 5fd6481..ef093e5 100644
---- a/hostapd/Makefile
-+++ b/hostapd/Makefile
-@@ -95,6 +95,7 @@ ifeq ($(CONFIG_ELOOP), eloop)
- LIBS += -lrt
- LIBS_c += -lrt
- LIBS_h += -lrt
-+LIBS_n += -lrt
- endif
- 
- OBJS += ../src/utils/common.o
--- 
-1.9.2
-
diff --git a/net-wireless/hostapd/hostapd-2.1-r1.ebuild b/net-wireless/hostapd/hostapd-2.2.ebuild
index 0528214cc799..5be072600b33 100644
--- a/net-wireless/hostapd/hostapd-2.1-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.1-r1.ebuild,v 1.3 2014/05/01 01:22:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.2.ebuild,v 1.1 2014/06/06 16:23:18 gurligebis Exp $
 
 EAPI="4"
 
@@ -28,7 +28,6 @@ RDEPEND="${DEPEND}"
 S="${S}/${PN}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Fix-nt_password_hash-build.patch
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
 		"${S}/hostapd.conf" || die
 }