New development snapshot, bug #108319.

(Portage version: 2.0.51.22-r3)

7 files changed, 210 insertions, 12 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 38ce8eea1584..ca405a7e683f 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.41 2005/09/17 09:58:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.42 2005/10/17 10:17:11 brix Exp $
+
+*hostapd-0.4.5 (17 Oct 2005)
+
+  17 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/hostapd-0.4.5-conf.d, +files/hostapd-0.4.5-init.d,
+  +files/hostapd-0.4.5-prism54.patch, +hostapd-0.4.5.ebuild:
+  New development snapshot, bug #108319.
 
   17 Sep 2005; Simon Stelling <blubb@gentoo.org> hostapd-0.4.4-r1.ebuild:
   added ~amd64 keyword
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index a72e7d3c70d3..dea96c9363cc 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,19 +1,24 @@
-MD5 c33d1c7048d0d416d2705adccb1dd341 ChangeLog 6358
+MD5 396c1e925e358173b0a3ae75b6015d65 hostapd-0.4.4.ebuild 2816
 MD5 0c6c74df2e620fbbe769b04919cf0bf3 hostapd-0.4.4-r1.ebuild 2902
+MD5 61d2efeb72b79f734ac5e82d6d6806e9 hostapd-0.4.3.ebuild 2188
 MD5 3d4f2d29f55f0ee2f8117fa90423bff9 hostapd-0.3.7.ebuild 2131
-MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
-MD5 396c1e925e358173b0a3ae75b6015d65 hostapd-0.4.4.ebuild 2816
+MD5 c6f221cdec02afa9bfccb072ef555094 hostapd-0.4.5.ebuild 2853
 MD5 8f92a1ce62c0c91b1f31c63a7ecc8320 hostapd-0.3.9-r1.ebuild 2125
-MD5 61d2efeb72b79f734ac5e82d6d6806e9 hostapd-0.4.3.ebuild 2188
-MD5 e4fa2efc7231097343517c2f26a64247 files/digest-hostapd-0.4.4 65
-MD5 c5d533aea010f90f5813351eefae99b2 files/hostapd-0.4.4-conf.d 425
+MD5 f9e4cca67b88d536f6b275fa5ea7632e ChangeLog 6605
+MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
+MD5 af20f7c9a017ce03a0b66ca5c631dfc2 files/hostapd-0.4.5-prism54.patch 381
 MD5 3cb68569c34f2c059da88220513d9af4 files/digest-hostapd-0.3.7 150
+MD5 f627c86eb7a966449fda4ef56a1ada36 files/digest-hostapd-0.4.3 150
+MD5 e4fa2efc7231097343517c2f26a64247 files/digest-hostapd-0.4.4 65
+MD5 9de6de9d2454760956b6b8684f530ca5 files/digest-hostapd-0.4.5 65
 MD5 cf287b50f0ccd832a08fb3031281cd4f files/hostapd.init.d 858
-MD5 e4fa2efc7231097343517c2f26a64247 files/digest-hostapd-0.4.4-r1 65
-MD5 81f7eee038d46a1c579fb4a0a0dc9483 files/hostapd-0.4.4-init.d 984
 MD5 1a5ea229c1f23346e39a4af2abd08add files/digest-hostapd-0.3.9-r1 150
-MD5 e4b30b5fade1fe4a257be477129ae36d files/hostapd-0.3.9-conf.d 425
-MD5 9f51596dd3a60ecf3aebee6f82f750f8 files/hostapd-0.3.9-init.d 982
-MD5 f627c86eb7a966449fda4ef56a1ada36 files/digest-hostapd-0.4.3 150
+MD5 e4fa2efc7231097343517c2f26a64247 files/digest-hostapd-0.4.4-r1 65
 MD5 cc7a2cd85ce4d81e690cac643acaa65d files/hostapd-0.4.3-conf.d 425
 MD5 7ca878f99492c4a97a5d6ce532be7a87 files/hostapd-0.4.3-init.d 982
