Version bump. Backported FreeBSD support and configuration file layout changes from 0.5.x. Also made wpa_cli.sh more verbose on request from Uberlord.

(Portage version: 2.0.54-r2)

5 files changed, 227 insertions, 52 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index a98a1ced0ba2..bdfd05a05fb5 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.59 2006/04/30 09:43:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.60 2006/05/27 20:01:35 brix Exp $
+
+*wpa_supplicant-0.4.9 (27 May 2006)
+
+  27 May 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.4.9-wpa_cli.sh, +wpa_supplicant-0.4.9.ebuild:
+  Version bump. Backported FreeBSD support and configuration file layout
+  changes from 0.5.x. Also made wpa_cli.sh more verbose on request from
+  Uberlord.
 
 *wpa_supplicant-0.5.3 (29 Apr 2006)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 9014e51691fa..74d3c5dafdec 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,60 +1,18 @@
-AUX wpa_supplicant-0.4.7-wpa_cli.action 1233 RMD160 bcd7fb306ebe5d92326e1547f42298b262abdb99 SHA1 ea2485dee3b355837f82cd863ed052bb9fb145d0 SHA256 d5582427aa3ee349ede428d047f3482a2141fa06ddc3c7e12a8fc3047418fa2f size 1233
+MD5 049ebad111f6ed186a3f98bdfa1c2f4f ChangeLog 14809
+MD5 399c0ed3e8d999a49b9435a83705f96c files/digest-wpa_supplicant-0.4.7 72
+MD5 3c1bdab1affb98719ab98620e2863c8d files/digest-wpa_supplicant-0.4.8 72
+MD5 8bcf0faaf519a1c005317da0ead6cb1b files/digest-wpa_supplicant-0.4.9 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
-RMD160 bcd7fb306ebe5d92326e1547f42298b262abdb99 files/wpa_supplicant-0.4.7-wpa_cli.action 1233
-SHA256 d5582427aa3ee349ede428d047f3482a2141fa06ddc3c7e12a8fc3047418fa2f files/wpa_supplicant-0.4.7-wpa_cli.action 1233
-AUX wpa_supplicant-0.4.8-wpa_cli.action 1233 RMD160 2890bdaa353a2cef199f15eddbcb45915817c25e SHA1 0aba450040ac4770148f053c223a3ebd750c9f58 SHA256 c039fb7fb0d466071ad742cb00ed06054d184769e3aff99e5e91090f90379879 size 1233
 MD5 c6d1b2e0c7ae03ce2de856f00f4718d8 files/wpa_supplicant-0.4.8-wpa_cli.action 1233
-RMD160 2890bdaa353a2cef199f15eddbcb45915817c25e files/wpa_supplicant-0.4.8-wpa_cli.action 1233
-SHA256 c039fb7fb0d466071ad742cb00ed06054d184769e3aff99e5e91090f90379879 files/wpa_supplicant-0.4.8-wpa_cli.action 1233
-AUX wpa_supplicant-0.5.2-wpa_cli.sh 1229 RMD160 aaead644980045aac3ac4e60b51fdc2322ec7f3f SHA1 39a163ffb043d5029a81a768075bc458c176c4e1 SHA256 2750c0eb11046b56fd5d06c0eeb554cc6a769af0edc001e991252278e449b4cb size 1229
+MD5 aa4189989a1f98642a8c638af0b5b2ad files/wpa_supplicant-0.4.9-wpa_cli.sh 1207
 MD5 7557dcc784bddabf268e1c49eee4fb59 files/wpa_supplicant-0.5.2-wpa_cli.sh 1229
-RMD160 aaead644980045aac3ac4e60b51fdc2322ec7f3f files/wpa_supplicant-0.5.2-wpa_cli.sh 1229
-SHA256 2750c0eb11046b56fd5d06c0eeb554cc6a769af0edc001e991252278e449b4cb files/wpa_supplicant-0.5.2-wpa_cli.sh 1229
-AUX wpa_supplicant-0.5.3-stakey.patch 852 RMD160 41ccfa806efa3597d3ef575b967922266a2fe41f SHA1 8518d6e5c203de23365dd987aba0251b07d62924 SHA256 f4f7515ca66272de71358eff823f422f0dda1603a8adbaa97eada78df728a85e size 852
 MD5 89105436a3302a3551d0f9dbde5dfc2f files/wpa_supplicant-0.5.3-stakey.patch 852
