Bumping to 0.6.5 and removing broken nl80211 check

(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc8 i686)

4 files changed, 15 insertions, 13 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 261db0c8dd75..5e14e1cab442 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.86 2008/08/23 05:21:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.87 2008/12/14 17:43:06 gurligebis Exp $
+
+*hostapd-0.6.5 (14 Dec 2008)
+
+  14 Dec 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -files/hostapd-0.6.4-conf.d, -files/hostapd-0.6.4-init.d,
+  +files/hostapd-0.6.5-conf.d, +files/hostapd-0.6.5-init.d,
+  -hostapd-0.6.4.ebuild, +hostapd-0.6.5.ebuild:
+  Bumping to 0.6.5 and removing broken nl80211 check
 
   23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-wireless/hostapd/files/hostapd-0.6.4-conf.d b/net-wireless/hostapd/files/hostapd-0.6.5-conf.d
index 7d05735eb3b4..7d05735eb3b4 100644
--- a/net-wireless/hostapd/files/hostapd-0.6.4-conf.d
+++ b/net-wireless/hostapd/files/hostapd-0.6.5-conf.d
diff --git a/net-wireless/hostapd/files/hostapd-0.6.4-init.d b/net-wireless/hostapd/files/hostapd-0.6.5-init.d
index 270b67de9676..379e1e795ac1 100644
--- a/net-wireless/hostapd/files/hostapd-0.6.4-init.d
+++ b/net-wireless/hostapd/files/hostapd-0.6.5-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.4-init.d,v 1.1 2008/08/11 21:13:16 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.5-init.d,v 1.1 2008/12/14 17:43:06 gurligebis Exp $
 
 opts="start stop reload"
 
diff --git a/net-wireless/hostapd/hostapd-0.6.4.ebuild b/net-wireless/hostapd/hostapd-0.6.5.ebuild
index 622611987655..3025290b0ba0 100644
--- a/net-wireless/hostapd/hostapd-0.6.4.ebuild
+++ b/net-wireless/hostapd/hostapd-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2008/08/11 21:13:15 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.5.ebuild,v 1.1 2008/12/14 17:43:06 gurligebis Exp $
 
 inherit toolchain-funcs linux-info
 
@@ -71,16 +71,10 @@ generate_config() {
 	if [[ ${KV_MAJOR} -ge 2 && ${KV_MINOR} -ge 6 || ${KV_PATCH} -ge 26 ]] ; then
 		# Test if header version is new enough (2.6.26+)
 		if [ "$(grep NL80211_MNTR_FLAG_COOK_FRAMES /usr/include/linux/nl80211.h)" ]; then
-			# Test to see if cfg.c contains to code to enable AP mode
-			if [ "$(grep NL80211_IFTYPE_AP: ${KV_DIR}/net/mac80211/cfg.c)" ]; then
-				einfo "  nl80211 driver enabled"
-				echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-				echo "CFLAGS += -I/usr/include/netlink" >> ${CONFIG}
-				echo "LIBS += -L/usr/lib" >> ${CONFIG}
-			else
-				einfo "  nl80211 driver disabled (due to no AP support in cfg.c file)"
-				einfo "  (To enable this, use the patch from http://johannes.sipsolutions.net/patches/kernel/all/LATEST until support gets added to the mainline kernel)"
-			fi
+			einfo "  nl80211 driver enabled"
+			echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+			echo "CFLAGS += -I/usr/include/netlink" >> ${CONFIG}
+			echo "LIBS += -L/usr/lib" >> ${CONFIG}
 		else
 			einfo "  nl80211 driver disabled (due to header version below 2.6.26)"
 		fi