New development snapshot, bug #108319.

Package-Manager: portage-2.0.51.22-r3

17 files changed, 532 insertions, 23 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index ff6c0749c1e4..22e93082ec85 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostap-driver
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.45 2005/09/17 09:57:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.46 2005/10/17 10:14:45 brix Exp $
+
+*hostap-driver-0.4.5 (17 Oct 2005)
+
+  17 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/hostap-driver-0.4.5-firmware.patch, +hostap-driver-0.4.5.ebuild:
+  New development snapshot, bug #108319.
 
   17 Sep 2005; Simon Stelling <blubb@gentoo.org> hostap-driver-0.4.4.ebuild:
   added ~amd64 keyword
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index 82a9411bb10d..3eb0808fa5c1 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,14 +1,17 @@
-MD5 01853f68a95c129791f46dc26e109ca0 ChangeLog 8271
-MD5 5f5fb4615d0045ffe9727824ef14b131 hostap-driver-0.4.4.ebuild 2587
 MD5 47085a6a44c13e4ca6a2599fe6585cb5 hostap-driver-0.3.7.ebuild 2716
-MD5 5f6ec5c50fa3a91a429fec8670cf241b metadata.xml 722
-MD5 c3989ef4829c2cd4e35017d1cb755e9f hostap-driver-0.4.1.ebuild 2469
+MD5 4d0c55d310ccd2beaedb04a05f2d3a57 hostap-driver-0.4.5.ebuild 2473
 MD5 f493ca27e9bc7ac772ba021782faaee9 hostap-driver-0.3.9.ebuild 2468
-MD5 73554113a858ba75db45b9c53ff1863a files/digest-hostap-driver-0.4.4 71
+MD5 5f5fb4615d0045ffe9727824ef14b131 hostap-driver-0.4.4.ebuild 2587
+MD5 c3989ef4829c2cd4e35017d1cb755e9f hostap-driver-0.4.1.ebuild 2469
+MD5 bcd9262d44609f00f6ed730dffcb875c ChangeLog 8477
+MD5 5f6ec5c50fa3a91a429fec8670cf241b metadata.xml 722
 MD5 2ada7ac885f4fa87c2b3c4a6ad443a34 files/hostap-driver-0.4.4-firmware.patch 739
+MD5 8214baf7253070b31cf2d9f976229bec files/hostap-driver-0.3.9-firmware.patch 739
 MD5 c28ccef49868cb855e9832c66e146318 files/digest-hostap-driver-0.3.7 71
-MD5 4e679442c5b3b53a929b470fdccef35e files/hostap-driver-0.3.7-firmware.patch 739
+MD5 d56a1f3da96fc43c6a4a13838b71d3f6 files/digest-hostap-driver-0.3.9 71
 MD5 4ddbfa2123a5985cf0494985b1d7414f files/digest-hostap-driver-0.4.1 71
+MD5 73554113a858ba75db45b9c53ff1863a files/digest-hostap-driver-0.4.4 71
+MD5 82eda6411d5c161f573545f0edc56a74 files/digest-hostap-driver-0.4.5 71
 MD5 b414820b5fa133ecc86165c83e3bff5b files/hostap-driver-0.4.1-firmware.patch 739
