New development snapshot.

11 files changed, 187 insertions, 12 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index bcc758804c58..2739e7c9e0b6 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.8 2004/12/26 21:38:21 brix Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.9 2005/01/03 11:09:01 brix Exp $
+
+*wpa_supplicant-0.3.3 (03 Jan 2005)
+
+  03 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.3.3-conf.d, +files/wpa_supplicant-0.3.3-init.d,
+  +wpa_supplicant-0.3.3.ebuild:
+  New development snapshot.
 
 *wpa_supplicant-0.2.6 (26 Dec 2004)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 2765012f4ed6..8d9986b54412 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,6 +1,7 @@
 MD5 7d8933369ed23d91402eaa3a8041d12e wpa_supplicant-0.2.6.ebuild 2723
 MD5 aebcf20783dcb62a6ae2d33d65497e19 wpa_supplicant-0.2.5-r1.ebuild 1854
 MD5 434a9cf8d7c405f7bfe3dc8b9a1796f8 wpa_supplicant-0.3.1.ebuild 2843
+MD5 6d8049478d30d98640e51a6d691dcca2 wpa_supplicant-0.3.3.ebuild 2901
 MD5 c3cec75d7e12b74c46d32639369084e2 wpa_supplicant-0.3.0.ebuild 2872
 MD5 8e5d97a8bbe1a66dda54c8742591d3cc ChangeLog 3041
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
@@ -10,11 +11,14 @@ MD5 6f5827a2c4a23e44c33018d90ac25829 files/wpa_supplicant-0.3.1-conf.d 398
 MD5 11ecf21202cd23fc4faa511fec21a85e files/wpa_supplicant-0.3.1-init.d 975
 MD5 8ce172f90e194edc1d06ac18b81a7301 files/wpa_supplicant-0.2.5-conf.d 398
 MD5 b2bb8e6d5a1663945c4ce0d9b4c70ba1 files/wpa_supplicant-0.2.5-config 606
+MD5 586a30fb3487cfd6155df0de2871dedf files/wpa_supplicant-0.3.3-conf.d 398
 MD5 4bec60e49c33275fa8e21d27c3909cc5 files/wpa_supplicant-0.2.5-init.d 974
 MD5 ea1906e324ec931c5a70f344d516dca7 files/digest-wpa_supplicant-0.2.6 156
 MD5 1b08e42f180b3bee6247776212a5fb4f files/digest-wpa_supplicant-0.3.0 156
 MD5 d6b9d13af0f01e8b7fa70b880b8ecdfe files/digest-wpa_supplicant-0.3.1 156
 MD5 3b2cce8cf6663297d567b4f0a7402776 files/digest-wpa_supplicant-0.3.2 156
+MD5 a64b1197d398c9f9c7f2fb9b18f4bfb3 files/digest-wpa_supplicant-0.3.3 156
+MD5 f6319e9891f7bf22f32419bf16535324 files/wpa_supplicant-0.3.3-init.d 975
 MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa_supplicant-0.2.5-r1 235
 MD5 6dbdde5c93f286b00afacc10673e4de7 files/wpa_supplicant-0.3.0-conf.d 398
 MD5 4290cd41db8ead604b3096f53d6795e4 files/wpa_supplicant-0.3.0-init.d 975
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.3 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.3
new file mode 100644
index 000000000000..e40409030727
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.3
@@ -0,0 +1,2 @@
+MD5 ca712a6ef47c46d5fce0e886db87bf7a wpa_supplicant-0.3.3.tar.gz 289131
+MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-conf.d
new file mode 100644
index 000000000000..46e8fe44b0ad
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-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.3.3-conf.d,v 1.1 2005/01/03 11:09:01 brix Exp $
+
+# List of interfaces
+INTERFACES="eth1"
+
+# Common arguments to all wpa_supplicant instances
+ARGS="-w"
+
+# Interface specific arguments
+#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-init.d
new file mode 100644
index 000000000000..a8d833fb2e85
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.3-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.3.3-init.d,v 1.1 2005/01/03 11:09:01 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/wpa_supplicant-0.2.5-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild
index 4de737532358..5ee806ce6d46 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2.5-r1.ebuild,v 1.1 2004/12/16 19:28:26 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.2.5-r1.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild
index 8e9fd2d97de8..834d5a5a3a96 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2.6.ebuild,v 1.1 2004/12/26 21:38:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
index 04fc7099e28a..787183e2d3cd 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3.0.ebuild,v 1.1 2004/12/11 14:39:12 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
index 68d183b75fc2..ad05593041e4 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3.1.ebuild,v 1.1 2004/12/13 09:24:34 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild
index 31d09522783a..e9c1985a6f9f 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3.2.ebuild,v 1.1 2004/12/20 09:11:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.2.ebuild,v 1.2 2005/01/03 11:09:01 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild
new file mode 100644
index 000000000000..cdf89bdb4b2f
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.3.ebuild
@@ -0,0 +1,108 @@
+# 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.3.3.ebuild,v 1.1 2005/01/03 11:09:01 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="0.1_pre20041019"
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
+		mirror://gentoo/madwifi-driver-${MADWIFI_VERSION}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="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 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}
+	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_IPW2100=y"     >> ${CONFIG}
+	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
+	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
+
+	# Add include path for madwifi-driver headers
+	echo "CFLAGS += -I${WORKDIR}"  >> ${CONFIG}
+	echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	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
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${P}-init.d wpa_supplicant || die
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${P}-conf.d wpa_supplicant || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${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
+}