-RMD160 41ccfa806efa3597d3ef575b967922266a2fe41f files/wpa_supplicant-0.5.3-stakey.patch 852
-SHA256 f4f7515ca66272de71358eff823f422f0dda1603a8adbaa97eada78df728a85e files/wpa_supplicant-0.5.3-stakey.patch 852
-AUX wpa_supplicant-0.5.3-wpa_cli.sh 1229 RMD160 7955e9e85fd291697777cd39eb74050aa441cee4 SHA1 54c67268c03db5fa92b507be29d67b18c5da9695 SHA256 5be7b172ec567119bfb4f628cfbd54c0252e98b141ab8d8bc8963d569c29d852 size 1229
 MD5 236577621d66ea0ffb21b98ea06843f9 files/wpa_supplicant-0.5.3-wpa_cli.sh 1229
-RMD160 7955e9e85fd291697777cd39eb74050aa441cee4 files/wpa_supplicant-0.5.3-wpa_cli.sh 1229
-SHA256 5be7b172ec567119bfb4f628cfbd54c0252e98b141ab8d8bc8963d569c29d852 files/wpa_supplicant-0.5.3-wpa_cli.sh 1229
-DIST wpa_supplicant-0.4.7.tar.gz 470644 size 470644
-DIST wpa_supplicant-0.4.8.tar.gz 476091 size 476091
-DIST wpa_supplicant-0.5.2.tar.gz 523404 size 523404
-DIST wpa_supplicant-0.5.3.tar.gz 543322 size 543322
-EBUILD wpa_supplicant-0.4.7.ebuild 3564 RMD160 12ea18540f52ebe57113af332e9e6832b444b924 SHA1 509385ce15a7da850b9bd413e51cb1776ffc609f SHA256 4913e305a1901d60da01e212078f89660540d845699b1e396bb3561745863da7 size 3564
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 e160e685fea1c7c2717acebbe4fe6dff wpa_supplicant-0.4.7.ebuild 3564
-RMD160 12ea18540f52ebe57113af332e9e6832b444b924 wpa_supplicant-0.4.7.ebuild 3564
-SHA256 4913e305a1901d60da01e212078f89660540d845699b1e396bb3561745863da7 wpa_supplicant-0.4.7.ebuild 3564
-EBUILD wpa_supplicant-0.4.8.ebuild 3898 RMD160 5908b2c4ac530ea6bd4ca0ecf5f13d4f283b75df SHA1 ba8abe7fa021a1bd5cd087640e21ad49cd297373 SHA256 68670910917e4ca0dba6b0bd558b622202ed33fa090a62d1683330bc1a26f794 size 3898
 MD5 79ad4ef85d3756433e248d066e938aa7 wpa_supplicant-0.4.8.ebuild 3898
-RMD160 5908b2c4ac530ea6bd4ca0ecf5f13d4f283b75df wpa_supplicant-0.4.8.ebuild 3898
-SHA256 68670910917e4ca0dba6b0bd558b622202ed33fa090a62d1683330bc1a26f794 wpa_supplicant-0.4.8.ebuild 3898
-EBUILD wpa_supplicant-0.5.2.ebuild 4687 RMD160 66a829b9199ceb04950a0bef666e2e627ca8f32b SHA1 3981fed495a1bdc74ab2b8a99f0a43e31f6bafd6 SHA256 c7a92c123b9150d406c5374387b60ca3d0b629cf05e63e45ef75f6e03897a1f9 size 4687
+MD5 554ab0ec2efb02e829794fb566e75a4c wpa_supplicant-0.4.9.ebuild 4471
 MD5 6a5f32065e686a4bd5acad27f39e2723 wpa_supplicant-0.5.2.ebuild 4687
-RMD160 66a829b9199ceb04950a0bef666e2e627ca8f32b wpa_supplicant-0.5.2.ebuild 4687
-SHA256 c7a92c123b9150d406c5374387b60ca3d0b629cf05e63e45ef75f6e03897a1f9 wpa_supplicant-0.5.2.ebuild 4687
-EBUILD wpa_supplicant-0.5.3.ebuild 4874 RMD160 97aa043e5c8f60de71ef5fb5c1cd08e6901e51d8 SHA1 b5b5fb1c706ce7ee4b3d24efa8cd64f8a54ce8d1 SHA256 a0ba899049c6995941ace069cfc270812754c26491529559ca32d3e09cb25c05 size 4874
 MD5 eb1bedefec50a4308b63e389b3d65edb wpa_supplicant-0.5.3.ebuild 4874
