Bumping to 0.6.7 and adding WPS support to the ebuild

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 i686)

5 files changed, 30 insertions, 6 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 1485deec5a33..d1d36888d53b 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.89 2008/12/29 13:31:54 gurligebis Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.90 2009/01/06 19:43:22 gurligebis Exp $
+
+*hostapd-0.6.7 (06 Jan 2009)
+
+  06 Jan 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -files/hostapd-0.6.6-conf.d, -files/hostapd-0.6.6-init.d,
+  +files/hostapd-0.6.7-conf.d, +files/hostapd-0.6.7-init.d, metadata.xml,
+  -hostapd-0.6.6.ebuild, +hostapd-0.6.7.ebuild:
+  Bumping to 0.6.7 and adding WPS support to the ebuild
 
   29 Dec 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
   hostapd-0.6.6.ebuild:
diff --git a/net-wireless/hostapd/files/hostapd-0.6.6-conf.d b/net-wireless/hostapd/files/hostapd-0.6.7-conf.d
index 7d05735eb3b4..7d05735eb3b4 100644
--- a/net-wireless/hostapd/files/hostapd-0.6.6-conf.d
+++ b/net-wireless/hostapd/files/hostapd-0.6.7-conf.d
diff --git a/net-wireless/hostapd/files/hostapd-0.6.6-init.d b/net-wireless/hostapd/files/hostapd-0.6.7-init.d
index 96e038f728e5..f42a75e1746f 100644
--- a/net-wireless/hostapd/files/hostapd-0.6.6-init.d
+++ b/net-wireless/hostapd/files/hostapd-0.6.7-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.6-init.d,v 1.1 2008/12/14 19:27:13 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.7-init.d,v 1.1 2009/01/06 19:43:22 gurligebis Exp $
 
 opts="start stop reload"
 
diff --git a/net-wireless/hostapd/hostapd-0.6.6.ebuild b/net-wireless/hostapd/hostapd-0.6.7.ebuild
index 705bac68f360..90c1ec4c37d3 100644
--- a/net-wireless/hostapd/hostapd-0.6.6.ebuild
+++ b/net-wireless/hostapd/hostapd-0.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.6.ebuild,v 1.2 2008/12/29 13:31:54 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.7.ebuild,v 1.1 2009/01/06 19:43:22 gurligebis Exp $
 
 inherit toolchain-funcs linux-info
 
@@ -11,7 +11,7 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ipv6 logwatch madwifi ssl"
+IUSE="ipv6 logwatch madwifi ssl wps"
 
 DEPEND="ssl? ( dev-libs/openssl )
 	>=dev-libs/libnl-1.1
@@ -40,6 +40,12 @@ generate_config() {
 		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
 	fi
 
+	if use wps; then
+		# Enable Wi-Fi Protected Setup
+		echo "CONFIG_WPS=y" >> ${CONFIG}
+		einfo "Enabling Wi-Fi Protected Setup support"
+	fi
+
 	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
 	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
 	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
@@ -136,6 +142,9 @@ src_install() {
 	doman hostapd.8 hostapd_cli.1
 
 	dodoc ChangeLog developer.txt README
+	if use wps; then
+		dodoc README-WPS
+	fi
 
 	docinto examples
 	dodoc wired.conf
@@ -173,4 +182,10 @@ pkg_postinst() {
 	#	einfo "the kernel source for the mac80211 driver. You should "
 	#	einfo "re-emerge ${PN} after upgrading your kernel source."
 	#fi
+
+	if use wps; then
+		einfo "You have enabled Wi-Fi Protected Setup support, please"
+		einfo "read the README-WPS file in /usr/share/doc/${P}"
+		einfo "for info on how to use WPS"
+	fi
 }
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 709b9e9745ea..604fe6fffc2e 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -15,5 +15,6 @@
 		<flag name='logwatch'>Install support files for
 			<pkg>sys-app/logwatch</pkg></flag>
 		<flag name='madwifi'>Add support for madwifi (Atheros chipset)</flag>
+		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
 	</use>
 </pkgmetadata>