Bumping to 2.1

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

3 files changed, 24 insertions, 26 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 47d5bac7bf83..b04c2b422b7a 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.143 2013/09/25 17:27:52 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.144 2014/02/12 10:30:27 gurligebis Exp $
+
+*hostapd-2.1 (12 Feb 2014)
+
+  12 Feb 2014; <gurligebis@gentoo.org> -hostapd-2.0.ebuild,
+  +hostapd-2.1.ebuild:
+  Bumping to 2.1
 
   25 Sep 2013; Agostino Sarubbo <ago@gentoo.org> hostapd-2.0-r1.ebuild:
   Stable for ppc, wrt bug #485340
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 5444c727b6b7..1da7011875c0 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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
 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
 EBUILD hostapd-2.0-r1.ebuild 5342 SHA256 d53845c9a46018be234a70894a875ea6500e546d2e12a40b0a3b556f3c91542f SHA512 d4d0c439f0da560eb4f4e28ab25d5ae4bd50f0c075d2472d9a8ef9f460d3680a2acf7bd5bfd92a9449ea73d605051574d11b695cd9b7729c18ae29daa3829b36 WHIRLPOOL 50d5b2ada0d38ae04a558b5d5c927e88af69081299fd60f9def3a0a752dda9316649cfe8de7028f561782048ef3c7577fa13d16ddfb3f00690af6d69b756ce2d
