Adding 1.0_rc2 to allow people help testing, hardmasked for now.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

3 files changed, 214 insertions, 6 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 95c8c53ab450..257ed4358bc6 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/hostapd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.116 2011/11/07 19:50:23 gurligebis Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.117 2012/02/03 13:45:13 gurligebis Exp $
+
+*hostapd-1.0_rc2 (03 Feb 2012)
+
+  03 Feb 2012; <gurligebis@gentoo.org> +hostapd-1.0_rc2.ebuild:
+  Adding 1.0_rc2 to allow people help testing, hardmasked for now.
 
   07 Nov 2011; <gurligebis@gentoo.org> hostapd-0.7.3.ebuild:
   Fixing compiling with both libnl-1.1 and libnl-3 installed.
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 41066a75865a..ea5c5c5fdf4a 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -5,14 +5,16 @@ AUX hostapd-conf.d 245 RMD160 88b816218cb37d32fd940db17ece84d612c87f14 SHA1 0d88
 AUX hostapd-init.d 1022 RMD160 cb6380788253a43d6078c498fcfc7d37c4881d1b SHA1 68911ad9af83ab7a77a8e12ddc6f4f5337aa4d19 SHA256 a220058841e66a11603df8e968ccc68945f01e1d11c1ae498922d0e01f6fa804
 DIST hostapd-0.6.9.tar.gz 1089548 RMD160 1faf1728984756b54ee353af4ed6d173259a953d SHA1 80d1d3922fc0daf2aab2d41a2e37172d5371cf4f SHA256 4430fe2c7a2176c6890ac3a726a8b3d234a77beb3ca987b4349c467331343e67
 DIST hostapd-0.7.3.tar.gz 1138869 RMD160 3d901166172cf634ecab4bd8426a33695b1e1070 SHA1 7a8853fe41ee5a2b9f03f608cf7a61c7ccea4f4c SHA256 31eb2781f37e1a4c27969d1594f8019c0ca87779349c099ab812833289961567
+DIST hostapd-1.0_rc2.tar.gz 1355673 RMD160 54c6385d38107b790afc8d5733260d4f7fcae4b5 SHA1 9d3098205ef90ae83ea4d6567c59a66a82674f96 SHA256 220fa9bc0a1c39292b02260006ab243bbd9d40fcf24f8c0b15893404c4184d74
 EBUILD hostapd-0.6.9.ebuild 4944 RMD160 aba691ebb072690d797efc69fce5060b266b4dc2 SHA1 5846215d386be8bb9958b57b2ed635567b3153b8 SHA256 77cd820909657b2c4af65228831a893c7eed7bc8d82d389a4148078407fbc2d2
 EBUILD hostapd-0.7.3.ebuild 5296 RMD160 c4505a08f56680c86459d1d93e65c5af1b02b382 SHA1 264f8975d94725e6d4acb9f7514a07fcda8224ff SHA256 22024793677560a1c7f7dcbfbab76dcbe94859132fefcf0570b93448fffed216
