New development snapshot.

(Portage version: 2.0.51-r15)

6 files changed, 177 insertions, 2 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 9997382179f2..a83d239d39c3 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.13 2005/01/24 19:17:52 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.14 2005/01/25 14:13:12 brix Exp $
+
+*wpa_supplicant-0.3.6 (25 Jan 2005)
+
+  25 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.3.6-conf.d, +files/wpa_supplicant-0.3.6-init.d,
+  +wpa_supplicant-0.3.6.ebuild:
+  New development snapshot.
 
 *wpa_supplicant-0.3.5 (24 Jan 2005)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index c408d01ded8e..2ec6919f0766 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,16 +1,19 @@
 MD5 d970c44db030e64224e111746c7800a6 wpa_supplicant-0.2.6.ebuild 2722
 MD5 481aefb5c38f5ced44ea0506d35380ee wpa_supplicant-0.3.4.ebuild 3031
 MD5 577620ac0a76e46bea0eb793f2e83ad8 wpa_supplicant-0.2.5-r1.ebuild 1854
+MD5 6aae6e2938861831df76e5fed4dc5642 wpa_supplicant-0.3.6.ebuild 2916
 MD5 9011acca2ca6283f800a8553e3d0bbdd wpa_supplicant-0.3.1.ebuild 2843
 MD5 443b36aa0cd3f745cadf73c6378a7914 wpa_supplicant-0.3.3.ebuild 3016
 MD5 c75f54105b1c0353f03e91e6a7907076 wpa_supplicant-0.3.5.ebuild 3031
 MD5 8e5bce452597424813b48e7e9132d584 wpa_supplicant-0.3.0.ebuild 2872
-MD5 d2d6ec54c4fe4d8a602407b0adb92628 ChangeLog 4014
+MD5 d0f8910799106c9b5382aba1312b4f8f ChangeLog 4240
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 e60ab8ed1c92edd42a672f488e97369b wpa_supplicant-0.3.2.ebuild 2842
 MD5 7df20229c8a507ca15d8354c1183c0f4 files/wpa_supplicant-0.3.4-init.d 975
 MD5 2bc46403d4bf3ae6e68ae82693a23914 files/wpa_supplicant-0.2.5-pkg-config.patch 1669
+MD5 8d07cde05cf71a5269348f8782a6cc12 files/wpa_supplicant-0.3.6-conf.d 398
 MD5 6f5827a2c4a23e44c33018d90ac25829 files/wpa_supplicant-0.3.1-conf.d 398
+MD5 74ed0e750594a51ded5b634cf9f85f4a files/wpa_supplicant-0.3.6-init.d 975
 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
@@ -23,6 +26,7 @@ MD5 3b2cce8cf6663297d567b4f0a7402776 files/digest-wpa_supplicant-0.3.2 156
 MD5 a64b1197d398c9f9c7f2fb9b18f4bfb3 files/digest-wpa_supplicant-0.3.3 156
 MD5 a58834cdce1fe9d8ee712bf79c5d5ee6 files/digest-wpa_supplicant-0.3.4 157
 MD5 031f2fc9a11074a3ee44056f5f5bd4d5 files/digest-wpa_supplicant-0.3.5 157
+MD5 c6c90373d03489557cb9077c964d64ac files/digest-wpa_supplicant-0.3.6 157
 MD5 30b483b9200b67ee26b21e3287e0842d files/wpa_supplicant-0.3.3-init.d 975
 MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa_supplicant-0.2.5-r1 235
 MD5 8d07cde05cf71a5269348f8782a6cc12 files/wpa_supplicant-0.3.5-conf.d 398
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.6 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.6
new file mode 100644
index 000000000000..5f1f7505f5f4
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.6
@@ -0,0 +1,2 @@
+MD5 e7691bc302beebe9ab3b290d0349925c wpa_supplicant-0.3.6.tar.gz 296948
+MD5 8237d57be31464ddd7a710704e6755f0 madwifi-cvs-snapshot-2005-01-07.tar.bz2 1586914
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.6-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.6-conf.d
new file mode 100644
index 000000000000..bea3b12c26f4
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.6-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.6-conf.d,v 1.1 2005/01/25 14:13:12 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.6-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.6-init.d
new file mode 100644
index 000000000000..aa8555b9c848
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.6-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.6-init.d,v 1.1 2005/01/25 14:13:12 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.3.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.6.ebuild
new file mode 100644
index 000000000000..37f57c9aa29e
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.6.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.6.ebuild,v 1.1 2005/01/25 14:13:12 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="2005-01-07"
+
+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-cvs-snapshot-${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}/madwifi" >> ${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
+}