Bumping to version 0.6.4 and adding use flag info to metadata.xml

Package-Manager: portage-2.2_rc7/cvs/Linux 2.6.26.2 i686

7 files changed, 23 insertions, 67 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 5013c61cf676..2f2ad54f31ff 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.81 2008/07/11 20:50:41 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.82 2008/08/11 21:13:15 gurligebis Exp $
+
+*hostapd-0.6.4 (11 Aug 2008)
+
+  11 Aug 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -files/hostapd-0.6.3-conf.d, -files/004-nl80211-rename-STAT-to-INFO.patch,
+  -files/hostapd-0.6.3-init.d, +files/hostapd-0.6.4-conf.d,
+  +files/hostapd-0.6.4-init.d, metadata.xml, -hostapd-0.6.3-r1.ebuild,
+  +hostapd-0.6.4.ebuild:
+  Bumping to version 0.6.4 and adding use flag info to metadata.xml
 
   11 Jul 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
   hostapd-0.6.3-r1.ebuild:
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index b74209df714c..6596da513f5e 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,15 +1,14 @@
-AUX 004-nl80211-rename-STAT-to-INFO.patch 2420 RMD160 d56e98ce56278f1c17470a6acd28adbe6ba3bd48 SHA1 49eb31e187a8e1d5fb141a583991ce8bb813dc9c SHA256 a040e4a3baa8b7ded12992ba62225695b7c751ef73bbadd0a5fe2170c2357919
 AUX hostapd-0.4.9-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
 AUX hostapd-0.4.9-init.d 954 RMD160 f134d4131c899350606f9a672608dc5b2dfd143f SHA1 4ff32edd48023c2fa0052cdf0c2986c2d0e025be SHA256 1e346d22fa9a3bb3c100999552ca545f0650815411252a34f619b8bb8a2a90c2
 AUX hostapd-0.5.10-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
 AUX hostapd-0.5.10-init.d 961 RMD160 a0dd8c0f1778389da69776874689d5544b97bc7c SHA1 19c2423b561615bc81b921fbee633de14bba4907 SHA256 84476d23e2c3d12750abef94f5a75b442bf42c3d77c31eacbea25b1094844cd9
-AUX hostapd-0.6.3-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
-AUX hostapd-0.6.3-init.d 960 RMD160 4a44428ad55ee6a997ec441fd5d0dfb8dfb48eaf SHA1 914f50bdd70632acd0cdda2742af03afc67ed2ac SHA256 546bbbe80e889c80e8cd7f0a10c07d12f07f8de4c09634b092badc48c1df9424
+AUX hostapd-0.6.4-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
+AUX hostapd-0.6.4-init.d 960 RMD160 acfb356c69f710b33d438a1c74f8aba41114e52e SHA1 9597ceb8d1f286ccf277b4212a3edf328435e734 SHA256 26e6ad1bbc87fc18ec2c2adcd776b6bf5df4e41f7dc4ef8f24bf510bcb704de9
 DIST hostapd-0.4.9.tar.gz 291630 RMD160 aad20c52edf7b9bf5d22ebb600711815fa826310 SHA1 2ea6c9ee8e843c93366474a311131e90d9c91341 SHA256 cdcb40fdad82d766d6098b8fabe093c679b5abd416563d03cf655ed42915c8ef
 DIST hostapd-0.5.10.tar.gz 460973 RMD160 405b1d66c718c4050a55b78b530c7dc9f6f4db7d SHA1 2499b7f16d3130c3f956f3b3e01307337dab0bd4 SHA256 a99908d5765757ad6025b57d5ecf43b412aaaaf2ca379c02aafa33ca5c9d35c1
-DIST hostapd-0.6.3.tar.gz 890883 RMD160 0012b443fa61ccf555d182ef76f7b0f3232dbee5 SHA1 f9871e4cffbdcd71e4725d77112e98aa6270c7b8 SHA256 dd9de3b06c591dbf5a2b1c7d11c179e828a01ec3529ec625bd5ae6664aa0f44d
+DIST hostapd-0.6.4.tar.gz 933587 RMD160 75c74b6ad01e5e4e60b25a983cb5c7af8f9f6a28 SHA1 e1d058fc5f4573c7b103e60fe6179a967298cb88 SHA256 3d62a0079df247088640328cb40909033d8498871026ed197e0746a98a176c32
 EBUILD hostapd-0.4.9.ebuild 3104 RMD160 163c66b660c035a37c6c8807e7bf953d7c6ee4bf SHA1 1fc87ac61eb063f5995fc462835e4587ffc8607a SHA256 71b1c835f538e59795c24dd3d4fd3249ace973f8e32dff6ecfa1781fc5dd5733
 EBUILD hostapd-0.5.10.ebuild 3532 RMD160 1c1e3c790b460debc80b66a108951d0e23c3222a SHA1 7fc05a69c46789c82acf42078641ec67d2e99594 SHA256 3adc55012b8978bab0caf8d30a01c75a497a2e30cc7f07ff279c40f606c536ae