+MD5 9e6b7c9bb07f39226dc8b8968cc9293b files/hostapd-0.4.5-conf.d 318
+MD5 f7c0c593641102a7afbfe02072639a65 files/hostapd-0.4.5-init.d 877
+MD5 e4b30b5fade1fe4a257be477129ae36d files/hostapd-0.3.9-conf.d 425
+MD5 9f51596dd3a60ecf3aebee6f82f750f8 files/hostapd-0.3.9-init.d 982
+MD5 c5d533aea010f90f5813351eefae99b2 files/hostapd-0.4.4-conf.d 425
+MD5 81f7eee038d46a1c579fb4a0a0dc9483 files/hostapd-0.4.4-init.d 984
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.4.5 b/net-wireless/hostapd/files/digest-hostapd-0.4.5
new file mode 100644
index 000000000000..5be01f4a16f9
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.4.5
@@ -0,0 +1 @@
+MD5 3d775a19f8071d6f8a363ef0dad58655 hostapd-0.4.5.tar.gz 280724
diff --git a/net-wireless/hostapd/files/hostapd-0.4.5-conf.d b/net-wireless/hostapd/files/hostapd-0.4.5-conf.d
new file mode 100644
index 000000000000..7a39b543fab3
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-0.4.5-conf.d
@@ -0,0 +1,12 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.4.5-conf.d,v 1.1 2005/10/17 10:17:11 brix Exp $
+
+# List of interfaces which needs to be started before hostapd
+INTERFACES="wlan0"
+
+# List of configuration files
+CONFIGS="/etc/hostapd/hostapd.conf"
+
+# Extra options to pass to hostapd
+OPTIONS="-B"
diff --git a/net-wireless/hostapd/files/hostapd-0.4.5-init.d b/net-wireless/hostapd/files/hostapd-0.4.5-init.d
new file mode 100644
index 000000000000..b72efd619032
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-0.4.5-init.d
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.4.5-init.d,v 1.1 2005/10/17 10:17:11 brix Exp $
+
+opts="start stop reload"
+
+depend() {
+	local iface
+
+	for iface in ${INTERFACES}; do
+		need net.${iface}
+	done
+
+	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 hostapd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/hostapd \
+		-- ${OPTIONS} ${CONFIGS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping hostapd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/hostapd
+	eend ${?}
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading hostapd configuration"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/hostapd --signal HUP
+	eend ${?}
+}
diff --git a/net-wireless/hostapd/files/hostapd-0.4.5-prism54.patch b/net-wireless/hostapd/files/hostapd-0.4.5-prism54.patch
new file mode 100644
index 000000000000..b4edca7e670b
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-0.4.5-prism54.patch
@@ -0,0 +1,11 @@
+diff -urp hostapd-0.4.5/driver_prism54.c hostapd-0.4.5-prism54/driver_prism54.c
+--- hostapd-0.4.5/driver_prism54.c	2005-06-27 04:30:59.000000000 +0200
++++ hostapd-0.4.5-prism54/driver_prism54.c	2005-10-17 11:31:21.000000000 +0200
+@@ -52,6 +52,7 @@
+ #include "radius.h"
+ #include "sta_info.h"
+ #include "accounting.h"
++#include "hostap_common.h"
+ 
+ const int PIM_BUF_SIZE = 4096;
+ 
diff --git a/net-wireless/hostapd/hostapd-0.4.5.ebuild b/net-wireless/hostapd/hostapd-0.4.5.ebuild
new file mode 100644
index 000000000000..7dd5362e654f
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.4.5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.4.5.ebuild,v 1.1 2005/10/17 10:17:11 brix Exp $
+
+inherit eutils 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 madwifi ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+		madwifi? ( >=net-wireless/madwifi-driver-0.1_pre20050420-r1 )"
+DEPEND="${RDEPEND}
+		sys-apps/sed"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-prism54.patch
+
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		${S}/hostapd.conf
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# authentication methods
+	echo "CONFIG_EAP=y"           >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y"       >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y"       >> ${CONFIG}
+	echo "CONFIG_IAPP=y"          >> ${CONFIG}
+	echo "CONFIG_PKCS12=y"        >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y"   >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y"       >> ${CONFIG}
+
+	if use ssl; then
+		# SSL authentication methods
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
+	fi
+
+	if use ipv6; then
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	# Linux specific drivers
+	echo "CONFIG_DRIVER_HOSTAP=y"  >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=y"   >> ${CONFIG}
+	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
+
+	if use madwifi; then
+		# Add include path for madwifi-driver headers
+		echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG}
+		echo "CONFIG_DRIVER_MADWIFI=y"          >> ${CONFIG}
+	fi
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+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
+
+	newinitd ${FILESDIR}/${P}-init.d hostapd
+	newconfd ${FILESDIR}/${P}-conf.d hostapd
+
+	doman hostapd.8 hostapd_cli.1
+
+	dodoc ChangeLog developer.txt README
+
+	docinto examples
+	dodoc madwifi.conf wired.conf
+}
+
+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 or /etc/conf.d/wireless"
+	einfo "and then start /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 now compiles against the headers installed by"
+		einfo "net-wireless/madwifi-driver. You should remerge ${PN} after"
+		einfo "upgrading net-wireless/madwifi-driver."
+		einfo
+	fi
+}