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

(Portage version: 2.2_rc7/cvs/Linux 2.6.26.2 i686)

6 files changed, 17 insertions, 60 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/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>