-EBUILD hostapd-0.6.3-r1.ebuild 5169 RMD160 8ce72f536351e06ab6d0949bc028e5d9c5a9641d SHA1 245868202175f9d3349d2eec77b2e86eb2750276 SHA256 270ffafbcb79b8d630e93b2ab480a564af0b3ba46a58a080927d74b171fb73c1
-MISC ChangeLog 14711 RMD160 11d063453db06855f47b25ccaa55d9cecaf66c57 SHA1 39b0753ed5f8e21d6b9c8b22bf08268b4caa4b88 SHA256 ac0a42c2de9a79feec64b9639927433450fce5aecebfd3ba50d9b36df6136cf9
-MISC metadata.xml 467 RMD160 f06fbc5b02928dfc4d096863710bcecf4346fd3d SHA1 4f5a511cb78a32d8d81666fba412133e957ca6ad SHA256 f2b7264f93feb662cca940e95a1e2bd5b5a2cdef3c9a99b9d67db7e26f5bbf18
+EBUILD hostapd-0.6.4.ebuild 5099 RMD160 c5ecf9a865f63d8c48acfacd7036b6fb0bc57446 SHA1 a633f34bea32a902e822ccd52cd552076a7d0cad SHA256 e77170a9b87105ef088dff3f13d38c8a89df6a23109ebc789aec7c0faea38a7e
+MISC ChangeLog 15105 RMD160 abcab2af718705e471d73ac76c3ddc21c96c84ca SHA1 faafd039e2f40485fdb41611b64720cdc96d2509 SHA256 63347e63c12298863a93e4d12daa63095e057d8bc5f3f7a4efefffc31b90c447
+MISC metadata.xml 620 RMD160 2c234c0f58544f7e21b80f4e88a650e565993294 SHA1 d364f997cd4ebd2c772689a8a0d1e94ecc3e4e0b SHA256 b64cbc4f938d4d7cd6e18e807d6ef02a53bd15d129addb3485f8a345db4ed86e
diff --git a/net-wireless/hostapd/files/004-nl80211-rename-STAT-to-INFO.patch b/net-wireless/hostapd/files/004-nl80211-rename-STAT-to-INFO.patch
deleted file mode 100644
index 7664a8633af0..000000000000
--- a/net-wireless/hostapd/files/004-nl80211-rename-STAT-to-INFO.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: hostapd-20071107_03ec0ec5cdb974d51a4a2a566bea4c4568138576/hostapd/driver_nl80211.c
-===================================================================
---- hostapd-20071107_03ec0ec5cdb974d51a4a2a566bea4c4568138576.orig/hostapd/driver_nl80211.c.orig	2008-04-09 14:03:17.000000000 +1200
-+++ hostapd-20071107_03ec0ec5cdb974d51a4a2a566bea4c4568138576/hostapd/driver_nl80211.c	2008-04-09 14:06:37.000000000 +1200
-@@ -598,11 +598,11 @@
- 	struct nlattr *tb[NL80211_ATTR_MAX + 1];
- 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
- 	struct hostap_sta_driver_data *data = arg;
--	struct nlattr *stats[NL80211_STA_STAT_MAX + 1];
--	static struct nla_policy stats_policy[NL80211_STA_STAT_MAX + 1] = {
--		[NL80211_STA_STAT_INACTIVE_TIME] = { .type = NLA_U32 },
--		[NL80211_STA_STAT_RX_BYTES] = { .type = NLA_U32 },
--		[NL80211_STA_STAT_TX_BYTES] = { .type = NLA_U32 },
-+	struct nlattr *stats[NL80211_STA_INFO_MAX + 1];
-+	static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = {
-+		[NL80211_STA_INFO_INACTIVE_TIME] = { .type = NLA_U32 },
-+		[NL80211_STA_INFO_RX_BYTES] = { .type = NLA_U32 },
-+		[NL80211_STA_INFO_TX_BYTES] = { .type = NLA_U32 },
- 	};
- 
- 	nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
-@@ -614,24 +614,24 @@
- 	 * the kernel starts sending station notifications.
- 	 */
- 
--	if (!tb[NL80211_ATTR_STA_STATS]) {
-+	if (!tb[NL80211_ATTR_STA_INFO]) {
- 		wpa_printf(MSG_DEBUG, "sta stats missing!");
- 		return NL_SKIP;
- 	}
--	if (nla_parse_nested(stats, NL80211_STA_STAT_MAX,
--			     tb[NL80211_ATTR_STA_STATS],
-+	if (nla_parse_nested(stats, NL80211_STA_INFO_MAX,
-+			     tb[NL80211_ATTR_STA_INFO],
- 			     stats_policy)) {
- 		wpa_printf(MSG_DEBUG, "failed to parse nested attributes!");
- 		return NL_SKIP;
- 	}
- 
--	if (stats[NL80211_STA_STAT_INACTIVE_TIME])
-+	if (stats[NL80211_STA_INFO_INACTIVE_TIME])
- 		data->inactive_msec =
--			nla_get_u32(stats[NL80211_STA_STAT_INACTIVE_TIME]);
--	if (stats[NL80211_STA_STAT_RX_BYTES])
--		data->rx_bytes = nla_get_u32(stats[NL80211_STA_STAT_RX_BYTES]);
--	if (stats[NL80211_STA_STAT_TX_BYTES])
--		data->rx_bytes = nla_get_u32(stats[NL80211_STA_STAT_TX_BYTES]);
-+			nla_get_u32(stats[NL80211_STA_INFO_INACTIVE_TIME]);
-+	if (stats[NL80211_STA_INFO_RX_BYTES])
-+		data->rx_bytes = nla_get_u32(stats[NL80211_STA_INFO_RX_BYTES]);
-+	if (stats[NL80211_STA_INFO_TX_BYTES])
-+		data->rx_bytes = nla_get_u32(stats[NL80211_STA_INFO_TX_BYTES]);
- 
- 	return NL_SKIP;
- }
diff --git a/net-wireless/hostapd/files/hostapd-0.6.3-conf.d b/net-wireless/hostapd/files/hostapd-0.6.4-conf.d
index 7d05735eb3b4..7d05735eb3b4 100644
--- a/net-wireless/hostapd/files/hostapd-0.6.3-conf.d
+++ b/net-wireless/hostapd/files/hostapd-0.6.4-conf.d
diff --git a/net-wireless/hostapd/files/hostapd-0.6.3-init.d b/net-wireless/hostapd/files/hostapd-0.6.4-init.d
index 447872066acd..270b67de9676 100644
--- a/net-wireless/hostapd/files/hostapd-0.6.3-init.d
+++ b/net-wireless/hostapd/files/hostapd-0.6.4-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.3-init.d,v 1.1 2008/03/11 08:45:55 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.4-init.d,v 1.1 2008/08/11 21:13:16 gurligebis Exp $
 
 opts="start stop reload"
 
diff --git a/net-wireless/hostapd/hostapd-0.6.3-r1.ebuild b/net-wireless/hostapd/hostapd-0.6.4.ebuild
index 10fe02348783..622611987655 100644
--- a/net-wireless/hostapd/hostapd-0.6.3-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-0.6.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.3-r1.ebuild,v 1.2 2008/07/11 20:50:41 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.4.ebuild,v 1.1 2008/08/11 21:13:15 gurligebis Exp $
 
-inherit toolchain-funcs linux-info eutils
+inherit toolchain-funcs linux-info
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="http://hostap.epitest.fi"
@@ -109,7 +109,6 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}/004-nl80211-rename-STAT-to-INFO.patch"
 
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
 		"${S}/hostapd.conf"
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 4cc994c16779..c1eb048fb918 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -11,4 +11,8 @@
 		Extended IEEE 802.11 management, IEEE 802.1X Authenticator,
 		RADIUS Authentication client, RADIUS Accounting client
 	</longdescription>
+	<use>
+		<flag name='logwatch'>Install support files for logwatch</flag>
+		<flag name='madwifi'>Add support for madwifi (Atheros chipset)</flag>
+	</use>
 </pkgmetadata>