-EBUILD hostapd-2.0.ebuild 5220 SHA256 39a664ffe26617aa9dd82430c6bc9b12af3708c69bbd16cb203cb3767dce99ac SHA512 9989a617a7b5b42df69d947b4f58eb809b0ff8c5072e257932ba0f8a796c5f1489b7d8b13010e3da56c0a6c7070c59939b681e74bccc4d5fd202b743b6423382 WHIRLPOOL 3fde7a021d5503f68d260dbf11220b6de7683af6b712984b92c5891e90bf6eaf7dd39070c18342100b9b7b4b219ae1edbd71b8edb79f98b5c28cef6eb7726d19
-MISC ChangeLog 25037 SHA256 51bdcaf7f115a82909afe3b6ad73e54a5c6012c58f946c31fa9e1fb740b7d154 SHA512 82c83150c769ef182c95cf4a965ab52f0f8cc408865029920a98c7131e89331ed0edeb062df4eb8a1c0c262116fb2cfb48abf3350a10073a74f55b8b7674103c WHIRLPOOL e92151b1473b1f4be59cec8870c858942907d1b45e8af2d52d84d47fc34e0e187f3ba6aea680b7c0e29e414614cd30c7cf76361ff8535ab2a3e67fb65cf66e25
+EBUILD hostapd-2.1.ebuild 5365 SHA256 1a5d622186476142188b0a270636a838a76cb4aad9040e2108c5907d48b4b2a2 SHA512 ec47f98e80131478dfb36d638dfa3fc929fb2eb978743f7cbb8b132afd503bd42a2e8b93df66849e8bd599ee4f9e016dfa10cb92bc388f1ac8ba92262e00cb5d WHIRLPOOL bbcca5f0a6841f6232ead87bcdaf35096bbf1e179e477822d441d5911d288a759d20733296e8fa4c2d05277b533c63b5662ed29b6d462406d793930fe5bf48f6
+MISC ChangeLog 25173 SHA256 2bb37128981fdea285e13e988bc0564e93f9b7c985aab3f43cef8092d2bd37ca SHA512 1ebe84eec6a2b963b7992a2361f6285e3fe6d7f86baf9dd0abb291cce5e0ba9e83c77e5ce413447e5f1db408b390f731495d1e8a540fd2771e02e05d5c2e1898 WHIRLPOOL 9cc285017ee59ab8a75dfff55574864a8ced1a512f4b299a9478515b7ab490eb3a64f034d1333af97b8750dd9a9f9d562ca6c0d7f2e271a320f43a1c78784d71
 MISC metadata.xml 730 SHA256 0bb3f91ee921b846bebb28e76e38c4e6245ae00980c9ae3406e412ccde4a3df5 SHA512 590f1ade1d08af7f408893973fdb7589e30f6a9485a7d121581f15287075d2707fa1c0d54a666dd0ff217bc375c5d6064d652185a7649e425702b8f723e5a606 WHIRLPOOL ae4488bcbd1e0ea7f1529fb9627599a2c4a5de31747739256bb6373e9338ec23f8538ce841d6beacdaf46752815d0e8112cf28da683749c42bf18bcaa7dfebde
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSQxxHAAoJELp701BxlEWfxtYQAMgyvoEvwIrXHrN7X5FTsv8s
-HvT6PlQNYALWfOYrRXV0f1JVth6u6pZgdIjlvN1vzcUcmg2Qs8tZWuXfmz26KGub
-xkJDrQVC21CBik9Hn6OaZo6g5SAMJFWl93kNPV14/l/McYo36+yKiPUaUW3pBmYP
-e8KTAhVe4pzsaB6XETUz+8QdTjWrDxeESS8tzQNBV3EsIcFJf2XhhGMN6hJjB4lK
-Mm8lDu6a9Txn9QqiY4X+twb1CjIx8b+sWR8E7/rhe2M+9+8IO30k0xr89WZ5eh3Q
-OAC4idA9hkfmWBpfGAJ7U5CXMRRO4uMQrGljbZf4z3BV04Zn2LnOY0v6dvJZOXWc
-KAWg6dlk8TXl7GDdDJiBxYjWKcyOBvtiZF+mik8Tf7mnp6I1jMsXn8+h053Fn7tY
-hmmpctMjdqkIFcGJCoNiqw1zX6XLaucH47fWvbSt5JoLGhWd6/558y1OBZntsu+5
-NTAWG0A1R91xMTUQGrZ3he2qlPPYcUa4gIWcJriiqKdYpOodZljXrZA5gcz/zpbM
-scXpKd9UkiLbHxmWQhba+fPVWx7b7rpsV3OO5UXCC7vlpX1px6+nU0/nByrmQOPd
-nLaYCY1npZO49kCA1CICVodJ/pt+AJoBmVNfRNK/vzoL5jVPuN7NNSNH/jho+TAI
-vO5OsE36U/DHAJVsf2h6
-=MkJF
+iEYEAREIAAYFAlL7TUQACgkQsR7PQhRXYElzBQCfYIfiW756Ylzn+acCYmm8lvAa
+i98An28SMXhc4nGA6C838JH5bZbl9D5f
+=JnSx
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/hostapd/hostapd-2.0.ebuild b/net-wireless/hostapd/hostapd-2.1.ebuild
index 4d94030c02e0..b1868523c5e4 100644
--- a/net-wireless/hostapd/hostapd-2.0.ebuild
+++ b/net-wireless/hostapd/hostapd-2.1.ebuild
@@ -1,10 +1,10 @@
-# 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/hostapd/hostapd-2.0.ebuild,v 1.3 2013/04/29 18:35:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.1.ebuild,v 1.1 2014/02/12 10:30:27 gurligebis Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils systemd
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://hostap.epitest.fi"
@@ -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 )
@@ -28,9 +28,6 @@ RDEPEND="${DEPEND}"
 S="${S}/${PN}"
 
 src_prepare() {
-	cd ..
-	epatch "${FILESDIR}/${P}-tls_length_fix.patch"
-
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
 		"${S}/hostapd.conf" || die
 }
@@ -64,6 +61,7 @@ src_configure() {
 	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
 	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
 	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
 	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
 	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
 	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
@@ -105,6 +103,7 @@ src_configure() {
 	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
 	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
 	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
+	echo "CONFIG_ACS=y" >> ${CONFIG}
 
 	if use ipv6; then
 		# IPv6 support
@@ -145,6 +144,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
 	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
 
 	doman ${PN}{.8,_cli.1}
 
@@ -165,6 +165,7 @@ src_install() {
 
 pkg_postinst() {
 	einfo
+	einfo "If you are running openRC you need to follow this instructions:"
 	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}."