diff options
author | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2010-01-14 14:36:18 +0000 |
---|---|---|
committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2010-01-14 14:36:18 +0000 |
commit | a17f4f3d9b5c42e328b76e9533bd1c2b99684f86 (patch) | |
tree | aa5e82b5fe9c1de461033d67501c0bb9176fec03 /net-wireless/hostapd | |
parent | Transfer Prefix keywords (diff) | |
download | gentoo-2-a17f4f3d9b5c42e328b76e9533bd1c2b99684f86.tar.gz gentoo-2-a17f4f3d9b5c42e328b76e9533bd1c2b99684f86.tar.bz2 gentoo-2-a17f4f3d9b5c42e328b76e9533bd1c2b99684f86.zip |
Bumping to 0.6.10 and removing redundant files.
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'net-wireless/hostapd')
-rw-r--r-- | net-wireless/hostapd/ChangeLog | 13 | ||||
-rw-r--r-- | net-wireless/hostapd/files/hostapd-0.6.9-conf.d | 9 | ||||
-rw-r--r-- | net-wireless/hostapd/files/hostapd-0.6.9-init.d | 50 | ||||
-rw-r--r-- | net-wireless/hostapd/files/hostapd-conf.d (renamed from net-wireless/hostapd/files/hostapd-0.6.8-conf.d) | 0 | ||||
-rw-r--r-- | net-wireless/hostapd/files/hostapd-init.d (renamed from net-wireless/hostapd/files/hostapd-0.6.8-init.d) | 2 | ||||
-rw-r--r-- | net-wireless/hostapd/hostapd-0.6.10.ebuild | 187 | ||||
-rw-r--r-- | net-wireless/hostapd/hostapd-0.6.8.ebuild | 8 | ||||
-rw-r--r-- | net-wireless/hostapd/hostapd-0.6.9.ebuild | 8 |
8 files changed, 207 insertions, 70 deletions
diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog index 57d06ebe023b..7ce1fb62def7 100644 --- a/net-wireless/hostapd/ChangeLog +++ b/net-wireless/hostapd/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-wireless/hostapd -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.103 2009/09/11 11:15:17 flameeyes Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.104 2010/01/14 14:36:18 gurligebis Exp $ + +*hostapd-0.6.10 (14 Jan 2010) + + 14 Jan 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org> + hostapd-0.6.8.ebuild, -files/hostapd-0.6.8-conf.d, + -files/hostapd-0.6.8-init.d, hostapd-0.6.9.ebuild, + -files/hostapd-0.6.9-conf.d, -files/hostapd-0.6.9-init.d, + +hostapd-0.6.10.ebuild, +files/hostapd-conf.d, +files/hostapd-init.d: + Bumping to 0.6.10 and removing redundant init.d and conf.d files 11 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> hostapd-0.6.8.ebuild, hostapd-0.6.9.ebuild: diff --git a/net-wireless/hostapd/files/hostapd-0.6.9-conf.d b/net-wireless/hostapd/files/hostapd-0.6.9-conf.d deleted file mode 100644 index 7d05735eb3b4..000000000000 --- a/net-wireless/hostapd/files/hostapd-0.6.9-conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Space separated List of interfaces which needs to be started before -# hostapd -INTERFACES="wlan0" - -# Space separated list of configuration files -CONFIGS="/etc/hostapd/hostapd.conf" - -# Extra options to pass to hostapd, see hostapd(8) -OPTIONS="" diff --git a/net-wireless/hostapd/files/hostapd-0.6.9-init.d b/net-wireless/hostapd/files/hostapd-0.6.9-init.d deleted file mode 100644 index 6d12c23303a4..000000000000 --- a/net-wireless/hostapd/files/hostapd-0.6.9-init.d +++ /dev/null @@ -1,50 +0,0 @@ -#!/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.9-init.d,v 1.2 2009/05/17 10:18:18 gurligebis Exp $ - -opts="start stop reload" - -depend() { - local myneeds= - for iface in ${INTERFACES}; do - myneeds="${myneeds} net.${iface}" - done - - [ -n "${myneeds}" ] && need ${myneeds} - use logger -} - -checkconfig() { - local file - - for file in ${CONFIGS}; do - if [ ! -r "${file}" ]; then - eerror "hostapd configuration file (${CONFIG}) not found" - return 1 - fi - done -} - -start() { - checkconfig || return 1 - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/hostapd \ - -- -B ${OPTIONS} ${CONFIGS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/sbin/hostapd - eend $? -} - -reload() { - checkconfig || return 1 - - ebegin "Reloading ${SVCNAME} configuration" - kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1 - eend $? -} diff --git a/net-wireless/hostapd/files/hostapd-0.6.8-conf.d b/net-wireless/hostapd/files/hostapd-conf.d index 7d05735eb3b4..7d05735eb3b4 100644 --- a/net-wireless/hostapd/files/hostapd-0.6.8-conf.d +++ b/net-wireless/hostapd/files/hostapd-conf.d diff --git a/net-wireless/hostapd/files/hostapd-0.6.8-init.d b/net-wireless/hostapd/files/hostapd-init.d index 924cc6145946..c6372cc52401 100644 --- a/net-wireless/hostapd/files/hostapd-0.6.8-init.d +++ b/net-wireless/hostapd/files/hostapd-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.8-init.d,v 1.2 2009/05/17 10:18:18 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.1 2010/01/14 14:36:18 gurligebis Exp $ opts="start stop reload" diff --git a/net-wireless/hostapd/hostapd-0.6.10.ebuild b/net-wireless/hostapd/hostapd-0.6.10.ebuild new file mode 100644 index 000000000000..8a7455729f1b --- /dev/null +++ b/net-wireless/hostapd/hostapd-0.6.10.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.10.ebuild,v 1.1 2010/01/14 14:36:18 gurligebis Exp $ + +EAPI="2" + +inherit toolchain-funcs + +DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" +HOMEPAGE="http://hostap.epitest.fi" +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 +wps" + +DEPEND="ssl? ( dev-libs/openssl ) + >=dev-libs/libnl-1.1 + madwifi? ( || + ( >net-wireless/madwifi-ng-tools-0.9.3 + net-wireless/madwifi-old ) )" +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_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" + + 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 "CFLAGS += -I/usr/include/netlink" >> ${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 + + # 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 +} diff --git a/net-wireless/hostapd/hostapd-0.6.8.ebuild b/net-wireless/hostapd/hostapd-0.6.8.ebuild index a0aa9702b90b..6c403113cecb 100644 --- a/net-wireless/hostapd/hostapd-0.6.8.ebuild +++ b/net-wireless/hostapd/hostapd-0.6.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.8.ebuild,v 1.6 2009/09/11 11:15:17 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.8.ebuild,v 1.7 2010/01/14 14:36:18 gurligebis Exp $ inherit toolchain-funcs linux-info @@ -138,8 +138,8 @@ src_install() { use ssl && dobin nt_password_hash use ssl && dobin hlr_auc_gw - newinitd "${FILESDIR}"/${P}-init.d hostapd - newconfd "${FILESDIR}"/${P}-conf.d hostapd + newinitd "${FILESDIR}"/${PN}-init.d hostapd + newconfd "${FILESDIR}"/${PN}-conf.d hostapd doman hostapd.8 hostapd_cli.1 diff --git a/net-wireless/hostapd/hostapd-0.6.9.ebuild b/net-wireless/hostapd/hostapd-0.6.9.ebuild index 763e16934fa0..8f98ade19c78 100644 --- a/net-wireless/hostapd/hostapd-0.6.9.ebuild +++ b/net-wireless/hostapd/hostapd-0.6.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.9.ebuild,v 1.5 2009/09/11 11:15:17 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.6.9.ebuild,v 1.6 2010/01/14 14:36:18 gurligebis Exp $ EAPI="2" @@ -129,8 +129,8 @@ src_install() { use ssl && dobin nt_password_hash use ssl && dobin hlr_auc_gw - newinitd "${FILESDIR}"/${P}-init.d hostapd - newconfd "${FILESDIR}"/${P}-conf.d hostapd + newinitd "${FILESDIR}"/${PN}-init.d hostapd + newconfd "${FILESDIR}"/${PN}-conf.d hostapd doman hostapd.8 hostapd_cli.1 |