-MISC ChangeLog 21072 RMD160 cbbc008c88816d49e52c7ed38b23cdee5b3f915b SHA1 8e36be03d987ee18e654ba3908eb79ff60754c06 SHA256 128decd394df1118f8540597afa5bbb940679ddc70e850425040ceb0d93c86ec
+EBUILD hostapd-1.0_rc2.ebuild 5398 RMD160 df202373f5762052541b84ddf472d820a131501f SHA1 2cb50af0e6bc29b8388c6bb00af49ea9bc3afafd SHA256 2cf24a5791a60c1a0cecee8bb7a7cf4d3fd1298e2534d4d271c3ecdb4c3a39b9
+MISC ChangeLog 21236 RMD160 54df744a0c62e322e923278fe1683e8a54255449 SHA1 307fd1de86e50b4ed0a860fef84deab3b3bd5e16 SHA256 a9be2634093a3c6e607d0fec78a051164b635553d3a9ee52d7831d1a55cea2de
 MISC metadata.xml 752 RMD160 f895add3fe282efb5fd3fba223d16b28fabe2e9e SHA1 1c4e58ae3628f9c433d939e5d973e1c795aa58f6 SHA256 78c8bab11c00f4988d677b1f4bf5a66c3221c0f9a3c46cfaf333a8857f250662
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk64NnMACgkQsR7PQhRXYEklIgCgg1/rSQKxyoB/LIWqlkOAZ9Xg
-/bgAn0Qm5vHnTl80NKCQXFHcvCnU0r31
-=xk1I
+iEYEARECAAYFAk8r5I8ACgkQsR7PQhRXYEnaTACePkfaf96vHcGs3A67cr7AMLlS
+VCAAoIT94L8fB3YbOOGhvE6g1OwPunZK
+=/MiX
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/hostapd/hostapd-1.0_rc2.ebuild b/net-wireless/hostapd/hostapd-1.0_rc2.ebuild
new file mode 100644
index 000000000000..ef68baaefaac
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-1.0_rc2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-1.0_rc2.ebuild,v 1.1 2012/02/03 13:45:13 gurligebis Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+#SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~gurligebis/files/hostapd/hostapd-1.0_rc2.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="-*"
+IUSE="debug ipv6 logwatch madwifi +ssl +wps"
+
+DEPEND="ssl? ( dev-libs/openssl )
+	dev-libs/libnl:1.1
+	madwifi? ( ||
+		( >net-wireless/madwifi-ng-tools-0.9.3
+		net-wireless/madwifi-ng ) )"
+RDEPEND="${DEPEND}"
+
+S="${S}/hostapd"
+
+src_prepare() {
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		"${S}/hostapd.conf"
+}
+
+src_configure() {
+	local CONFIG="${S}/.config"
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# EAP authentication methods
+	echo "CONFIG_EAP=y" >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+	if use ssl; then
+		# SSL authentication methods
+		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+	fi
+
+	if use wps; then
+		# Enable Wi-Fi Protected Setup
+		echo "CONFIG_WPS=y" >> ${CONFIG}
+		echo "CONFIG_WPS2=y" >> ${CONFIG}
+		echo "CONFIG_WPS_UPNP=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}
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+
+	einfo "Enabling drivers: "
+
+	# drivers
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	einfo "  HostAP driver enabled"
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	einfo "  Wired driver enabled"
+	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
+	einfo "  Prism54 driver enabled"
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	einfo "  None driver enabled"
+
+	if use madwifi; then
+		# Add include path for madwifi-driver headers
+		einfo "  Madwifi driver enabled"
+		echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG}
+		echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
+	else
+		einfo "  Madwifi driver disabled"
+	fi
+
+	einfo "  nl80211 driver enabled"
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+	echo "LIBS += -L/usr/lib" >> ${CONFIG}
+
+	# misc
+	echo "CONFIG_PKCS12=y" >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_IAPP=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+
+	if use ipv6; then
+		# IPv6 support
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	if ! use debug; then
+		echo "CONFIG_NO_STDOUT_DEBUG=y" >> ${CONFIG}
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	#if has_version ">=dev-libs/libnl-2.0"; then
+	#	echo "CONFIG_LIBNL20=y" >> .config
+	#fi
+
+	# TODO: Add support for BSD drivers
+
+	default_src_configure
+}
+
+src_compile() {
+	default_src_compile
+
+	#emake || die "emake failed"
+
+	if use ssl; then
+		emake nt_password_hash || die "emake nt_password_hash failed"
+		emake hlr_auc_gw || die "emake hlr_auc_gw failed"
+	fi
+}
+
+src_install() {
+	insinto /etc/hostapd
+	doins hostapd.conf hostapd.accept hostapd.deny \
+		hostapd.eap_user hostapd.radius_clients hostapd.sim_db hostapd.wpa_psk
+
+	dosbin hostapd
+	dobin hostapd_cli
+
+	use ssl && dobin nt_password_hash
+	use ssl && dobin hlr_auc_gw
+
+	newinitd "${FILESDIR}"/${PN}-init.d hostapd
+	newconfd "${FILESDIR}"/${PN}-conf.d hostapd
+
+	doman hostapd.8 hostapd_cli.1
+
+	dodoc ChangeLog README
+	if use wps; then
+		dodoc README-WPS
+	fi
+
+	docinto examples
+	dodoc wired.conf
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/hostapd.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/hostapd
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "In order to use ${PN} you need to set up your wireless card"
+	einfo "for master mode in /etc/conf.d/net and then start"
+	einfo "/etc/init.d/hostapd."
+	einfo
+	einfo "Example configuration:"
+	einfo
+	einfo "config_wlan0=( \"192.168.1.1/24\" )"
+	einfo "channel_wlan0=\"6\""
+	einfo "essid_wlan0=\"test\""
+	einfo "mode_wlan0=\"master\""
+	einfo
+	if use madwifi; then
+		einfo "This package compiles against the headers installed by"
+		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
+		einfo "You should remerge ${PN} after upgrading these packages."
+		einfo
+		einfo "Since you are using the madwifi-ng driver, you should disable or"
+		einfo "comment out wme_enabled from hostapd.conf, since it will"
+		einfo "cause problems otherwise (see bug #260377"
+	fi
+	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+	#	einfo "This package now compiles against the headers installed by"
+	#	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
+}