Version bump.

7 files changed, 172 insertions, 2 deletions

diff --git a/net-wireless/wpa-supplicant/ChangeLog b/net-wireless/wpa-supplicant/ChangeLog
index defae2084970..214386e811e3 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.1 2004/09/16 18:19:40 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa-supplicant/ChangeLog,v 1.2 2004/10/16 15:00:34 brix Exp $
+
+*wpa-supplicant-0.2.5 (16 Oct 2004)
+
+  16 Oct 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa-supplicant-0.2.5-config, +files/wpa_supplicant-0.2.5-conf.d,
+  +files/wpa_supplicant-0.2.5-init.d, +wpa-supplicant-0.2.5.ebuild:
+  Version bump. Added ipw2100 patch from upstream. Added init script.
 
 *wpa-supplicant-0.2.4 (16 Sep 2004)
 
diff --git a/net-wireless/wpa-supplicant/Manifest b/net-wireless/wpa-supplicant/Manifest
index 3e8eae3f72df..f45dc868e72d 100644
--- a/net-wireless/wpa-supplicant/Manifest
+++ b/net-wireless/wpa-supplicant/Manifest
@@ -1,5 +1,10 @@
+MD5 fde1923c07e5de32f9b5fd2cb0423d22 wpa-supplicant-0.2.5.ebuild 1781
 MD5 578c24ee4c98a3b40d83a35a0f2d05a6 wpa-supplicant-0.2.4.ebuild 1486
-MD5 185e08359aa0ca4cb8286c4ad96f8b1c ChangeLog 447
+MD5 97568ac4a8d61f38cf60546cabb3fdbf ChangeLog 751
 MD5 dc1773fc29727c205a632b4a780a5d21 metadata.xml 219
 MD5 1f91b0edd54ee435426f50cd10807c6d files/digest-wpa-supplicant-0.2.4 156
+MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa-supplicant-0.2.5 235
+MD5 b2bb8e6d5a1663945c4ce0d9b4c70ba1 files/wpa-supplicant-0.2.5-config 606
+MD5 61ce9cacb6827fa1c2552515fad9d1d1 files/wpa_supplicant-0.2.5-conf.d 398
+MD5 dedbc9631142e73e7c7b5d26cf4a1a4a files/wpa_supplicant-0.2.5-init.d 974
 MD5 a0d0816840e412152255c4a62bfde94c files/wpa-supplicant-0.2.4-config 582
diff --git a/net-wireless/wpa-supplicant/files/digest-wpa-supplicant-0.2.5 b/net-wireless/wpa-supplicant/files/digest-wpa-supplicant-0.2.5
new file mode 100644
index 000000000000..e427fe8be624
--- /dev/null
+++ b/net-wireless/wpa-supplicant/files/digest-wpa-supplicant-0.2.5
@@ -0,0 +1,3 @@
+MD5 6a3bdec50022ce6b56cb874ed55690bf wpa_supplicant-0.2.5.tar.gz 193387
+MD5 6c5f62812f30b962e054782b9cec7b9c madwifi-driver-0.1_pre20040906.tar.bz2 1797060
+MD5 00912391abc208c4c76a0dd0b946a4cd wpa_supplicant-0.2.5-ipw2100.diff.gz 3650
diff --git a/net-wireless/wpa-supplicant/files/wpa-supplicant-0.2.5-config b/net-wireless/wpa-supplicant/files/wpa-supplicant-0.2.5-config
new file mode 100644
index 000000000000..c43e6e0a6034
--- /dev/null
+++ b/net-wireless/wpa-supplicant/files/wpa-supplicant-0.2.5-config
@@ -0,0 +1,27 @@
+# Needed for the wireless drivers
+CONFIG_WIRELESS_EXTENSION=y
+
+# Drivers which compile out-of-the-box
+CONFIG_DRIVER_ATMEL=y
+CONFIG_DRIVER_HOSTAP=y
+CONFIG_DRIVER_NDISWRAPPER=y
+CONFIG_DRIVER_PRISM54=y
+CONFIG_DRIVER_WEXT=y
+
+# Drivers which doesn't compile out-of-the-box
+#CONFIG_DRIVER_HERMES=y
+
+# Drivers which compiles using patches/external sources
+CONFIG_DRIVER_IPW2100=y
+CONFIG_DRIVER_MADWIFI=y
+
+# Authentication methods
+CONFIG_IEEE8021X_EAPOL=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_LEAP=y
+CONFIG_EAP_MD5=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_SIM=y
+CONFIG_MSCHAPV2=y
+
+# ssl and pcap USE flags controls remaining options!
diff --git a/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-conf.d b/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-conf.d
new file mode 100644
index 000000000000..50c1c95a678a
--- /dev/null
+++ b/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-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.2.5-conf.d,v 1.1 2004/10/16 15:00:34 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.2.5-init.d b/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-init.d
new file mode 100644
index 000000000000..db3ef964e3e4
--- /dev/null
+++ b/net-wireless/wpa-supplicant/files/wpa_supplicant-0.2.5-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.2.5-init.d,v 1.1 2004/10/16 15:00:34 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.ebuild b/net-wireless/wpa-supplicant/wpa-supplicant-0.2.5.ebuild
new file mode 100644
index 000000000000..605e0a701455
--- /dev/null
+++ b/net-wireless/wpa-supplicant/wpa-supplicant-0.2.5.ebuild
@@ -0,0 +1,74 @@
+# 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/wpa-supplicant-0.2.5.ebuild,v 1.1 2004/10/16 15:00:34 brix Exp $
+
+inherit eutils
+
+MADWIFI_VERSION="0.1_pre20040906"
+
+MY_P="${P/wpa-/wpa_}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="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-driver-${MADWIFI_VERSION}.tar.bz2
+		mirror://gentoo/${MY_P}-ipw2100.diff.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="gsm pcap ssl"
+
+DEPEND="sys-apps/sed"
+RDEPEND="gsm? ( sys-apps/pcsc-lite )
+		pcap? ( net-libs/libpcap
+				dev-libs/libdnet )
+		ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${WORKDIR}/${MY_P}-ipw2100.diff
+
+	sed -i "s:madwifi/wpa::" ${S}/Makefile
+
+	# Use pcap and libdnet if we have it.
+	if use pcap; then
+		sed -i "s:^#CFLAGS\(.*\):CFLAGS\1:" ${S}/Makefile
+		sed -i "s:^#LIBS\(.*\):LIBS\1:" ${S}/Makefile
+	fi
+
+	cp ${FILESDIR}/${P}-config ${S}/.config || die
+
+	if use ssl; then
+		echo "CONFIG_EAP_TLS=y" >> ${S}/.config
+		echo "CONFIG_EAP_PEAP=y" >> ${S}/.config
+		echo "CONFIG_EAP_TTLS=y" >> ${S}/.config
+	fi
+
+	if use gsm; then
+		echo "CONFIG_PCSC=y" >> ${S}/.config
+	fi
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dosbin wpa_cli wpa_passphrase wpa_supplicant
+
+	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}/${MY_P}-init.d wpa_supplicant
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${MY_P}-conf.d wpa_supplicant
+}