10 files changed, 20 insertions, 181 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 4325e3ab15bf..8198a23380b9 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,16 @@
 # 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.19 2005/02/14 08:25:29 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.20 2005/02/14 14:20:15 brix Exp $
+
+*wpa_supplicant-0.2.7 (14 Feb 2005)
+
+  14 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  -files/wpa_supplicant-0.2.6-conf.d, -files/wpa_supplicant-0.2.6-init.d,
+  +files/wpa_supplicant-0.2.7-conf.d, +files/wpa_supplicant-0.2.7-init.d,
+  -files/wpa_supplicant-0.3.7-conf.d, -files/wpa_supplicant-0.3.7-init.d,
+  -wpa_supplicant-0.2.6.ebuild, +wpa_supplicant-0.2.7.ebuild,
+  -wpa_supplicant-0.3.7.ebuild:
+  Version bump.
 
 *wpa_supplicant-0.3.8 (14 Feb 2005)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 53ba952fbbeb..60ed197650ea 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,14 +1,10 @@
-MD5 d970c44db030e64224e111746c7800a6 wpa_supplicant-0.2.6.ebuild 2722
 MD5 2d6b543fdb363cb1c4f147713fc138cd wpa_supplicant-0.3.8.ebuild 3128
-MD5 af862d4ae653cac8c7fe431b27e60c62 ChangeLog 6186
-MD5 a31e940099555a64d327c5b5fd66eb9a wpa_supplicant-0.3.7.ebuild 3167
+MD5 4d2fd49e3994d5cabec6b9c26b92ea11 wpa_supplicant-0.2.7.ebuild 2722
+MD5 4f5f0cee209d56ea36fad0bbd16150ed ChangeLog 6610
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 78e1b4e6585e53e08ba3210eb53d4258 files/wpa_supplicant-0.3.8-conf.d 394
-MD5 ea1906e324ec931c5a70f344d516dca7 files/digest-wpa_supplicant-0.2.6 156
-MD5 4917102a0402ade8ebe4ae9917908ae2 files/digest-wpa_supplicant-0.3.7 157
+MD5 461b028eb4103f140fa88d33efbb640a files/digest-wpa_supplicant-0.2.7 156
 MD5 6b30dfb43745d57ea0280e9fb1467546 files/digest-wpa_supplicant-0.3.8 157
 MD5 95a04705cb8e47f8d4611186cffb6a96 files/wpa_supplicant-0.3.8-init.d 975
-MD5 1db694317effaccc67767334fd1fead8 files/wpa_supplicant-0.3.7-conf.d 394
-MD5 3a69ceadb6e5823ef44a284e6257cc9c files/wpa_supplicant-0.3.7-init.d 975
-MD5 85f5f0949d17e5513602360ba202149c files/wpa_supplicant-0.2.6-conf.d 398
-MD5 a75b4655a25978797324051b552a363b files/wpa_supplicant-0.2.6-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
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.6 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.7
index fd90603a62bd..3599ed0ad6bd 100644
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.6
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.7
@@ -1,2 +1,2 @@
-MD5 7f83c74bf5e6db7dc564c391a44a9fe7 wpa_supplicant-0.2.6.tar.gz 194438
+MD5 867e28685808700024069c4b935315a1 wpa_supplicant-0.2.7.tar.gz 194574
 MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.7 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.7
deleted file mode 100644
index 013ee1c956eb..000000000000
--- a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2b7e25a12078788c7d952d1403a3798d wpa_supplicant-0.3.7.tar.gz 301069
-MD5 8237d57be31464ddd7a710704e6755f0 madwifi-cvs-snapshot-2005-01-07.tar.bz2 1586914
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.6-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.6-init.d
deleted file mode 100644
index a3923e4fd3dd..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.6-init.d
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/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.2.6-init.d,v 1.1 2004/12/26 21:38:21 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.2.6-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-conf.d
index 73f9051be681..4bb3bd912233 100644
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.6-conf.d
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-conf.d
@@ -1,6 +1,6 @@
 # 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.2.6-conf.d,v 1.1 2004/12/26 21:38:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-conf.d,v 1.1 2005/02/14 14:20:15 brix Exp $
 
 # List of interfaces
 INTERFACES="eth1"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.7-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-init.d
index a52b191283f5..0367c9736866 100644
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.7-init.d
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-init.d
@@ -1,7 +1,7 @@
 #!/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.7-init.d,v 1.1 2005/02/13 11:53:44 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.7-init.d,v 1.1 2005/02/14 14:20:15 brix Exp $
 
 depend() {
 	before net
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.7-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.7-conf.d
deleted file mode 100644
index c727604ee465..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.7-conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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.7-conf.d,v 1.1 2005/02/13 11:53:44 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/wpa_supplicant-0.2.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.7.ebuild
index 2413a7b0e11f..4aa25bf83261 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.7.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2005/01/14 17:24:30 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.2.7.ebuild,v 1.1 2005/02/14 14:20:15 brix Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.7.ebuild
deleted file mode 100644
index 743e9d7f4210..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.7.ebuild,v 1.1 2005/02/13 11:53:44 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_IPW=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 "Please notice that the ipw2100 driver has changed name"
-	einfo "to ipw, meaning you will need to specify -Dipw to ${PN}"
-	einfo
-	einfo "An example configuration file has been installed as"
-	einfo "/etc/wpa_supplicant.conf.example"
-	einfo
-}