New maintainer

  Fixed some potential quoting issues in 0.5.4
  Generic wpa_cli.sh for 0.4.9 and 0.5.4
  wpa_cli.sh now uses logger for all reporting
(Portage version: 2.1.1_pre2-r6)

5 files changed, 99 insertions, 49 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 7fad27c81cb8..44ae1e0e4545 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.64 2006/06/26 22:12:11 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.65 2006/07/11 15:07:16 uberlord Exp $
+
+  11 Jul 2006; Roy Marples <uberlord@gentoo.org>
+  -files/wpa_supplicant-0.4.9-wpa_cli.sh,
+  -files/wpa_supplicant-0.5.4-wpa_cli.sh, +files/wpa_cli.sh, metadata.xml,
+  wpa_supplicant-0.4.9.ebuild, wpa_supplicant-0.5.4.ebuild:
+  New maintainer
+  Fixed some potential quoting issues in 0.5.4
+  Generic wpa_cli.sh for 0.4.9 and 0.5.4
+  wpa_cli.sh now uses logger for all reporting
 
   26 Jun 2006; Henrik Brix Andersen <brix@gentoo.org>
   wpa_supplicant-0.4.9.ebuild:
diff --git a/net-wireless/wpa_supplicant/files/wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_cli.sh
new file mode 100644
index 000000000000..d7d340b90bb6
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/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_cli.sh,v 1.1 2006/07/11 15:07:16 uberlord Exp $
+
+if [ -z "$1" -o -z "$2" ]; then
+	logger -t wpa_cli "Insufficient parameters"
+	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
+	logger -t wpa_cli "I don't know what to do with this distro!"
+	exit 1
+fi
+
+case ${ACTION} in
+	CONNECTED)
+		EXEC="${EXEC} start"
+		;;
+	DISCONNECTED)
+		EXEC="${EXEC} stop"
+		;;
+	*)
+		logger -t wpa_cli "Unknown action ${ACTION}"
+		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/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index cfbdff13bd61..8cc674ef58f5 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>mobile</herd>
 <maintainer>
-  <email>brix@gentoo.org</email>
-  <name>Henrik Brix Andersen</name>
+  <email>uberlord@gentoo.org</email>
+  <name>Roy Marples</name>
 </maintainer>
 </pkgmetadata>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild
index 4a59c64ee054..43174f6f8fbc 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2006/06/26 22:12:11 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild,v 1.5 2006/07/11 15:07:16 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -133,7 +133,7 @@ src_install() {
 	dobin wpa_cli wpa_passphrase
 
 	exeinto /etc/wpa_supplicant/
-	newexe ${FILESDIR}/${MY_P}-wpa_cli.sh wpa_cli.sh
+	newexe ${FILESDIR}/wpa_cli.sh wpa_cli.sh
 
 	# compatibility symlink for =baselayout-1.11*
 	dosym /etc/wpa_supplicant/wpa_cli.sh /sbin/wpa_cli.action
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild
index 253e91e2dc2b..6a1d576613c1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.3 2006/06/24 16:35:52 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild,v 1.4 2006/07/11 15:07:16 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -26,86 +26,84 @@ DEPEND="sys-apps/sed
 
 pkg_setup() {
 	if use qt3 && use qt4; then
-		einfo
 		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
-		einfo
 	fi
 }
 
 src_unpack() {
-	local CONFIG=${S}/.config
+	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
+		"${S}"/l2_packet_freebsd.c
 
 	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
+	echo "CC = $(tc-getCC)" > "${CONFIG}"
 
 	# basic setup
-	echo "CONFIG_CTRL_IFACE=y" >> ${CONFIG}
-	echo "CONFIG_BACKEND=file" >> ${CONFIG}
+	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_PEERKEY=y"         >> ${CONFIG}
+	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_PEERKEY=y"         >> "${CONFIG}"
 
 	if use dbus; then
-		echo "CONFIG_CTRL_IFACE_DBUS=y" >> ${CONFIG}
+		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}
+		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}
+		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}
+		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}
+		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}
+			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}
+		echo "CONFIG_DRIVER_BSD=y" >> "${CONFIG}"
 	fi
 
 	# people seem to take the example configuration file too literally
@@ -114,7 +112,7 @@ src_unpack() {
 		-e "s:^\(opensc_engine_path\):#\1:" \
 		-e "s:^\(pkcs11_engine_path\):#\1:" \
 		-e "s:^\(pkcs11_module_path\):#\1:" \
-		${S}/wpa_supplicant.conf || die
+		"${S}"/wpa_supplicant.conf || die
 }
 
 src_compile() {
@@ -125,7 +123,7 @@ src_compile() {
 		cd "${S}"/wpa_gui-qt4
 		emake || die "emake wpa_gui-qt4 failed"
 	elif use qt3; then
-		[[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings
+		[[ -d ${QTDIR}/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
 		/usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
 		cd "${S}"/wpa_gui
 		emake || die "emake wpa_gui failed"
@@ -138,7 +136,7 @@ src_install() {
 	dobin wpa_cli wpa_passphrase
 
 	exeinto /etc/wpa_supplicant/
-	newexe ${FILESDIR}/${P}-wpa_cli.sh wpa_cli.sh
+	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
 
 	# compatibility symlink for =baselayout-1.11*
 	dosym /etc/wpa_supplicant/wpa_cli.sh /sbin/wpa_cli.action
@@ -159,17 +157,15 @@ src_install() {
 }
 
 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
 		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
 }