New development snapshot.

(Portage version: 2.0.51.20-r5)

7 files changed, 229 insertions, 1 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index b2065fef2649..219d50c39e86 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2005/04/16 09:08:44 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.22 2005/04/27 10:02:48 brix Exp $
+
+*wpa_supplicant-0.4.0 (27 Apr 2005)
+
+  27 Apr 2005; <brix@gentoo.org> +files/wpa_supplicant-0.4.0-conf.d,
+  +files/wpa_supplicant-0.4.0-init.d,
+  +files/wpa_supplicant-0.4.0-wpa_cli.action, +wpa_supplicant-0.4.0.ebuild:
+  New development snapshot.
 
   16 Apr 2005; <brix@gentoo.org> wpa_supplicant-0.3.8.ebuild:
   Stable on x86.
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index d058fd9a332a..b82a9bf4521b 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -2,9 +2,14 @@ MD5 039c1f1136aa1b00e1facbcb18a643a7 wpa_supplicant-0.3.8.ebuild 3127
 MD5 4d2fd49e3994d5cabec6b9c26b92ea11 wpa_supplicant-0.2.7.ebuild 2722
 MD5 22b65af4dc9487527fb495c5c82a70d0 ChangeLog 6690
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 b09b6c1e17cacb8ca7f8cb2fceeeb968 wpa_supplicant-0.4.0.ebuild 3176
 MD5 78e1b4e6585e53e08ba3210eb53d4258 files/wpa_supplicant-0.3.8-conf.d 394
 MD5 461b028eb4103f140fa88d33efbb640a files/digest-wpa_supplicant-0.2.7 156
 MD5 6b30dfb43745d57ea0280e9fb1467546 files/digest-wpa_supplicant-0.3.8 157
+MD5 8a187dfdf8f03c84c486378b2b165f06 files/digest-wpa_supplicant-0.4.0 157
 MD5 95a04705cb8e47f8d4611186cffb6a96 files/wpa_supplicant-0.3.8-init.d 975
 MD5 38d9ee18b195a6ceb213c1c74a57aab9 files/wpa_supplicant-0.2.7-conf.d 398
 MD5 d49276870258f0f4b9f8830e82553e7b files/wpa_supplicant-0.2.7-init.d 975
+MD5 78e1b4e6585e53e08ba3210eb53d4258 files/wpa_supplicant-0.4.0-conf.d 394
+MD5 c1c8e0ca5f5a3781e3612def405f4f5d files/wpa_supplicant-0.4.0-wpa_cli.action 1104
+MD5 95a04705cb8e47f8d4611186cffb6a96 files/wpa_supplicant-0.4.0-init.d 975
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.0 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.0
new file mode 100644
index 000000000000..4b5472628e01
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.0
@@ -0,0 +1,2 @@
+MD5 b6adfd43ddf1fa06494e71b186185f45 wpa_supplicant-0.4.0.tar.gz 327380
+MD5 efb9130cf1dcb829caa43af4e0bee2fb madwifi-cvs-snapshot-2005-04-20.tar.bz2 1968548
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-conf.d
new file mode 100644
index 000000000000..28de81c2e412
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-conf.d
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-conf.d,v 1.1 2005/04/27 10:02:48 brix Exp $
+
+# List of interfaces
+INTERFACES="eth1"
+
+# Common arguments to all wpa_supplicant instances
+ARGS="-w"
+
+# Interface specific arguments
+#ARGS_eth1="-Dipw"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-init.d
new file mode 100644
index 000000000000..7c3fd2feb4d6
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-init.d
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-init.d,v 1.1 2005/04/27 10:02:48 brix Exp $
+
+depend() {
+	before net
+}
+
+start() {
+	ebegin "Starting wpa_supplicant"
+
+	if [ ! -f /etc/wpa_supplicant.conf ]; then
+		eerror "Configuration file /etc/wpa_supplicant.conf not found"
+		return 1
+	fi
+
+	if [ -z "$INTERFACES" ]; then
+		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
+		return 1
+	fi
+
+	for IFACE in $INTERFACES; do
+		ebegin "  ${IFACE}"
+
+		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
+
+		/sbin/ifconfig ${IFACE} up
+
+		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
+			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
+		eend $?
+	done
+}
+
+stop() {
+	ebegin "Stopping wpa_supplicant"
+
+	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
+	eend ${?}
+}
+
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-wpa_cli.action b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-wpa_cli.action
new file mode 100644
index 000000000000..3935cb2455f7
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.0-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.0-wpa_cli.action,v 1.1 2005/04/27 10:02:48 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.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.0.ebuild
new file mode 100644
index 000000000000..42c2ea75c951
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.0.ebuild
@@ -0,0 +1,116 @@
+# 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.0.ebuild,v 1.1 2005/04/27 10:02:48 brix Exp $
+
+inherit 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 readline ssl"
+
+DEPEND="gsm? ( sys-apps/pcsc-lite )
+		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"
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	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
+
+	newinitd ${FILESDIR}/${MY_P}-init.d wpa_supplicant || die
+	newconfd ${FILESDIR}/${MY_P}-conf.d wpa_supplicant || die
+}
+
+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
+}