New development release.

(Portage version: 2.0.51.22-r1)

11 files changed, 345 insertions, 4 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 4ca61970e1e0..6f7e5063d896 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2005/06/11 09:38:17 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.31 2005/06/13 14:43:25 brix Exp $
+
+*hostapd-0.4.2 (13 Jun 2005)
+
+  13 Jun 2005; <brix@gentoo.org> +files/hostapd-0.4.2-conf.d,
+  +files/hostapd-0.4.2-init.d, +hostapd-0.4.2.ebuild:
+  New development release.
 
 *hostapd-0.3.9 (11 Jun 2005)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index df2016c70815..dfa7e5300d1b 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,7 +4,8 @@ MD5 a1ffc69d43fb9333ba712a41d0966775 hostapd-0.4.0-r1.ebuild 2161
 MD5 32b4c4cf4e25ff18aa6d6592d424bfa4 hostapd-0.3.7.ebuild 2115
 MD5 e1948d4ae3d8cd344d53ecb6166d2192 hostapd-0.2.6.ebuild 1021
 MD5 59cf930e66933184877c5d9e78d35df1 hostapd-0.3.9.ebuild 2133
-MD5 b52375a10b3aef53e3958e0841531de9 ChangeLog 4423
+MD5 6312e6f3a5a4efeb82ec380a55d6869a hostapd-0.4.2.ebuild 2074
+MD5 95583c9a8a2515a8092636d9e00667cf ChangeLog 4597
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
 MD5 15c56fec11babac2ba5846b20fa571df files/hostapd-0.4.1-conf.d 425
 MD5 ba14f3282c1fe345b2b9bc3233bc2f6d files/digest-hostapd-0.2.5 65
@@ -12,8 +13,11 @@ MD5 9cbbd29bd90ddbddaa1abe1e726e2fd1 files/digest-hostapd-0.2.6 65
 MD5 3cb68569c34f2c059da88220513d9af4 files/digest-hostapd-0.3.7 150
 MD5 1a5ea229c1f23346e39a4af2abd08add files/digest-hostapd-0.3.9 150
 MD5 26b88f2fe60b7f9aaed70cd87d172f87 files/digest-hostapd-0.4.1 150
+MD5 48ddb5c7bc3b09ae1c09257c010f0e0f files/digest-hostapd-0.4.2 150
 MD5 cf287b50f0ccd832a08fb3031281cd4f files/hostapd.init.d 858
 MD5 7f75e4d61b1b99452beb1027fc61462e files/hostapd-0.4.1-init.d 982
 MD5 e3ffdcd25f6e6c941ad878a0f71a7645 files/digest-hostapd-0.4.0-r1 150
 MD5 13619655135f469a5538e99c1d17efa6 files/hostapd-0.4.0-conf.d 425
 MD5 91e2e21afb898a103e2ac8fd7656b78d files/hostapd-0.4.0-init.d 982
+MD5 9e6b7c9bb07f39226dc8b8968cc9293b files/hostapd-0.4.2-conf.d 318
+MD5 6a6711056cbe6f6ae10887e99db76f60 files/hostapd-0.4.2-init.d 875
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.4.2 b/net-wireless/hostapd/files/digest-hostapd-0.4.2
new file mode 100644
index 000000000000..7096b0c5cc1f
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.4.2
@@ -0,0 +1,2 @@
+MD5 9ba734b0cf83d8694eb184b64804b496 hostapd-0.4.2.tar.gz 265961
+MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/hostapd/files/hostapd-0.4.2-conf.d b/net-wireless/hostapd/files/hostapd-0.4.2-conf.d
new file mode 100644
index 000000000000..9eaf67912443
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-0.4.2-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.2-conf.d,v 1.1 2005/06/13 14:43:25 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.2-init.d b/net-wireless/hostapd/files/hostapd-0.4.2-init.d
new file mode 100644
index 000000000000..540f859365b7
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-0.4.2-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.2-init.d,v 1.1 2005/06/13 14:43:25 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 --signal 1 --quiet --exec /usr/sbin/hostapd
+	eend ${?}
+}
diff --git a/net-wireless/hostapd/hostapd-0.4.2.ebuild b/net-wireless/hostapd/hostapd-0.4.2.ebuild
new file mode 100644
index 000000000000..89449ed503da
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.4.2.ebuild
@@ -0,0 +1,86 @@
+# 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.2.ebuild,v 1.1 2005/06/13 14:43:25 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="2005-04-20"
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
+		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
+
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="ipv6 ssl"
+
+DEPEND="sys-apps/sed"
+RDEPEND="ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	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}
+
+	# Add include path for madwifi-driver headers
+	echo "CFLAGS += -I${WORKDIR}/madwifi" >> ${CONFIG}
+	echo "CONFIG_DRIVER_MADWIFI=y"        >> ${CONFIG}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	insinto /etc/hostapd
+	doins hostapd.conf hostapd.accept hostapd.deny
+
+	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
+}
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 15e3173ede37..8d47610fbb78 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.25 2005/06/11 09:41:00 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.26 2005/06/13 14:39:35 brix Exp $
+
+*wpa_supplicant-0.4.2 (13 Jun 2005)
+
+  13 Jun 2005; <brix@gentoo.org> +files/wpa_supplicant-0.4.2-wpa_cli.action,
+  +wpa_supplicant-0.4.2.ebuild:
+  New development release.
 
 *wpa_supplicant-0.3.9 (11 Jun 2005)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 8d7284f58978..15af04a9d1b1 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,10 +1,12 @@
 MD5 5e615cd1c73e242110ec4966f5a9e270 wpa_supplicant-0.3.9.ebuild 3193
