New development snapshot. Moved wpa_cli.action to /etc/wpa_supplicant/ to allow for customization, along with symlink for backwards compatibility. Moved example configuration file away from /etc/.

Package-Manager: portage-2.0.54

5 files changed, 200 insertions, 2 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 59d3d850dab6..e84f3eba0594 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.47 2006/01/17 20:07:22 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.48 2006/01/30 22:37:36 brix Exp $
+
+*wpa_supplicant-0.5.1 (30 Jan 2006)
+
+  30 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.5.1-wpa_cli.action, +wpa_supplicant-0.5.1.ebuild:
+  New development snapshot. Moved wpa_cli.action to /etc/wpa_supplicant/ to
+  allow for customization, along with symlink for backwards compatibility.
+  Moved example configuration file away from /etc/.
 
   17 Jan 2006; Roy Marples <uberlord@gentoo.org>
   wpa_supplicant-0.4.7-r1.ebuild, wpa_supplicant-0.5.0-r1.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 3b4eab728500..c6217d6c5fe1 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,4 +1,4 @@
-MD5 e7b62f344b3a0fdbb03e9339b8c72d0f ChangeLog 11751
+MD5 ec184600e5da2fbc19ecbc3422031a6e ChangeLog 12118
 MD5 6b30dfb43745d57ea0280e9fb1467546 files/digest-wpa_supplicant-0.3.8-r1 157
 MD5 a5d385e515e9989ba56f4c89fd83091a files/digest-wpa_supplicant-0.3.9-r1 157
 MD5 6f35db046eea3cd08dd5d9c8f77f7050 files/digest-wpa_supplicant-0.4.5 72
@@ -7,12 +7,14 @@ MD5 399c0ed3e8d999a49b9435a83705f96c files/digest-wpa_supplicant-0.4.7 72
 MD5 399c0ed3e8d999a49b9435a83705f96c files/digest-wpa_supplicant-0.4.7-r1 72
 MD5 a62623b2da060504fd692243f7fe8565 files/digest-wpa_supplicant-0.5.0 72
 MD5 a62623b2da060504fd692243f7fe8565 files/digest-wpa_supplicant-0.5.0-r1 72
+MD5 5bfea8bd43099447fbc04e9d1ea252f9 files/digest-wpa_supplicant-0.5.1 72
 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 733cfce52cfeaadca5b61e90b36fd90b files/wpa_supplicant-0.4.5-wpa_cli.action 1233
 MD5 c3e0a211ce07e200426b871069487403 files/wpa_supplicant-0.4.6-wpa_cli.action 1233
 MD5 647ec6dd4aa43749b03eabb84072b161 files/wpa_supplicant-0.4.7-wpa_cli.action 1233
 MD5 5f13846e2c19fe54d04d79d05fd5638b files/wpa_supplicant-0.5.0-wpa_cli.action 1233
+MD5 e8755040595ff9248c11ed599ef403a1 files/wpa_supplicant-0.5.1-wpa_cli.action 1233
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 c49fb2bfb9587a39da2533eea26fdbe8 wpa_supplicant-0.3.8-r1.ebuild 3172
 MD5 090212b7ed178b6a7e269f4eb57fdc25 wpa_supplicant-0.3.9-r1.ebuild 3236
@@ -22,3 +24,4 @@ MD5 e7ece70cab1c3db0dea6e7f213f0e5a0 wpa_supplicant-0.4.7-r1.ebuild 3900
 MD5 e160e685fea1c7c2717acebbe4fe6dff wpa_supplicant-0.4.7.ebuild 3564
 MD5 c920dc6221b4ca864340d5beb151bd21 wpa_supplicant-0.5.0-r1.ebuild 3946
 MD5 b8e4a9f34bdfbcf05f03a39b8d600186 wpa_supplicant-0.5.0.ebuild 3610
+MD5 984580d298ee333d3717659760f204d4 wpa_supplicant-0.5.1.ebuild 4045
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.1 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.1
new file mode 100644
index 000000000000..125211f152b2
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.1
@@ -0,0 +1 @@
+MD5 d99349503945c4534c6f46d21dfe0ca3 wpa_supplicant-0.5.1.tar.gz 512582
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.1-wpa_cli.action b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.1-wpa_cli.action
new file mode 100644
index 000000000000..cd4f44eaeba4
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.1-wpa_cli.action
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright 1999-2006 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.5.1-wpa_cli.action,v 1.1 2006/01/30 22:37:36 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.5.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.1.ebuild
new file mode 100644
index 000000000000..780537d5bafd
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2006 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.5.1.ebuild,v 1.1 2006/01/30 22:37:36 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="gsm madwifi qt readline ssl"
+
+DEPEND="gsm? ( sys-apps/pcsc-lite )
+		qt? ( || ( =x11-libs/qt-3* =x11-libs/qt-4* ) )
+		readline? ( sys-libs/ncurses
+					sys-libs/readline )
+		ssl? ( dev-libs/openssl )
+		madwifi? ( >=net-wireless/madwifi-driver-0.1401.20060117 )"
+
+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_BACKEND=file" >> ${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}
+	echo "CONFIG_STAKEY=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}
+		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
+		if has_version '=x11-libs/qt-4*'; then
+			qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
+			cd "${S}"/wpa_gui-qt4
+			emake || die "emake wpa_gui-qt4 failed"
+		else
+			[[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings
+			emake wpa_gui || die "emake wpa_gui failed"
+		fi
+	fi
+}
+
+src_install() {
+	into /
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	exeinto /etc/wpa_supplicant/
+	newexe ${FILESDIR}/${MY_P}-wpa_cli.action wpa_cli.action
+	# compatibility symlink for older baselayout
+	dosym /etc/wpa_supplicant/wpa_cli.action /sbin/wpa_cli.action
+
+	if use qt; then
+		into /usr
+
+		if has_version '=x11-libs/qt-4*'; then
+			dobin wpa_gui-qt4/wpa_gui
+		else
+			dobin wpa_gui/wpa_gui
+		fi
+	fi
+
+	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
+	newdoc wpa_supplicant.conf wpa_supplicant.conf.example
+
+	doman doc/docbook/*.8
+	doman doc/docbook/*.5
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${MY_P} you must create the configuration file"
+	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
+	einfo
+	einfo "An example configuration file is available as"
+	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.example.gz"
+	einfo
+	if use madwifi; then
+		einfo "This package now compiles against the headers installed by"
+		einfo "net-wireless/madwifi-driver. You should reemerge ${PN} after"
+		einfo "upgrading net-wireless/madwifi-driver."
+		einfo
+	fi
+}