Version bump. Please note that version 0.3.0 is a development snapshot. USE=gsm is removed in 0.3.0 due to a bug in the code, should be back with next release.

6 files changed, 171 insertions, 11 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 8e6a69fe8342..34ce78c6128b 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,15 @@
 # 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.2 2004/12/11 01:06:40 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.3 2004/12/11 14:39:12 brix Exp $
+
+*wpa_supplicant-0.3.0 (11 Dec 2004)
+
+  11 Dec 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.3.0-conf.d, +files/wpa_supplicant-0.3.0-init.d,
+  +wpa_supplicant-0.3.0.ebuild:
+  Version bump. Please note that version 0.3.0 is a development snapshot.
+  USE=gsm is removed in 0.3.0 due to a bug in the code, should be back with next
+  release.
 
 *wpa_supplicant-0.2.5 (10 Dec 2004)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index c0deb4640683..98d5d6b6ca72 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1b0071ea237d4b8c4334ae80fd1e8ddf wpa_supplicant-0.2.5.ebuild 1844
+MD5 a7c6c65ff474981dde9a1c5fa23f3146 wpa_supplicant-0.3.0.ebuild 2757
 MD5 de54ed7b83a5d2ee0324a140c6c7db8b wpa_supplicant-0.2.4.ebuild 1439
 MD5 aba4ccc0058bfefc2bae08e6fb00bf54 ChangeLog 1645
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
@@ -11,11 +9,7 @@ MD5 b2bb8e6d5a1663945c4ce0d9b4c70ba1 files/wpa_supplicant-0.2.5-config 606
 MD5 4bec60e49c33275fa8e21d27c3909cc5 files/wpa_supplicant-0.2.5-init.d 974
 MD5 1f91b0edd54ee435426f50cd10807c6d files/digest-wpa_supplicant-0.2.4 156
 MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa_supplicant-0.2.5 235
+MD5 1b08e42f180b3bee6247776212a5fb4f files/digest-wpa_supplicant-0.3.0 156
+MD5 61ce9cacb6827fa1c2552515fad9d1d1 files/wpa_supplicant-0.3.0-conf.d 398
+MD5 c7e5e005eaace812105e7948cd2bd8b2 files/wpa_supplicant-0.3.0-init.d 975
 MD5 a0d0816840e412152255c4a62bfde94c files/wpa_supplicant-0.2.4-config 582
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBukgpI1lqEGTUzyQRAhKjAKCwEQ2JarwOM+u5P7c0EnSwCJQrJQCfa8fe
-z7OIngMsHSYjtmjXxyY/25g=
-=Cv7O
------END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.0 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.0
new file mode 100644
index 000000000000..b619fe51f4a9
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.0
@@ -0,0 +1,2 @@
+MD5 579e663120882835b5b2484ccfa60548 wpa_supplicant-0.3.0.tar.gz 253706
+MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-conf.d
new file mode 100644
index 000000000000..1c1291a1c460
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.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.3.0-conf.d,v 1.1 2004/12/11 14:39: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.0-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.0-init.d
new file mode 100644
index 000000000000..b539ad6e7a2f
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.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.3.0-init.d,v 1.1 2004/12/11 14:39: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.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
new file mode 100644
index 000000000000..04fc7099e28a
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.0.ebuild
@@ -0,0 +1,101 @@
+# 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.3.0.ebuild,v 1.1 2004/12/11 14:39:12 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 ssl"
+IUSE="ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+#		gsm? ( sys-apps/pcsc-lite )
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${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}
+
+	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
+
+#	Note: PCSC support is disabled in 0.3.0 due to a bug in the code.
+#	This has been fixed in upstream CVS (brix)
+#
+#	if use gsm; then
+#		# Smart card authentication
+#		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+#		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+#		echo "CONFIG_PCSC=y"    >> ${CONFIG}
+#		echo "CFLAGS += -I/usr/include/PCSC" >> ${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
+}