New development snapshot.

(Portage version: 2203-svn)

6 files changed, 253 insertions, 2 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 6b93647f2350..7a4f32befbf1 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.57 2006/04/22 16:33:34 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.58 2006/04/29 14:28:47 brix Exp $
+
+*wpa_supplicant-0.5.3 (29 Apr 2006)
+
+  29 Apr 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.5.3-stakey.patch,
+  +files/wpa_supplicant-0.5.3-wpa_cli.sh, +wpa_supplicant-0.5.3.ebuild:
+  New development snapshot.
 
   22 Apr 2006; Henrik Brix Andersen <brix@gentoo.org>
   wpa_supplicant-0.5.2.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 860c113d07e0..ada9b63513c6 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,11 +1,15 @@
-MD5 cbdbd54d62975e119ed16ff601da383a ChangeLog 14053
+MD5 f6e395d524c66bfbbe4b967fd1266456 ChangeLog 14289
 MD5 399c0ed3e8d999a49b9435a83705f96c files/digest-wpa_supplicant-0.4.7 72
 MD5 3c1bdab1affb98719ab98620e2863c8d files/digest-wpa_supplicant-0.4.8 72
 MD5 a9017f6f882a41e700a0a517ef60e964 files/digest-wpa_supplicant-0.5.2 72
+MD5 61520e32185ad1f5efcf26a995d1b411 files/digest-wpa_supplicant-0.5.3 72
 MD5 647ec6dd4aa43749b03eabb84072b161 files/wpa_supplicant-0.4.7-wpa_cli.action 1233
 MD5 c6d1b2e0c7ae03ce2de856f00f4718d8 files/wpa_supplicant-0.4.8-wpa_cli.action 1233
 MD5 7557dcc784bddabf268e1c49eee4fb59 files/wpa_supplicant-0.5.2-wpa_cli.sh 1229
+MD5 89105436a3302a3551d0f9dbde5dfc2f files/wpa_supplicant-0.5.3-stakey.patch 852
+MD5 7557dcc784bddabf268e1c49eee4fb59 files/wpa_supplicant-0.5.3-wpa_cli.sh 1229
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 e160e685fea1c7c2717acebbe4fe6dff wpa_supplicant-0.4.7.ebuild 3564
 MD5 3ecc467d6e993983e8fc11a3a021b0e1 wpa_supplicant-0.4.8.ebuild 3898
 MD5 6a5f32065e686a4bd5acad27f39e2723 wpa_supplicant-0.5.2.ebuild 4687
+MD5 93e9129464b7303e9d74bb642842f56d wpa_supplicant-0.5.3.ebuild 4759
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.3 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.3
new file mode 100644
index 000000000000..f614e4793998
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.3
@@ -0,0 +1 @@
+MD5 f30cd996ebdd9f1f6aeab65f8cfac3c3 wpa_supplicant-0.5.3.tar.gz 543322
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-stakey.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-stakey.patch
new file mode 100644
index 000000000000..299f0d5e7d1d
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-stakey.patch
@@ -0,0 +1,21 @@
+diff -urp wpa_supplicant-0.5.3/wpa.c wpa_supplicant-0.5.3-stakey/wpa.c
+--- wpa_supplicant-0.5.3/wpa.c	2006-04-25 05:18:58.000000000 +0200
++++ wpa_supplicant-0.5.3-stakey/wpa.c	2006-04-29 16:06:21.000000000 +0200
+@@ -1849,6 +1849,8 @@ static int wpa_supplicant_process_stakey
+ 
+ 
+ static int wpa_supplicant_process_1_of_2_rsn(struct wpa_sm *sm,
++					     const unsigned char *src_addr,
++					     const struct wpa_eapol_key *key,
+ 					     const u8 *keydata,
+ 					     size_t keydatalen,
+ 					     u16 key_info,
+@@ -2036,7 +2038,7 @@ static void wpa_supplicant_process_1_of_
+ 	keydatalen = WPA_GET_BE16(key->key_data_length);
+ 
+ 	if (sm->proto == WPA_PROTO_RSN) {
+-		ret = wpa_supplicant_process_1_of_2_rsn(sm,
++		ret = wpa_supplicant_process_1_of_2_rsn(sm, src_addr, key,
+ 							(const u8 *) (key + 1),
+ 							keydatalen, key_info,
+ 							&gd);
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-wpa_cli.sh
new file mode 100644
index 000000000000..3e2642e1aa2c
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.3-wpa_cli.sh
@@ -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.3-wpa_cli.sh,v 1.1 2006/04/29 14:28:48 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.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.3.ebuild
new file mode 100644
index 000000000000..fbd0a6117acc
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.3.ebuild
@@ -0,0 +1,174 @@
+# 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.3.ebuild,v 1.1 2006/04/29 14:28:48 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="dbus gsm madwifi qt readline ssl"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+		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 )
+		kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) )
+		!kernel_linux? ( net-libs/libpcap )"
+DEPEND="sys-apps/sed
+		${RDEPEND}"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-stakey.patch
+
+	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		${S}/l2_packet_freebsd.c
+
+	# 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_PAX=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_TLV=y"         >> ${CONFIG}
+	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
+	echo "CONFIG_STAKEY=y"          >> ${CONFIG}
+
+	if use dbus; then
+		echo "CONFIG_CTRL_IFACE_DBUS=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
+
+	if use kernel_linux; then
+		# Linux specific drivers
+		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${ROOT}/usr/include/madwifi" >> ${CONFIG}
+			echo "CONFIG_DRIVER_MADWIFI=y"                 >> ${CONFIG}
+		fi
+	fi
+
+	if use kernel_FreeBSD; then
+		# FreeBSD specific driver
+		echo "CONFIG_DRIVER_BSD=y" >> ${CONFIG}
+	fi
+
+	# people seem to take the example configuration file too literally
+	# bug #102361
+	sed -i \
+		-e "s:^\(opensc_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_module_path\):#\1:" \
+		${S}/wpa_supplicant.conf || die
+}
+
+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.sh wpa_cli.sh
+
+	# compatibility symlink for older baselayout
+	dosym /etc/wpa_supplicant/wpa_cli.sh /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 "the madwifi driver. You should reemerge ${PN} after"
+		einfo "upgrading your madwifi driver."
+		einfo
+	fi
+}