-RMD160 97aa043e5c8f60de71ef5fb5c1cd08e6901e51d8 wpa_supplicant-0.5.3.ebuild 4874
-SHA256 a0ba899049c6995941ace069cfc270812754c26491529559ca32d3e09cb25c05 wpa_supplicant-0.5.3.ebuild 4874
-MISC ChangeLog 14488 RMD160 64c1c9a8d5c94359c1e0591cafd2cd588e721301 SHA1 027f5152404433f15fa9dff302f2a5e062c45bf3 SHA256 b1f1a7401fc521bed1464ebfe65e07b1f5e758b15bf5cdae2821d78935ce725b size 14488
-MD5 6eb2265765b7a04c42eb6a651a3e23c4 ChangeLog 14488
-RMD160 64c1c9a8d5c94359c1e0591cafd2cd588e721301 ChangeLog 14488
-SHA256 b1f1a7401fc521bed1464ebfe65e07b1f5e758b15bf5cdae2821d78935ce725b ChangeLog 14488
-MISC metadata.xml 255 RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 SHA1 1258e0419f1fe7839c4db37602b5999d0e196bca SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9 size 255
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-RMD160 e6f6333d659d443f0290a257c2b23772ab1cf526 metadata.xml 255
-SHA256 255c7b73ddde5e979b6b53de0f9f5b858e22e602e0495f484b2a33cd2987edf9 metadata.xml 255
-MD5 399c0ed3e8d999a49b9435a83705f96c files/digest-wpa_supplicant-0.4.7 72
-RMD160 3a80cd37dad65d44a9c0e60d4fa44150ce7c0221 files/digest-wpa_supplicant-0.4.7 72
-SHA256 862342c3f3f6c984ce9963cf86218169d0da0b11ba036ece92e9f95a8112c6ef files/digest-wpa_supplicant-0.4.7 72
-MD5 3c1bdab1affb98719ab98620e2863c8d files/digest-wpa_supplicant-0.4.8 72
-RMD160 9647d5d42b3b1d003e0eaa6ebb81609b88c0ffbf files/digest-wpa_supplicant-0.4.8 72
-SHA256 4ffe01c30c9df1b9bb9a9eb0517e2975fc5498b30d699f64dd15a14e45675868 files/digest-wpa_supplicant-0.4.8 72
-MD5 a9017f6f882a41e700a0a517ef60e964 files/digest-wpa_supplicant-0.5.2 72
-RMD160 0180e3e8bf9cc87e838c1f6b362caef87b666776 files/digest-wpa_supplicant-0.5.2 72
-SHA256 8e77493ac9e266a83cfb7af7915b9d3190bce0a953753bfe01cc0c2e3fa72d66 files/digest-wpa_supplicant-0.5.2 72
-MD5 61520e32185ad1f5efcf26a995d1b411 files/digest-wpa_supplicant-0.5.3 72
-RMD160 c099c1d9ff21f66545b7050add7e59656f2862e5 files/digest-wpa_supplicant-0.5.3 72
-SHA256 a1bd48c47ae82f89e85a1136930b81f69b76ac558a5ac8e30dafd9282e47939f files/digest-wpa_supplicant-0.5.3 72
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9
new file mode 100644
index 000000000000..941dcf9f24c9
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.4.9
@@ -0,0 +1 @@
+MD5 98498c152cbfc388c306fd9bbf7d57d4 wpa_supplicant-0.4.9.tar.gz 483279
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.9-wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.9-wpa_cli.sh
new file mode 100644
index 000000000000..52be141692fb
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.4.9-wpa_cli.sh
@@ -0,0 +1,45 @@
+#!/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.4.9-wpa_cli.sh,v 1.1 2006/05/27 20:01:35 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
+
+logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"
+${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild
new file mode 100644
index 000000000000..84329c97f901
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild
@@ -0,0 +1,163 @@
+# 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.4.9.ebuild,v 1.1 2006/05/27 20:01:35 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"
+
+RDEPEND="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}
+
+	# 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_PSK=y"         >> ${CONFIG}
+	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=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
+
+	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
+}