Bumping to 0.6.7 and adding WPS support to the ebuild

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 i686

6 files changed, 39 insertions, 15 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/Manifest b/net-wireless/hostapd/Manifest
index f2c47a516fcd..06609333e02b 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 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.6-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
-AUX hostapd-0.6.6-init.d 960 RMD160 30a6d81d95694792560dba1a57b0abf2748b686b SHA1 8522062a527ac83ea6da123ba2044e1bfc46e8e0 SHA256 7fff78c40b8da30d93f0243c02db4adf3a95f6a60706968e161f2098356dd653
+AUX hostapd-0.6.7-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88865c313bf1ffbc168029a13c76f288280a3d SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d
+AUX hostapd-0.6.7-init.d 960 RMD160 96c3d7fb6b5acaf3c487828f2738ec05f906127d SHA1 1c4a2e41ac5c4862a4a6031cd0b8ce17f7f69d9a SHA256 7cad1f5f7b610dc8472bae5aed62afcc1d29ffe734a54b5da29ca95e14f6c869
 DIST hostapd-0.5.10.tar.gz 460973 RMD160 405b1d66c718c4050a55b78b530c7dc9f6f4db7d SHA1 2499b7f16d3130c3f956f3b3e01307337dab0bd4 SHA256 a99908d5765757ad6025b57d5ecf43b412aaaaf2ca379c02aafa33ca5c9d35c1
-DIST hostapd-0.6.6.tar.gz 952453 RMD160 e3a3e042ca3f1ab8417c4927d1c8e7d2465a1767 SHA1 392b404f5cd26bdf2fe593227a50d977770f640d SHA256 cdc8effe0b9fc22c8c02bcd7512c0365bfbd8b77e063fe7db9356b86d3780701
+DIST hostapd-0.6.7.tar.gz 1023237 RMD160 aea280c3e899f890db9b4966fadd61bf72d056d3 SHA1 4085b0607e1e190eeb027db52542585564940ad6 SHA256 7b7dde87d144fc39f8282f6ddc2b049fc5d55a267089d7a13be406514477916f
 EBUILD hostapd-0.5.10.ebuild 3526 RMD160 adf82df4f3d978cd5cf2fa0da2546c0ca3995436 SHA1 87b442131296e03b7aca7e34453718866ba52b13 SHA256 efd3c943c2b4f23634056eb78b0aacf782469c926f32dea01044e4b582d545a5
-EBUILD hostapd-0.6.6.ebuild 4713 RMD160 8984c44c64a01bd9a1dc3e64292b7c935371210c SHA1 f12ecda06087337d5ea1010ded68c168f3185e9b SHA256 d2cbd9c4831997811b10a32b52aed463a71106749451c7c02ee393ec85522ebd
-MISC ChangeLog 16400 RMD160 3fe389c5c25d2298d00683e284200d8ef5a47c29 SHA1 7f182bf196bf68a2d988feb869a36eba81d82e8e SHA256 2e3df5388b139604b9eaf992f26b2b6e5887882d8c91c6f3b13475e0ba6cb56b
-MISC metadata.xml 642 RMD160 e922730be1aa39081aaa661a0c6f8311bacb38e5 SHA1 58be18f8e0ca20f6868a5d618ca851fd17e0b804 SHA256 d61af466abfda259babc9e374828a951b4ccaf072fe149c35ad4fa52965fb639
+EBUILD hostapd-0.6.7.ebuild 5081 RMD160 1842134e1ffd7aa3894451d9df5b24dfbb8848bb SHA1 d807972c8d3d9209146487c9d9c373e2c45b6dcc SHA256 32113d6c1aced527f4dfbceec40c46c2d6debb272377ec3e2d56081076f56d13
+MISC ChangeLog 16731 RMD160 71c6781fb463a84f1b95c014e02352520eb1b62c SHA1 178efcd1707e051689ae32a776737c962d0b906e SHA256 5090d49df610caf4253be4cc983f6a75df106fc900b5b2b1d82a74305b509152
+MISC metadata.xml 706 RMD160 f4b7cada9bc0fc7a61b06034bad7ab67329b0024 SHA1 2ee15103693cd61494f028cb751a5da34d9363b8 SHA256 34d8518e44ebb430b9c87471a17fac1d60a08feabae7d2d4b0e74cf2f39f17b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklY7XsACgkQsR7PQhRXYEmn3ACfY9mWph0ElVtIbMeGkcU6GgM7
-V3wAnR3Nqk9ehEfy6Xs4oD98xQwSv3UM
-=ZPU7
+iEYEARECAAYFAklj0EQACgkQsR7PQhRXYElToQCfSIz1bIr3gau7YDCu/A+Xo29h
+xkcAn2szpXBrKKL03cwQ7R/yr8sNpzZe
+=gS/N
 -----END PGP SIGNATURE-----
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>