+MD5 6a9a045a18b29db495d7020dbba4f6a1 wpa_supplicant-0.4.2.ebuild 3399
 MD5 5c367e1ee7f780b0d5539c68d1ec1100 wpa_supplicant-0.3.8.ebuild 3127
 MD5 7093cee7143930fcf60e66ab0b5df1b1 wpa_supplicant-0.4.1.ebuild 3497
 MD5 4d2fd49e3994d5cabec6b9c26b92ea11 wpa_supplicant-0.2.7.ebuild 2722
-MD5 4f13e8ef51bb31a2a8547efc31f11cc5 ChangeLog 7403
+MD5 1865ba9787f1af8035ff3db1c05ea9d8 ChangeLog 7577
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 8a525c1c0f9610f81add0b4e6fcf762d wpa_supplicant-0.4.0.ebuild 3291
+MD5 c1c8e0ca5f5a3781e3612def405f4f5d files/wpa_supplicant-0.4.2-wpa_cli.action 1104
 MD5 78e1b4e6585e53e08ba3210eb53d4258 files/wpa_supplicant-0.3.8-conf.d 394
 MD5 1e84620fc5d91acb84e7a280c9adc0ea files/wpa_supplicant-0.4.1-conf.d 394
 MD5 461b028eb4103f140fa88d33efbb640a files/digest-wpa_supplicant-0.2.7 156
@@ -12,6 +14,7 @@ MD5 6b30dfb43745d57ea0280e9fb1467546 files/digest-wpa_supplicant-0.3.8 157
 MD5 a5d385e515e9989ba56f4c89fd83091a files/digest-wpa_supplicant-0.3.9 157
 MD5 8a187dfdf8f03c84c486378b2b165f06 files/digest-wpa_supplicant-0.4.0 157
 MD5 5f93177414c5f5e6a21efb7aeb83ddb8 files/digest-wpa_supplicant-0.4.1 157
+MD5 69dc9f23d912811fa86cac58246f0343 files/digest-wpa_supplicant-0.4.2 157
 MD5 95a04705cb8e47f8d4611186cffb6a96 files/wpa_supplicant-0.3.8-init.d 975
 MD5 aa75bd008ca09560a1567034a989b283 files/wpa_supplicant-0.4.1-init.d 975
 MD5 38d9ee18b195a6ceb213c1c74a57aab9 files/wpa_supplicant-0.2.7-conf.d 398
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.2 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.2
new file mode 100644
index 000000000000..d4d35eb62cfb
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.2
@@ -0,0 +1,2 @@
+MD5 498cd08b5ca233ff7709c1315ebcbb02 wpa_supplicant-0.4.2.tar.gz 369244
+MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.2-wpa_cli.action b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.2-wpa_cli.action
new file mode 100644
index 000000000000..66ec575e5f7c
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.2-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.2-wpa_cli.action,v 1.1 2005/06/13 14:39:35 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.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.2.ebuild
new file mode 100644
index 000000000000..f403d62466b3
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.2.ebuild
@@ -0,0 +1,126 @@
+# 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.2.ebuild,v 1.1 2005/06/13 14:39:35 brix Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-${PV/_/-}
+S=${WORKDIR}/${MY_P}
+
+MADWIFI_VERSION="2005-04-20"
+
+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
+		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
+LICENSE="|| ( GPL-2 BSD )"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="debug gsm qt readline ssl"
+
+DEPEND="gsm? ( sys-apps/pcsc-lite )
+		qt? ( x11-libs/qt )
+		readline? ( sys-libs/ncurses
+					sys-libs/readline )
+		ssl? ( dev-libs/openssl )"
+
+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_XSUPPLICANT_IFACE=y" >> ${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}
+
+	# Add include path for madwifi-driver headers
+	echo "CFLAGS += -I${WORKDIR}/madwifi" >> ${CONFIG}
+	echo "CONFIG_DRIVER_MADWIFI=y"        >> ${CONFIG}
+}
+
+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() {
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	if use qt; then
+		dobin wpa_gui/wpa_gui
+	fi
+
+	newsbin ${FILESDIR}/${MY_P}-wpa_cli.action wpa_cli.action
+
+	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
+	dodoc doc/wpa_supplicant.fig
+
+	insinto /etc
+	newins wpa_supplicant.conf wpa_supplicant.conf.example
+}
+
+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
+	einfo "Please note that the wpa_supplicant init script has been"
+	einfo "removed in favor of sys-apps/baselayout-1.11.x"
+	einfo
+}