New development snapshot. Compile against headers installed by net-wireless/madwifi-driver instead of local snapshot.

(Portage version: 2.0.51.22-r2)

5 files changed, 192 insertions, 2 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 45d84fabeb08..6bbad484ff59 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.33 2005/08/16 12:37:22 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.34 2005/08/22 12:53:24 brix Exp $
+
+*wpa_supplicant-0.4.4 (22 Aug 2005)
+
+  22 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.4.4-wpa_cli.action, +wpa_supplicant-0.4.4.ebuild:
+  New development snapshot. Compile against headers installed by
+  net-wireless/madwifi-driver instead of local snapshot.
 
   16 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
   wpa_supplicant-0.3.9-r1.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 2eafbe1afab7..862a05f04502 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,11 +1,14 @@
 MD5 21bf8f048a12ed4b120a29a765d77d0f wpa_supplicant-0.4.3-r1.ebuild 3527
+MD5 c71a0d67f70955fc9362318a6cb8c098 wpa_supplicant-0.4.4.ebuild 3626
 MD5 090212b7ed178b6a7e269f4eb57fdc25 wpa_supplicant-0.3.9-r1.ebuild 3236
 MD5 c49fb2bfb9587a39da2533eea26fdbe8 wpa_supplicant-0.3.8-r1.ebuild 3172
-MD5 7b099c8e7256f2d7ae11dcb31d370f84 ChangeLog 9195
+MD5 cb0bbbb049a6c602e63311c359c8f0c3 ChangeLog 9485
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 d1bbf5c729fef085e916e0a02c65782e files/wpa_supplicant-0.4.3-wpa_cli.action 1233
+MD5 ac644da9f49ee164d3ff83845f87b255 files/digest-wpa_supplicant-0.4.4 72
 MD5 6b30dfb43745d57ea0280e9fb1467546 files/digest-wpa_supplicant-0.3.8-r1 157
 MD5 a5d385e515e9989ba56f4c89fd83091a files/digest-wpa_supplicant-0.3.9-r1 157
 MD5 9d6a7df32d449a9bc76e908d47d27f0c files/digest-wpa_supplicant-0.4.3-r1 157
 MD5 8b721abd27f59880578d200b7e4b6c8b files/wpa_supplicant-0.3.8-r1-conf.d 397
 MD5 eb92461388d565935eeb71df78baa8b7 files/wpa_supplicant-0.3.8-r1-init.d 969
+MD5 c1c8e0ca5f5a3781e3612def405f4f5d files/wpa_supplicant-0.4.4-wpa_cli.action 1104
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.4 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.4
new file mode 100644
index 000000000000..9958bd5a6437
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.4
@@ -0,0 +1 @@
+MD5 29c70c9ee0891072db413459cdac2e18 wpa_supplicant-0.4.4.tar.gz 395049
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.4-wpa_cli.action b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.4-wpa_cli.action
new file mode 100644
index 000000000000..1438e08ff3db
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.4-wpa_cli.action
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright 1999-2005 Gentoo Foundation
+# Written by Roy Marples <uberlord@gentoo.org>
+# Distributed under the terms of the GNU General Public License v2
+# Alternatively, this file may be distributed under the terms of the BSD License
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.4-wpa_cli.action,v 1.1 2005/08/22 12:53:24 brix Exp $
+
+if [ -z "$1" -o -z "$2" ]; then
+	echo "Insufficient parameters" > /dev/stderr
+	exit 1
+fi
+
+INTERFACE="$1"
+ACTION="$2"
+
+# Note, the below action must NOT mark the interface down via ifconfig, ip or
+# similar. Addresses can be removed, changed and daemons can be stopped, but
+# the interface must remain up for wpa_supplicant to work.
+
+if [ -f /etc/gentoo-release ]; then
+	EXEC="/etc/init.d/net.${INTERFACE} --quiet"
+else
+	echo "I don't know what to do with this distro!" > /dev/stderr
+	exit 1
+fi
+
+case ${ACTION} in
+	CONNECTED)
+		EXEC="${EXEC} start"
+		;;
+	DISCONNECTED)
+		EXEC="${EXEC} stop"
+		;;
+	*)
+		echo "Unknown action ${ACTION}" > /dev/stderr
+		exit 1
+		;;
+esac
+
+# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't
+# stopping the interface and a background process - like wpa_cli - is.
+export IN_BACKGROUND=true
+
+${EXEC}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.4.ebuild
new file mode 100644
index 000000000000..ca8db65236c2
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.4.ebuild
@@ -0,0 +1,135 @@
+# 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.4.4.ebuild,v 1.1 2005/08/22 12:53:24 brix Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-${PV/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+SRC_URI="http://hostap.epitest.fi/releases/${MY_P}.tar.gz"
+LICENSE="|| ( GPL-2 BSD )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gsm madwifi qt readline ssl"
+
+DEPEND="gsm? ( sys-apps/pcsc-lite )
+		qt? ( =x11-libs/qt-3* )
+		readline? ( sys-libs/ncurses
+					sys-libs/readline )
+		ssl? ( dev-libs/openssl )
+		madwifi? ( >=net-wireless/madwifi-driver-0.1_pre20050420-r1 )
+		>=sys-apps/baselayout-1.11.13"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# basic setup
+	echo "CONFIG_CTRL_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 debug; then
+		echo "CONFIG_NO_STDOUT_DEBUG=y" >> ${CONFIG}
+	fi
+
+	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}
+		echo "CONFIG_SMARTCARD=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}
+	echo "CONFIG_DRIVER_WIRED=y"       >> ${CONFIG}
+
+	if use madwifi; then
+		# Add include path for madwifi-driver headers
+		echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG}
+		echo "CONFIG_DRIVER_MADWIFI=y"           >> ${CONFIG}
+	fi
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use qt; then
+		[[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings
+		emake wpa_gui || die "emake wpa_gui failed"
+	fi
+}
+
+src_install() {
+	into /
+
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	newsbin ${FILESDIR}/${MY_P}-wpa_cli.action wpa_cli.action
+
+	if use qt; then
+		into /usr
+		dobin wpa_gui/wpa_gui
+	fi
+
+	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
+	dodoc doc/wpa_supplicant.fig
+
+	insinto /etc
+	newins wpa_supplicant.conf wpa_supplicant.conf.example
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${MY_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
+	einfo "Please note that the wpa_supplicant init script has been"
+	einfo "removed in favor of sys-apps/baselayout-1.11.x"
+	einfo
+	if use madwifi; then
+		einfo "This package now compiles against the headers installed by"
+		einfo "net-wireless/madwifi-driver. You should remerge ${PN} after"
+		einfo "upgrading net-wireless/madwifi-driver."
+		einfo
+	fi
+}