-MD5 d56a1f3da96fc43c6a4a13838b71d3f6 files/digest-hostap-driver-0.3.9 71
-MD5 8214baf7253070b31cf2d9f976229bec files/hostap-driver-0.3.9-firmware.patch 739
+MD5 58a1e32c0e120c634d7c3fa813fcc7f9 files/hostap-driver-0.4.5-firmware.patch 739
+MD5 4e679442c5b3b53a929b470fdccef35e files/hostap-driver-0.3.7-firmware.patch 739
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.5 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.5
new file mode 100644
index 000000000000..63d2c23e7b76
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.4.5
@@ -0,0 +1 @@
+MD5 8ee17f206e035075b20fcba96b168234 hostap-driver-0.4.5.tar.gz 202539
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.4.5-firmware.patch b/net-wireless/hostap-driver/files/hostap-driver-0.4.5-firmware.patch
new file mode 100644
index 000000000000..c660fc7a9b15
--- /dev/null
+++ b/net-wireless/hostap-driver/files/hostap-driver-0.4.5-firmware.patch
@@ -0,0 +1,12 @@
+diff -urp hostap-driver-0.4.5/driver/modules/hostap_config.h hostap-driver-0.4.5-firmware/driver/modules/hostap_config.h
+--- hostap-driver-0.4.5/driver/modules/hostap_config.h	2005-09-26 03:42:30.000000000 +0200
++++ hostap-driver-0.4.5-firmware/driver/modules/hostap_config.h	2005-10-17 10:43:22.000000000 +0200
+@@ -59,7 +59,7 @@
+  * In addition, please note that it is possible to kill your card with
+  * non-volatile download if you are using incorrect image. This feature has not
+  * been fully tested, so please be careful with it. */
+-/* #define PRISM2_NON_VOLATILE_DOWNLOAD */
++#define PRISM2_NON_VOLATILE_DOWNLOAD
+ #endif /* PRISM2_DOWNLOAD_SUPPORT */
+ 
+ /* Include wireless extensions sub-ioctl support even if wireless extensions
diff --git a/net-wireless/hostap-driver/hostap-driver-0.4.5.ebuild b/net-wireless/hostap-driver/hostap-driver-0.4.5.ebuild
new file mode 100644
index 000000000000..bc06eeb207e4
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.4.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.4.5.ebuild,v 1.1 2005/10/17 10:14:45 brix Exp $
+
+inherit toolchain-funcs eutils linux-mod
+
+DESCRIPTION="Driver for Intersil Prism2/2.5/3 based IEEE 802.11b wireless LAN products"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="pcmcia"
+SLOT="0"
+
+RDEPEND=">=net-wireless/wireless-tools-25"
+
+BUILD_TARGETS="all"
+MODULESD_HOSTAP_DOCS="README"
+MODULESD_HOSTAP_CRYPT_WEP_ENABLED="no"
+MODULESD_HOSTAP_CRYPT_TKIP_ENABLED="no"
+MODULESD_HOSTAP_CRYPT_CCMP_ENABLED="no"
+
+CONFIG_CHECK="NET_RADIO"
+NET_RADIO_ERROR="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="hostap(net::${S}/driver/modules)
+				hostap_pci(net::${S}/driver/modules)
+				hostap_plx(net::${S}/driver/modules)
+				hostap_crypt_wep(net::${S}/driver/modules)
+				hostap_crypt_ccmp(net::${S}/driver/modules)
+				hostap_crypt_tkip(net::${S}/driver/modules)"
+
+	if use pcmcia; then
+		MODULE_NAMES="${MODULE_NAMES} hostap_cs(net::${S}/driver/modules)"
+	fi
+
+	BUILD_PARAMS="KERNEL_PATH=${KV_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-firmware.patch
+
+	sed -i \
+		-e "s:gcc:$(tc-getCC):" \
+		-e "s:tail -1:tail -n 1:" \
+		${S}/Makefile
+
+	if use pcmcia; then
+		# unpack the pcmcia-cs sources if needed
+		pcmcia_src_unpack
+
+		# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
+		if [ -n "${PCMCIA_VERSION}" ]; then
+			sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+		fi
+	fi
+
+	convert_to_m ${S}/Makefile
+}
+
+src_install() {
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins driver/etc/hostap_cs.conf
+	fi
+
+	dodoc ChangeLog
+
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	if [ -e /etc/pcmcia/prism2.conf ]
+	then
+		einfo ""
+		einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
+		einfo "This is usually a result of conflicts with the"
+		einfo "net-wireless/linux-wlan-ng drivers."
+		einfo ""
+	fi
+
+	ewarn ""
+	ewarn "Please note that this installation of HostAP contains support"
+	ewarn "for downloading binary firmware images into the non-volatile"
+	ewarn "(permanent) flash memory of wireless LAN cards."
+	ewarn ""
+	ewarn "Albeit being a great feature, this can lead to A DEAD CARD"
+	ewarn "when inappropriately used (e.g. wrong firmware)."
+	ewarn ""
+
+	linux-mod_pkg_postinst
+}
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
+}
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 6bbad484ff59..54bfc0dad397 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.34 2005/08/22 12:53:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.35 2005/10/17 10:19:19 brix Exp $
+
+*wpa_supplicant-0.4.5 (17 Oct 2005)
+
+  17 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.4.5-wpa_cli.action, +wpa_supplicant-0.4.5.ebuild:
+  New development snapshot, bug #108319.
 
 *wpa_supplicant-0.4.4 (22 Aug 2005)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 709eaf9566fa..6a206e34d2ae 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -2,13 +2,16 @@ MD5 21bf8f048a12ed4b120a29a765d77d0f wpa_supplicant-0.4.3-r1.ebuild 3527
 MD5 2553c22812c2c2710d00ae221bd33651 wpa_supplicant-0.4.4.ebuild 3741
 MD5 090212b7ed178b6a7e269f4eb57fdc25 wpa_supplicant-0.3.9-r1.ebuild 3236
 MD5 c49fb2bfb9587a39da2533eea26fdbe8 wpa_supplicant-0.3.8-r1.ebuild 3172
-MD5 a2023fd94d3a7e8e1a85385b49b32eca ChangeLog 9485
+MD5 b4bb7629bbe99781116c1aafff55744f ChangeLog 9694
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 6dd0569db0d9cdf7bcde5bfda4b85e55 wpa_supplicant-0.4.5.ebuild 3592
 MD5 d1bbf5c729fef085e916e0a02c65782e files/wpa_supplicant-0.4.3-wpa_cli.action 1233
 MD5 ac644da9f49ee164d3ff83845f87b255 files/digest-wpa_supplicant-0.4.4 72
+MD5 6f35db046eea3cd08dd5d9c8f77f7050 files/digest-wpa_supplicant-0.4.5 72
 MD5 6b30dfb43745d57ea0280e9fb1467546 files/digest-wpa_supplicant-0.3.8-r1 157
 MD5 a5d385e515e9989ba56f4c89fd83091a files/digest-wpa_supplicant-0.3.9-r1 157
 MD5 9d6a7df32d449a9bc76e908d47d27f0c files/digest-wpa_supplicant-0.4.3-r1 157
 MD5 8b721abd27f59880578d200b7e4b6c8b files/wpa_supplicant-0.3.8-r1-conf.d 397
+MD5 c1c8e0ca5f5a3781e3612def405f4f5d files/wpa_supplicant-0.4.5-wpa_cli.action 1104
 MD5 eb92461388d565935eeb71df78baa8b7 files/wpa_supplicant-0.3.8-r1-init.d 969
 MD5 9506a58b8a37ccaabd7d88d25c30ce0f files/wpa_supplicant-0.4.4-wpa_cli.action 1233
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.5 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.5
new file mode 100644
index 000000000000..cc9c43ebf6d3
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.5
@@ -0,0 +1 @@
+MD5 28347563119f09fc963bcdf9d16265a3 wpa_supplicant-0.4.5.tar.gz 442393
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.5-wpa_cli.action b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.5-wpa_cli.action
new file mode 100644
index 000000000000..86a7526e6001
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.5-wpa_cli.action
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright 1999-2005 Gentoo Foundation
+# Written by Roy Marples <uberlord@gentoo.org>
+# Distributed under the terms of the GNU General Public License v2
+# Alternatively, this file may be distributed under the terms of the BSD License
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.5-wpa_cli.action,v 1.1 2005/10/17 10:19:19 brix Exp $
+
+if [ -z "$1" -o -z "$2" ]; then
+	echo "Insufficient parameters" > /dev/stderr
+	exit 1
+fi
+
+INTERFACE="$1"
+ACTION="$2"
+
+# Note, the below action must NOT mark the interface down via ifconfig, ip or
+# similar. Addresses can be removed, changed and daemons can be stopped, but
+# the interface must remain up for wpa_supplicant to work.
+
+if [ -f /etc/gentoo-release ]; then
+	EXEC="/etc/init.d/net.${INTERFACE} --quiet"
+else
+	echo "I don't know what to do with this distro!" > /dev/stderr
+	exit 1
+fi
+
+case ${ACTION} in
+	CONNECTED)
+		EXEC="${EXEC} start"
+		;;
+	DISCONNECTED)
+		EXEC="${EXEC} stop"
+		;;
+	*)
+		echo "Unknown action ${ACTION}" > /dev/stderr
+		exit 1
+		;;
+esac
+
+# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't
+# stopping the interface and a background process - like wpa_cli - is.
+export IN_BACKGROUND=true
+
+${EXEC}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.5.ebuild
new file mode 100644
index 000000000000..5c94364e2d2f
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.5.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.5.ebuild,v 1.1 2005/10/17 10:19:19 brix Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-${PV/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz"
+LICENSE="|| ( GPL-2 BSD )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gsm madwifi qt readline ssl"
+
+DEPEND="gsm? ( sys-apps/pcsc-lite )
+		qt? ( =x11-libs/qt-3* )
+		readline? ( sys-libs/ncurses
+					sys-libs/readline )
+		ssl? ( dev-libs/openssl )
+		madwifi? ( >=net-wireless/madwifi-driver-0.1_pre20050420-r1 )
+		>=sys-apps/baselayout-1.11.13"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# basic setup
+	echo "CONFIG_CTRL_IFACE=y"        >> ${CONFIG}
+	echo "CONFIG_BACKEND=file"        >> ${CONFIG}
+
+	# basic authentication methods
+	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
+	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
+
+	if ! use debug; then
+		echo "CONFIG_NO_STDOUT_DEBUG=y" >> ${CONFIG}
+	fi
+
+	if use gsm; then
+		# smart card authentication
+		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+		echo "CONFIG_PCSC=y"    >> ${CONFIG}
+	fi
+
+	if use readline; then
+		# readline/history support for wpa_cli
+		echo "CONFIG_READLINE=y" >> ${CONFIG}
+	fi
+
+	if use ssl; then
+		# SSL authentication methods
+		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
+		echo "CONFIG_SMARTCARD=y"    >> ${CONFIG}
+	fi
+
+	# Linux specific drivers
+	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
+	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
+	echo "CONFIG_DRIVER_IPW=y"         >> ${CONFIG}
+	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
+	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=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"
+
+	if use qt; then
+		[[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings
+		emake wpa_gui || die "emake wpa_gui failed"
+	fi
+}
+
+src_install() {
+	into /
+
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	newsbin ${FILESDIR}/${MY_P}-wpa_cli.action wpa_cli.action
+
+	if use qt; then
+		into /usr
+		dobin wpa_gui/wpa_gui
+	fi
+
+	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
+	dodoc doc/wpa_supplicant.fig
+
+	insinto /etc
+	newins wpa_supplicant.conf wpa_supplicant.conf.example
+
+	doman doc/docbook/*.8
+	doman doc/docbook/*.5
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${MY_P} you must create the configuration file"
+	einfo "/etc/wpa_supplicant.conf"
+	einfo
+	einfo "An example configuration file has been installed as"
+	einfo "/etc/wpa_supplicant.conf.example"
+	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
+}