From: hschang <chang@dev3>
Date: Wed, 2 Jul 2014 04:50:48 +0000 (+0900)
Subject: [wpa-supplicant] update to 2.1
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=8dd4c1db13740b5241f34c69a5059611b94729f1

[wpa-supplicant] update to 2.1
---

diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index eb301cf..7ad04ac 100644
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -32,7 +32,7 @@ IMAGE_FSTYPES =+ "tar.bz2"
 # package versions
 PREFERRED_VERSION_pango ?= "1.28.4"
 
-PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
+PREFERRED_VERSION_wpa-supplicant ?= "2.1"
 
 PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
 PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/action_wpa.sh b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/action_wpa.sh
deleted file mode 100644
index 6d90fa6..0000000
--- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/action_wpa.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# Action script to enable/disable wpa-roam interfaces in reaction to
-# ifplugd events.
-#
-# Copyright: Copyright (c) 2008-2010, Kel Modderman <kel@otaku42.de>
-# License:   GPL-2
-#
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-if [ ! -x /usr/sbin/wpa_action ]; then
-	exit 0
-fi
-
-# ifplugd(8) - <iface> <action>
-#
-# If an ifplugd managed interface is brought up, disconnect any
-# wpa-roam managed interfaces so that only one "roaming" interface
-# remains active on the system.
-
-IFPLUGD_IFACE="${1}"
-
-case "${2}" in
-	up)
-		COMMAND=disconnect
-		;;
-	down)
-		COMMAND=reconnect
-		;;
-	*)
-		echo "$0: unknown arguments: ${@}" >&2
-		exit 1
-		;;
-esac
-
-for CTRL in /var/run/wpa_supplicant/*; do
-	[ -S "${CTRL}" ] || continue
-
-	IFACE="${CTRL#/var/run/wpa_supplicant/}"
-
-	# skip if ifplugd is managing this interface
-	if [ "${IFPLUGD_IFACE}" = "${IFACE}" ]; then
-		continue
-	fi
-
-	if wpa_action "${IFACE}" check; then
-		wpa_cli -i "${IFACE}" "${COMMAND}"
-	fi
-done
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/functions.sh b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/functions.sh
deleted file mode 100644
index b9e0eb2..0000000
--- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/functions.sh
+++ /dev/null
@@ -1,1015 +0,0 @@
-#!/bin/sh
-
-#####################################################################
-## Purpose
-# This file contains common shell functions used by scripts of the
-# wpasupplicant package to allow ifupdown to manage wpa_supplicant.
-# It also contains some functions used by wpa_action(8) that allow
-# ifupdown to be managed by wpa_cli(8) action events.
-#
-# This file is provided by the wpasupplicant package.
-
-#####################################################################
-# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers 
-# <pkg-wpa-devel@lists.alioth.debian.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# On Debian GNU/Linux systems, the text of the GPL license,
-# version 2, can be found in /usr/share/common-licenses/GPL-2.
-
-#####################################################################
-## global variables
-# wpa_supplicant variables
-WPA_SUP_BIN="/usr/sbin/wpa_supplicant"
-WPA_SUP_PNAME="wpa_supplicant"
-WPA_SUP_PIDFILE="/var/run/wpa_supplicant.${WPA_IFACE}.pid"
-
-# wpa_cli variables
-WPA_CLI_BIN="/usr/sbin/wpa_cli"
-WPA_CLI_PNAME="wpa_cli"
-WPA_CLI_PIDFILE="/var/run/wpa_action.${WPA_IFACE}.pid"
-WPA_CLI_TIMESTAMP="/var/run/wpa_action.${WPA_IFACE}.timestamp"
-WPA_CLI_IFUPDOWN="/var/run/wpa_action.${WPA_IFACE}.ifupdown"
-
-# sendsigs omission interface, present in initscripts (>= 2.86.ds1-48)
-if [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
-	# Debian
-	WPA_SUP_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
-elif [ -d /var/run/sendsigs.omit.d/ ]; then
-	# Ubuntu, see https://launchpad.net/bugs/181541 for status
-	WPA_SUP_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
-else
-	WPA_SUP_OMIT_PIDFILE=
-fi
-
-# default ctrl_interface socket directory
-if [ -z "$WPA_CTRL_DIR" ]; then
-	WPA_CTRL_DIR="/var/run/wpa_supplicant"
-fi
-
-# verbosity variables
-if [ -n "$IF_WPA_VERBOSITY" ] || [ "$VERBOSITY" = "1" ]; then
-	TO_NULL="/dev/stdout"
-	DAEMON_VERBOSITY="--verbose"
-else
-	TO_NULL="/dev/null"
-	DAEMON_VERBOSITY="--quiet"
-fi
-
-#####################################################################
-## wpa_cli wrapper
-# Path to common ctrl_interface socket and iface supplied.
-# NB: WPA_CTRL_DIR cannot be used for interactive commands, it is
-# set only in the environment that wpa_cli provides when processing
-# action events.
-#
-wpa_cli () {
-	"$WPA_CLI_BIN" -p "$WPA_CTRL_DIR" -i "$WPA_IFACE" "$@"
-
-	return "$?"
-}
-
-#####################################################################
-## verbose and stderr message wrapper
-# Ensures a standard and easily identifiable message is printed by
-# scripts using this function library.
-#
-# log		Log a message to syslog when called non-interactively
-#		by wpa_action
-#
-# verbose	To stdout when IF_WPA_VERBOSITY or VERBOSITY is true
-#
-# action	Same as verbose but without newline
-#		Useful for allowing wpa_cli commands to echo result
-#		value of 'OK' or 'FAILED'
-#
-# stderr	Echo warning or error messages to stderr
-#
-# NB: when called by wpa_action, there is no redirection (verbose)
-#
-wpa_msg () {
-	if [ "$1" = "log" ]; then
-		shift
-		case "$WPA_ACTION" in
-			"CONNECTED"|"DISCONNECTED")
-				[ -x /usr/bin/logger ] || return
-				if [ "$#" -gt 0 ]; then
-					logger -t "wpa_action" "$@"
-				else
-					logger -t "wpa_action"
-				fi
-				;;
-			*)
-				[ "$#" -gt 0 ] && echo "wpa_action: $@"
-				;;
-		esac
-		return
-	fi
-	
-	case "$1" in 
-		"verbose")
-			shift
-			echo "$WPA_SUP_PNAME: $@" >$TO_NULL
-			;;
-		"action")
-			shift
-			echo -n "$WPA_SUP_PNAME: $@ -- " >$TO_NULL
-			;;
-		"stderr")
-			shift
-			echo "$WPA_SUP_PNAME: $@" >/dev/stderr
-			;;
-		*)
-			;;
-	esac
-}
-
-#####################################################################
-## validate daemon pid files
-# Test daemon process ID files via start-stop-daemon with a signal 0
-# given the exec binary and pidfile location.
-#
-# $1	daemon
-# $2	pidfile
-#
-# Returns true when pidfile exists, the process ID exists _and_ was
-# created by the exec binary.
-#
-# If the test fails, but the pidfile exists, it is stale
-#
-test_daemon_pidfile () {
-	local DAEMON
-	local PIDFILE
-	
-	if [ -n "$1" ]; then
-		DAEMON="$1"
-	fi
-	
-	if [ -f "$2" ]; then
-		PIDFILE="$2"
-	fi
-	
-	if [ -n "$DAEMON" ] && [ -f "$PIDFILE" ]; then
-		if start-stop-daemon --stop --quiet --signal 0 \
-			--exec "$DAEMON" --pidfile "$PIDFILE"; then
-			return 0
-		else
-			rm -f "$PIDFILE"
-			return 1
-		fi
-	else
-		return 1
-	fi
-}
-
-# validate wpa_supplicant pidfile
-test_wpa_supplicant () {
-	test_daemon_pidfile "$WPA_SUP_BIN" "$WPA_SUP_PIDFILE"
-}
-
-# validate wpa_cli pidfile
-test_wpa_cli () {
-	test_daemon_pidfile "$WPA_CLI_BIN" "$WPA_CLI_PIDFILE"
-}
-
-#####################################################################
-## daemonize wpa_supplicant
-# Start wpa_supplicant via start-stop-dameon with all required
-# options. Will start if environment variable WPA_SUP_CONF is present
-#
-# Default options:
-# -B	dameonize/background process
-# -D	driver backend ('wext' if none given)
-# -P	process ID file
-# -C	path to ctrl_interface socket directory
-# -s    log to syslog
-#
-# Conditional options:
-# -c	configuration file
-# -W	wait for wpa_cli to attach to ctrl_interface socket
-# -b	bridge interface name
-# -f	path to log file
-#
-init_wpa_supplicant () {
-	[ -n "$WPA_SUP_CONF" ] || return 0
-
-	local WPA_SUP_OPTIONS
-	WPA_SUP_OPTIONS="-s -B -P $WPA_SUP_PIDFILE -i $WPA_IFACE"
-
-	if [ -n "$WPA_ACTION_SCRIPT" ]; then
-		if [ -x "$WPA_ACTION_SCRIPT" ]; then
-			WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -W"
-			wpa_msg verbose "wait for wpa_cli to attach"
-		else
-			wpa_msg stderr "action script \"$WPA_ACTION_SCRIPT\" not executable"
-			return 1
-		fi
-	fi
-
-	if [ -n "$IF_WPA_BRIDGE" ]; then
-		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -b $IF_WPA_BRIDGE"
-		wpa_msg verbose "wpa-bridge $IF_WPA_BRIDGE"
-	fi
-
-	if [ -n "$IF_WPA_DRIVER" ]; then
-		wpa_msg verbose "wpa-driver $IF_WPA_DRIVER"
-		case "$IF_WPA_DRIVER" in
-			hostap|ipw|madwifi|ndiswrapper)
-				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D nl80211,wext"
-				wpa_msg stderr "\"$IF_WPA_DRIVER\" wpa-driver is unsupported"
-				wpa_msg stderr "using \"nl80211,wext\" wpa-driver instead ..."
-				;;
-			*)
-				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D $IF_WPA_DRIVER"
-				;;
-		esac
-	else
-		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D nl80211,wext"
-		wpa_msg verbose "wpa-driver nl80211,wext (default)"
-	fi
-
-	if [ -n "$IF_WPA_DEBUG_LEVEL" ]; then
-		case "$IF_WPA_DEBUG_LEVEL" in
-			3)
-				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -t -ddd"
-				;;
-			2)
-				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -t -dd"
-				;;
-			1)
-				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -t -d"
-				;;
-			0)
-				# wpa_supplicant default verbosity
-				;;
-			-1)
-				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -q"
-				;;
-			-2)
-				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -qq"
-				;;
-		esac
-		wpa_msg verbose "using debug level: $IF_WPA_DEBUG_LEVEL"
-	fi
-
-	if [ -n "$IF_WPA_LOGFILE" ]; then
-		# custom log file
-		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -f $IF_WPA_LOGFILE"
-		WPA_SUP_LOGFILE="$IF_WPA_LOGFILE"
-		wpa_msg verbose "logging to $IF_WPA_LOGFILE"
-	fi
-
-	wpa_msg verbose "$WPA_SUP_BIN $WPA_SUP_OPTIONS $WPA_SUP_CONF"
-		
-	start-stop-daemon --start --oknodo $DAEMON_VERBOSITY \
-		--name $WPA_SUP_PNAME --startas $WPA_SUP_BIN --pidfile $WPA_SUP_PIDFILE \
-		-- $WPA_SUP_OPTIONS $WPA_SUP_CONF
-
-	if [ "$?" -ne 0 ]; then
-		wpa_msg stderr "$WPA_SUP_BIN daemon failed to start"
-		return 1
-	fi
-
-	if [ -n "$WPA_SUP_OMIT_PIDFILE" ]; then
-		local WPA_PIDFILE_WAIT
-		local MAX_WPA_PIDFILE_WAIT
-		WPA_PIDFILE_WAIT="0"
-		MAX_WPA_PIDFILE_WAIT="5"
-		until [ -s "$WPA_SUP_PIDFILE" ]; do
-			if [ "$WPA_PIDFILE_WAIT" -ge "$MAX_WPA_PIDFILE_WAIT" ]; then
-				wpa_msg stderr "timed out waiting for creation of $WPA_SUP_PIDFILE"
-				return 1
-			else
-				wpa_msg verbose "waiting for \"$WPA_SUP_PIDFILE\": " \
-					"$WPA_PIDFILE_WAIT (max. $MAX_WPA_PIDFILE_WAIT)"
-			fi
-
-			WPA_PIDFILE_WAIT=$(($WPA_PIDFILE_WAIT + 1))
-			sleep 1
-		done
-		wpa_msg verbose "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
-		cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
-	else
-		wpa_msg verbose "sendsigs omission pidfile not created"
-	fi
-
-	local WPA_SOCKET_WAIT
-	local MAX_WPA_SOCKET_WAIT
-	WPA_SOCKET_WAIT="0"
-	MAX_WPA_SOCKET_WAIT="5"
-	until [ -S "$WPA_CTRL_DIR/$WPA_IFACE" ]; do
-		if [ "$WPA_SOCKET_WAIT" -ge "$MAX_WPA_SOCKET_WAIT" ]; then
-			wpa_msg stderr "ctrl_interface socket not found at $WPA_CTRL_DIR/$WPA_IFACE"
-			return 1
-		else
-			wpa_msg verbose "waiting for \"$WPA_CTRL_DIR/$WPA_IFACE\": " \
-				"$WPA_SOCKET_WAIT (max. $MAX_WPA_SOCKET_WAIT)"
-		fi
-		
-		WPA_SOCKET_WAIT=$(($WPA_SOCKET_WAIT + 1))
-		sleep 1
-	done
-	
-	wpa_msg verbose "ctrl_interface socket located at $WPA_CTRL_DIR/$WPA_IFACE"
-}
-
-#####################################################################
-## stop wpa_supplicant process
-# Kill wpa_supplicant via start-stop-daemon, given the location of
-# the pidfile or ctrl_interface socket path and interface name
-#
-kill_wpa_supplicant () {
-	test_wpa_supplicant || return 0
-
-	wpa_msg verbose "terminating $WPA_SUP_PNAME daemon via pidfile $WPA_SUP_PIDFILE"
-
-	start-stop-daemon --stop --oknodo $DAEMON_VERBOSITY \
-		--exec $WPA_SUP_BIN --pidfile $WPA_SUP_PIDFILE
-
-	if [ -f "$WPA_SUP_PIDFILE" ]; then
-		rm -f "$WPA_SUP_PIDFILE"
-	fi
-
-	if [ -f "$WPA_SUP_OMIT_PIDFILE" ]; then
-		wpa_msg verbose "removing $WPA_SUP_OMIT_PIDFILE"
-		rm -f "$WPA_SUP_OMIT_PIDFILE"
-	fi
-}
-
-#####################################################################
-## reload wpa_supplicant process
-# Sending a HUP signal causes wpa_supplicant to reparse its
-# configuration file
-#
-reload_wpa_supplicant () {
-	if test_wpa_supplicant; then
-		wpa_msg verbose "reloading wpa_supplicant configuration file via HUP signal"
-		start-stop-daemon --stop --signal HUP \
-			--name "$WPA_SUP_PNAME" --pidfile "$WPA_SUP_PIDFILE"
-	else
-		wpa_msg verbose "cannot $WPA_ACTION, $WPA_SUP_PIDFILE does not exist"
-	fi
-}
-
-#####################################################################
-## daemonize wpa_cli and action script
-# If environment variable WPA_ACTION_SCRIPT is present, wpa_cli will
-# be spawned via start-stop-daemon
-#
-# Required options:
-# -a	action script => wpa_action
-# -P	process ID file
-# -B	background process
-#
-init_wpa_cli () {
-	[ -n "$WPA_ACTION_SCRIPT" ] || return 0
-
-	local WPA_CLI_OPTIONS
-	WPA_CLI_OPTIONS="-B -P $WPA_CLI_PIDFILE -i $WPA_IFACE"
-
-	wpa_msg verbose "$WPA_CLI_BIN $WPA_CLI_OPTIONS -p $WPA_CTRL_DIR -a $WPA_ACTION_SCRIPT"
-		
-	start-stop-daemon --start --oknodo $DAEMON_VERBOSITY \
-		--name $WPA_CLI_PNAME --startas $WPA_CLI_BIN --pidfile $WPA_CLI_PIDFILE \
-		-- $WPA_CLI_OPTIONS -p $WPA_CTRL_DIR -a $WPA_ACTION_SCRIPT
-
-	if [ "$?" -ne 0 ]; then
-		wpa_msg stderr "$WPA_CLI_BIN daemon failed to start"
-		return 1
-	fi
-}
-
-#####################################################################
-## stop wpa_cli process
-# Kill wpa_cli via start-stop-daemon, given the location of the
-# pidfile
-#
-kill_wpa_cli () {
-	test_wpa_cli || return 0
-	
-	wpa_msg verbose "terminating $WPA_CLI_PNAME daemon via pidfile $WPA_CLI_PIDFILE"
-	
-	start-stop-daemon --stop --oknodo $DAEMON_VERBOSITY \
-		--exec $WPA_CLI_BIN --pidfile $WPA_CLI_PIDFILE
-	
-	if [ -f "$WPA_CLI_PIDFILE" ]; then
-		rm -f "$WPA_CLI_PIDFILE"
-	fi
-
-	if [ -f "$WPA_CLI_TIMESTAMP" ]; then
-		rm -f "$WPA_CLI_TIMESTAMP"
-	fi
-
-	if [ -L "$WPA_CLI_IFUPDOWN" ]; then
-		rm -f "$WPA_CLI_IFUPDOWN"
-	fi
-}
-
-#####################################################################
-## higher level wpa_cli wrapper for variable and set_network commands
-# wpa_cli_do <value> <type> <variable> [set_network variable] <desc>
-#
-# $1	envorinment variable
-# $2	data type of variable {raw|ascii}
-# $3	wpa_cli variable, if $3 is set_network, shift and take 
-#	set_network subvariable
-# $4	wpa-* string as it would appear in interfaces file, enhances
-#	verbose messages
-#
-wpa_cli_do () {
-	if [ -z "$1" ]; then
-		return 0
-	fi
-	
-	local WPACLISET_VALUE
-	local WPACLISET_VARIABLE
-	local WPACLISET_DESC
-	
-	case "$2" in
-		ascii)
-			# Double quote
-			WPACLISET_VALUE="\"$1\""
-			;;
-		raw|*)
-			# Provide raw value
-			WPACLISET_VALUE="$1"
-			;;
-	esac
-	
-	case "$3" in
-		set_network)
-			if [ -z "$WPA_ID" ]; then
-				return 1
-			fi
-			shift
-			WPACLISET_VARIABLE="set_network $WPA_ID $3"
-			;;
-		*)
-			WPACLISET_VARIABLE="$3"
-			;;
-	esac
-	
-	case "$4" in
-		*-psk|*-passphrase|*-passwd*|*-wep-key*)
-			WPACLISET_DESC="$4 *****"
-			;;
-		*)
-			WPACLISET_DESC="$4 $WPACLISET_VALUE"
-			;;
-	esac
-
-	wpa_msg action "$WPACLISET_DESC"
-	
-	wpa_cli $WPACLISET_VARIABLE "$WPACLISET_VALUE" >$TO_NULL
-
-	if [ "$?" -ne 0 ]; then
-		wpa_msg stderr "$WPACLISET_DESC failed!"
-	fi
-}
-
-#####################################################################
-## check value data type in plaintext or hex
-# returns 0 if input consists of hexadecimal digits only, 1 otherwise
-#
-ishex () {
-	if [ -z "$1" ]; then 
-		return 0
-	fi
-	
-	case "$1" in
-		*[!0-9a-fA-F]*)
-			# plaintext
-			return 1
-			;;
-		*)
-			# hexadecimal
-			return 0
-			;;
-	esac
-}
-
-#####################################################################
-## sanity check and set psk|passphrase
-# Warn about strange psk|passphrase values
-#
-# $1	psk or passphrase value
-# 
-# If psk is surrounded by quotes strip them.
-#
-# If psk contains all hexadecimal characters and string length is 64:
-#	is 256bit hexadecimal
-# else:
-# 	is plaintext
-#
-# plaintext passphrases must be 8 - 63 characters in length
-# 256-bit hexadecimal key must be 64 characters in length
-#
-wpa_key_check_and_set () {
-	if [ "$#" -ne 3 ]; then
-		return 0
-	fi
-
-	local KEY
-	local KEY_LEN
-	local KEY_TYPE
-	local ENC_TYPE
-	
-	case "$1" in
-		'"'*'"')
-			# Strip surrounding quotation marks
-			KEY=$(echo -n "$1" | sed 's/^"//;s/"$//')
-			;;
-		*)
-			KEY="$1"
-			;;
-	esac
-
-	KEY_LEN="${#KEY}"
-
-	case "$2" in
-		wep_key*)
-			ENC_TYPE="WEP"
-			;;
-		psk)
-			ENC_TYPE="WPA"
-			;;
-		*)
-			return 0
-			;;
-	esac
-
-	if [ "$ENC_TYPE" = "WEP" ]; then
-		if ishex "$KEY"; then
-			case "$KEY_LEN" in
-				10|26|32|58)
-					# 64/128/152/256-bit WEP
-					KEY_TYPE="raw"
-					;;
-				*)
-					KEY_TYPE="ascii"
-					;;
-			esac
-		else
-			KEY_TYPE="ascii"
-		fi
-
-		if [ "$KEY_TYPE" = "ascii" ]; then
-			if [ "$KEY_LEN" -lt "5" ]; then
-				wpa_msg stderr "WARNING: plaintext or ascii WEP key has $KEY_LEN characters,"
-				wpa_msg stderr "it must have at least 5 to be valid."
-			fi
-		fi
-	elif [ "$ENC_TYPE" = "WPA" ]; then
-		if ishex "$KEY"; then
-			case "$KEY_LEN" in
-				64)
-					# 256-bit WPA
-					KEY_TYPE="raw"
-					;;
-				*)
-					KEY_TYPE="ascii"
-					;;
-			esac
-		else
-			KEY_TYPE="ascii"
-		fi
-
-		if [ "$KEY_TYPE" = "ascii" ]; then
-			if [ "$KEY_LEN" -lt "8" ] || [ "$KEY_LEN" -gt "63" ]; then
-				wpa_msg stderr "WARNING: plaintext or ascii WPA key has $KEY_LEN characters,"
-				wpa_msg stderr "it must have between 8 and 63 to be valid."
-				wpa_msg stderr "If the WPA key is a 256-bit hexadecimal key, it must have"
-				wpa_msg stderr "exactly 64 characters."
-			fi
-		fi
-	fi
-
-	wpa_cli_do "$KEY" "$KEY_TYPE" set_network "$2" "$3"
-}
-
-#####################################################################
-## formulate a usable configuration from interfaces(5) wpa- lines
-# A series of wpa_cli commands corresponding to environment variables
-# created as a result of wpa- lines in an interfaces stanza.
-#
-# NB: no-act when roaming daemon is used (to avoid prematurely
-# attaching to ctrl_interface socket)
-#
-conf_wpa_supplicant () {
-	if [ -n "$WPA_ACTION_SCRIPT" ]; then
-		return 0
-	fi
-
-	if [ "$IF_WPA_DRIVER" = "wired" ]; then
-		IF_WPA_AP_SCAN="0"
-		wpa_msg verbose "forcing ap_scan=0 (required for wired IEEE8021X auth)"
-	fi
-
-	if [ -n "$IF_WPA_ESSID" ]; then
-		# #403316, be similar to wireless tools
-		IF_WPA_SSID="$IF_WPA_ESSID"
-	fi
-	
-	wpa_cli_do "$IF_WPA_AP_SCAN" raw \
-		ap_scan wpa-ap-scan
-	
-	wpa_cli_do "$IF_WPA_PREAUTHENTICATE" raw \
-		preauthenticate wpa-preauthenticate
-		
-	if [ -n "$IF_WPA_SSID" ] || [ "$IF_WPA_DRIVER" = "wired" ] || \
-		[ -n "$IF_WPA_KEY_MGMT" ]; then
-		
-		case "$IF_WPA_SSID" in
-			'"'*'"')
-				IF_WPA_SSID=$(echo -n "$IF_WPA_SSID" | sed 's/^"//;s/"$//')
-				;;
-			*)
-				;;
-		esac
-		
-		WPA_ID=$(wpa_cli add_network)
-
-		wpa_msg verbose "configuring network block -- $WPA_ID"
-		
-		wpa_cli_do "$IF_WPA_SSID" ascii \
-			set_network ssid wpa-ssid
-		
-		wpa_cli_do "$IF_WPA_PRIORITY" raw \
-			set_network priority wpa-priority
-		
-		wpa_cli_do "$IF_WPA_BSSID" raw \
-			set_network bssid wpa-bssid
-		
-		if [ -s "$IF_WPA_PSK_FILE" ]; then
-			IF_WPA_PSK=$(cat "$IF_WPA_PSK_FILE")
-		fi
-		
-		# remain compat with wpa-passphrase-file
-		if [ -s "$IF_WPA_PASSPHRASE_FILE" ]; then
-			IF_WPA_PSK=$(cat "$IF_WPA_PASSPHRASE_FILE")
-		fi
-		
-		# remain compat with wpa-passphrase
-		if [ -n "$IF_WPA_PASSPHRASE" ]; then
-			IF_WPA_PSK="$IF_WPA_PASSPHRASE"
-		fi
-	
-		if [ -n "$IF_WPA_PSK" ]; then
-			wpa_key_check_and_set "$IF_WPA_PSK" \
-				psk wpa-psk
-		fi
-		
-		wpa_cli_do "$IF_WPA_PAIRWISE" raw \
-			set_network pairwise wpa-pairwise
-		
-		wpa_cli_do "$IF_WPA_GROUP" raw \
-			set_network group wpa-group
-
-		wpa_cli_do "$IF_WPA_MODE" raw \
-			set_network mode wpa-mode
-
-		wpa_cli_do "$IF_WPA_FREQUENCY" raw \
-			set_network frequency wpa-frequency
-
-		wpa_cli_do "$IF_WPA_SCAN_FREQ" raw \
-			set_network scan_freq wpa-scan-freq
-
-		wpa_cli_do "$IF_WPA_FREQ_LIST" raw \
-			set_network freq_list wpa-freq-list
-		
-		wpa_cli_do "$IF_WPA_KEY_MGMT" raw \
-			set_network key_mgmt wpa-key-mgmt
-		
-		wpa_cli_do "$IF_WPA_PROTO" raw \
-			set_network proto wpa-proto
-		
-		wpa_cli_do "$IF_WPA_AUTH_ALG" raw \
-			set_network auth_alg wpa-auth-alg
-		
-		wpa_cli_do "$IF_WPA_SCAN_SSID" raw \
-			set_network scan_ssid wpa-scan-ssid
-		
-		wpa_cli_do "$IF_WPA_IDENTITY" ascii \
-			set_network identity wpa-identity
-		
-		wpa_cli_do "$IF_WPA_ANONYMOUS_IDENTITY" ascii \
-			set_network anonymous_identity wpa-anonymous-identity
-		
-		wpa_cli_do "$IF_WPA_EAP" raw \
-			set_network eap wpa-eap
-		
-		wpa_cli_do "$IF_WPA_EAPPSK" raw \
-			set_network eappsk wpa-eappsk
-
-		wpa_cli_do "$IF_WPA_NAI" ascii \
-			set_network nai wpa-nai
-
-		wpa_cli_do "$IF_WPA_PASSWORD" ascii \
-			set_network password wpa-password
-
-		wpa_cli_do "$IF_WPA_CA_CERT" ascii \
-			set_network ca_cert wpa-ca-cert
-
-		wpa_cli_do "$IF_WPA_CA_PATH" ascii \
-			set_network ca_path wpa-ca-path
-
-		wpa_cli_do "$IF_WPA_CLIENT_CERT" ascii \
-			set_network client_cert wpa-client-cert
-
-		wpa_cli_do "$IF_WPA_PRIVATE_KEY" ascii \
-			set_network private_key wpa-private-key
-
-		wpa_cli_do "$IF_WPA_PRIVATE_KEY_PASSWD" ascii \
-			set_network private_key_passwd wpa-private-key-passwd
-		
-		wpa_cli_do "$IF_WPA_DH_FILE" ascii \
-			set_network dh_file wpa-dh-file
-
-		wpa_cli_do "$IF_WPA_SUBJECT_MATCH" ascii \
-			set_network subject_match wpa-subject-match
-
-		wpa_cli_do "$IF_WPA_ALTSUBJECT_MATCH" ascii \
-			set_network altsubject_match wpa-altsubject-match
-
-		wpa_cli_do "$IF_WPA_CA_CERT2" ascii \
-			set_network ca_cert2 wpa-ca-cert2
-
-		wpa_cli_do "$IF_WPA_CA_PATH2" ascii \
-			set_network ca_path2 wpa-ca-path2
-
-		wpa_cli_do "$IF_WPA_CLIENT_CERT2" ascii \
-			set_network client_cert2 wpa-client-cert2
-
-		wpa_cli_do "$IF_WPA_PRIVATE_KEY2" ascii \
-			set_network private_key2 wpa-private-key2
-
-		wpa_cli_do "$IF_WPA_PRIVATE_KEY_PASSWD2" ascii \
-			set_network private_key_passwd2 wpa-private-key-passwd2
-		
-		wpa_cli_do "$IF_WPA_DH_FILE2" ascii \
-			set_network dh_file2 wpa-dh-file2
-
-		wpa_cli_do "$IF_WPA_SUBJECT_MATCH2" ascii \
-			set_network subject_match2 wpa-subject-match2
-
-		wpa_cli_do "$IF_WPA_ALTSUBJECT_MATCH2" ascii \
-			set_network altsubject_match2 wpa-altsubject-match2
-		
-		wpa_cli_do "$IF_WPA_EAP_METHODS" raw \
-			set_network eap_methods wpa-eap-methods
-
-		wpa_cli_do "$IF_WPA_PHASE1" ascii \
-			set_network phase1 wpa-phase1
-
-		wpa_cli_do "$IF_WPA_PHASE2" ascii \
-			set_network phase2 wpa-phase2
-
-		wpa_cli_do "$IF_WPA_PCSC" raw \
-			set_network pcsc wpa-pcsc
-
-		wpa_cli_do "$IF_WPA_PIN" ascii \
-			set_network pin wpa-pin
-
-		wpa_cli_do "$IF_WPA_ENGINE" raw \
-			set_network engine wpa-engine
-
-		wpa_cli_do "$IF_WPA_ENGINE_ID" ascii \
-			set_network engine_id wpa-engine-id
-
-		wpa_cli_do "$IF_WPA_KEY_ID" ascii \
-			set_network key_id wpa-key-id
-
-		wpa_cli_do "$IF_WPA_EAPOL_FLAGS" raw \
-			set_network eapol_flags wpa-eapol-flags
-		
-		if [ -n "$IF_WPA_WEP_KEY0" ]; then
-			wpa_key_check_and_set "$IF_WPA_WEP_KEY0" \
-				wep_key0 wpa-wep-key0
-		fi
-		
-		if [ -n "$IF_WPA_WEP_KEY1" ]; then
-			wpa_key_check_and_set "$IF_WPA_WEP_KEY1" \
-				wep_key1 wpa-wep-key1
-		fi
-
-		if [ -n "$IF_WPA_WEP_KEY2" ]; then
-			wpa_key_check_and_set "$IF_WPA_WEP_KEY2" \
-				wep_key2 wpa-wep-key2
-		fi
-
-		if [ -n "$IF_WPA_WEP_KEY3" ]; then
-			wpa_key_check_and_set "$IF_WPA_WEP_KEY3" \
-				wep_key3 wpa-wep-key3
-		fi
-		
-		wpa_cli_do "$IF_WPA_WEP_TX_KEYIDX" raw \
-			set_network wep_tx_keyidx wpa-wep-tx-keyidx
-		
-		wpa_cli_do "$IF_WPA_PROACTIVE_KEY_CACHING" raw \
-			set_network proactive_key_caching wpa-proactive-key-caching
-			
-		wpa_cli_do "$IF_WPA_PAC_FILE" ascii \
-			set_network pac_file wpa-pac-file
-		
-		wpa_cli_do "$IF_WPA_PEERKEY" raw \
-			set_network peerkey wpa-peerkey
-			
-		wpa_cli_do "$IF_FRAGMENT_SIZE" raw \
-			set_network fragment_size wpa-fragment-size
-
-		wpa_cli_do "$IF_WPA_ID_STR" ascii \
-			set_network id_str wpa-id-str
-		
-		wpa_cli_do "$WPA_ID" raw \
-			enable_network "enabling network block"
-	fi
-}
-
-#####################################################################
-## Log wpa_cli environment variables
-wpa_log_env () {
-	wpa_msg log "WPA_IFACE=$WPA_IFACE WPA_ACTION=$WPA_ACTION"
-	wpa_msg log "WPA_ID=$WPA_ID WPA_ID_STR=$WPA_ID_STR WPA_CTRL_DIR=$WPA_CTRL_DIR"
-}
-
-#####################################################################
-## hysteresis checking
-# Networking tools such as dhcp clients used with ifupdown can
-# synthesize artificial ACTION events, particuarly just after a
-# DISCONNECTED/CONNECTED events are experienced in quick succession.
-# This can lead to infinite event loops, and in extreme cases has the
-# potential to cause system instability.
-#
-wpa_hysteresis_event () {
-	echo "$(date +%s)" > "$WPA_CLI_TIMESTAMP" 2>/dev/null
-}
-
-wpa_hysteresis_check () {
-	if [ -f "$WPA_CLI_TIMESTAMP" ]; then
-		local TIME
-		local TIMESTAMP
-		local TIMEWAIT
-		TIME=$(date +%s)
-		# current time minus 4 second event buffer
-		TIMEWAIT=$(($TIME-4))
-		# get time of last event
-		TIMESTAMP=$(cat $WPA_CLI_TIMESTAMP)
-		# compare values, allowing new action to be processed 
-		# only if last action was more than 4 seconds ago
-		if [ "$TIMEWAIT" -le "$TIMESTAMP" ]; then
-			wpa_msg log "$WPA_ACTION event blocked by hysteresis check"
-			return 1
-		fi
-	fi
-
-	return 0
-}
-
-#####################################################################
-## ifupdown locking functions
-# A collection of rudimentary locking functions to lock ifup/ifdown
-# actions.
-#
-
-ifupdown_lock () {
-	ln -s lock "$WPA_CLI_IFUPDOWN"
-}
-
-ifupdown_locked () {
-	[ -L "$WPA_CLI_IFUPDOWN" ] && return 0
-
-	return 1
-}
-
-ifupdown_unlock () {
-	rm -f "$WPA_CLI_IFUPDOWN"
-}
-
-#####################################################################
-## apply mapping logic and ifup logical interface
-# Apply mapping logic via id_str or external mapping script, check
-# state of IFACE with respect to ifupdown and ifup logical interaface
-#
-ifup () {
-	local INTERFACES_FILE
-	local IFSTATE_FILE
-	local IFUP_RETVAL
-	local WPA_LOGICAL_IFACE
-
-	if [ -e /etc/network/interfaces ]; then
-		INTERFACES_FILE="/etc/network/interfaces"
-	else
-		wpa_msg log "/etc/network/interfaces does not exist, $WPA_IFACE will not be configured"
-		return 1
-	fi
-
-	if [ -e /etc/network/run/ifstate ]; then
-		# debian's ifupdown
-		IFSTATE_FILE="/etc/network/run/ifstate"
-	elif [ -e /var/run/network/ifstate ]; then
-		# ubuntu's
-		IFSTATE_FILE="/var/run/network/ifstate"
-	else
-		unset IFSTATE_FILE
-	fi
-	
-	if [ -z "$IF_WPA_MAPPING_SCRIPT_PRIORITY" ] && [ -n "$WPA_ID_STR" ]; then
-		WPA_LOGICAL_IFACE="$WPA_ID_STR"
-	fi
-	
-	if [ -z "$WPA_LOGICAL_IFACE" ] && [ -n "$IF_WPA_MAPPING_SCRIPT" ]; then
-		local WPA_MAP_STDIN
-		
-		WPA_MAP_STDIN=$(set | sed -n 's/^\(IF_WPA_MAP[0-9]*\)=.*/echo \$\1/p')
-		
-		if [ -n "$WPA_MAP_STDIN" ]; then
-			WPA_LOGICAL_IFACE=$(eval "$WPA_MAP_STDIN" | "$IF_WPA_MAPPING_SCRIPT" "$WPA_IFACE")
-		else		
-			WPA_LOGICAL_IFACE=$("$IF_WPA_MAPPING_SCRIPT" "$WPA_IFACE")
-		fi
-		
-		if [ -n "$WPA_LOGICAL_IFACE" ]; then
-			wpa_msg log "mapping script result: $WPA_LOGICAL_IFACE"
-		else
-			wpa_msg log "mapping script failed."
-		fi
-	fi
-
-	if [ -z "$WPA_LOGICAL_IFACE" ]; then
-		if [ -n "$IF_WPA_ROAM_DEFAULT_IFACE" ]; then
-			WPA_LOGICAL_IFACE="$IF_WPA_ROAM_DEFAULT_IFACE"
-		else
-			WPA_LOGICAL_IFACE="default"
-		fi
-	fi
-
-	if [ -n "$WPA_LOGICAL_IFACE" ]; then
-		if egrep -q "^iface[[:space:]]+${WPA_LOGICAL_IFACE}[[:space:]]+inet" "$INTERFACES_FILE"; then
-			: # logical network is defined
-		else
-			wpa_msg log "network settings not defined for $WPA_LOGICAL_IFACE in $INTERFACES_FILE"
-			WPA_LOGICAL_IFACE="default"
-		fi
-
-		wpa_msg log "ifup $WPA_IFACE=$WPA_LOGICAL_IFACE"
-
-		ifupdown_lock
-
-		if [ -n "$IFSTATE_FILE" ] && grep -q "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
-			# Force settings over the unconfigured "master" IFACE
-			/sbin/ifup -v --force "$WPA_IFACE=$WPA_LOGICAL_IFACE"
-		else
-			/sbin/ifup -v "$WPA_IFACE=$WPA_LOGICAL_IFACE"
-		fi
-		IFUP_RETVAL="$?"
-
-		ifupdown_unlock
-	fi
-
-	wpa_msg log "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
-	cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
-
-	return "$IFUP_RETVAL"
-}
-
-#####################################################################
-## ifdown IFACE
-# Check IFACE state and ifdown as requested.
-#
-ifdown () {
-	wpa_msg log "ifdown $WPA_IFACE"
-
-	ifupdown_lock
-
-	/sbin/ifdown -v "$WPA_IFACE"
-
-	ifupdown_unlock
-
-	wpa_msg log "removing sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
-	rm -f "$WPA_SUP_OMIT_PIDFILE"
-}
-
-#####################################################################
-## keep IFACE scanning
-# After ifdown, the IFACE may be left "down", and inhibits 
-# wpa_supplicant's ability to continue roaming.
-#
-# NB: use iproute if present, flushing the IFACE first
-#
-if_post_down_up () {
-	if [ -x /bin/ip ]; then
-		ip addr flush dev "$WPA_IFACE" 2>/dev/null
-		ip link set "$WPA_IFACE" up
-	else
-		ifconfig "$WPA_IFACE" up
-	fi
-}
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/ifupdown.sh b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/ifupdown.sh
deleted file mode 100644
index 9dab925..0000000
--- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/ifupdown.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/sh
-
-#####################################################################
-## Purpose
-# This file is executed by ifupdown in pre-up, post-up, pre-down and
-# post-down phases of network interface configuration. It allows
-# ifup(8), and ifdown(8) to manage wpa_supplicant(8) and wpa_cli(8)
-# processes running in daemon mode.
-#
-# /etc/wpa_supplicant/functions.sh is sourced by this file.
-#
-# This file is provided by the wpasupplicant package.
-
-#####################################################################
-# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers 
-# <pkg-wpa-devel@lists.alioth.debian.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# On Debian GNU/Linux systems, the text of the GPL license,
-# version 2, can be found in /usr/share/common-licenses/GPL-2.
-
-if [ -n "$IF_WPA_MAINT_DEBUG" ]; then
-	set -x
-fi
-
-# quit if we're called for the loopback
-if [ "$IFACE" = lo ]; then
-	exit 0
-fi
-
-# allow wpa_supplicant interface to be specified via wpa-iface
-# useful for starting wpa_supplicant on one interface of a bridge
-if [ -n "$IF_WPA_IFACE" ]; then
-	WPA_IFACE="$IF_WPA_IFACE"
-else
-	WPA_IFACE="$IFACE"
-fi
-
-# source functions
-if [ -f /etc/wpa_supplicant/functions.sh ]; then
-	. /etc/wpa_supplicant/functions.sh
-else
-	exit 0
-fi
-
-# quit if executables are not installed
-if [ ! -x "$WPA_SUP_BIN" ] || [ ! -x "$WPA_CLI_BIN" ]; then
-	exit 0
-fi
-
-do_start () {
-	if test_wpa_cli; then
-		# if wpa_action is active for this IFACE, do nothing
-		ifupdown_locked && exit 0
-
-		# if the administrator is calling ifup, say something useful
-		if [ "$PHASE" = "pre-up" ]; then
-			wpa_msg stderr "wpa_action is managing ifup/ifdown state of $WPA_IFACE"
-			wpa_msg stderr "execute \`ifdown --force $WPA_IFACE' to stop wpa_action"
-		fi
-		exit 1
-	elif ! set | grep -q "^IF_WPA"; then
-		# no wpa- option defined for IFACE, do nothing
-		exit 0
-	fi
-
-	# ensure stale ifupdown_lock marker is purged
-	ifupdown_unlock
-
-	# preliminary sanity checks for roaming daemon
-	if [ -n "$IF_WPA_ROAM" ]; then
-		if [ "$METHOD" != "manual" ]; then
-			wpa_msg stderr "wpa-roam can only be used with the \"manual\" inet METHOD"
-			exit 1
-		fi
-		if [ -n "$IF_WPA_MAPPING_SCRIPT" ]; then
-			if ! type "$IF_WPA_MAPPING_SCRIPT" >/dev/null; then
-				wpa_msg stderr "wpa-mapping-script \"$IF_WPA_MAPPING_SCRIPT\" is not valid"
-				exit 1
-			fi
-		fi
-		if [ -n "$IF_WPA_MAPPING_SCRIPT_PRIORITY" ] && [ -z "$IF_WPA_MAPPING_SCRIPT" ]; then
-			wpa_msg stderr "\"wpa-mapping-script-priority 1\" is invalid without a wpa-mapping-script"
-			exit 1
-		fi
-		IF_WPA_CONF="$IF_WPA_ROAM"
-		WPA_ACTION_SCRIPT="/usr/sbin/wpa_action"
-	fi
-
-	# master function; determines if ifupdown.sh should do something or not
-	if [ -n "$IF_WPA_CONF" ] && [ "$IF_WPA_CONF" != "managed" ]; then
-		if [ ! -s "$IF_WPA_CONF" ]; then
-			wpa_msg stderr "cannot read contents of $IF_WPA_CONF"
-			exit 1
-		fi	
-		WPA_SUP_CONF_CTRL_DIR=$(sed -n -e 's/[[:space:]]*#.*//g' -e 's/[[:space:]]\+.*$//g' \
-			-e 's/^ctrl_interface=\(DIR=\)\?\(.*\)/\2/p' "$IF_WPA_CONF")
-		if [ -n "$WPA_SUP_CONF_CTRL_DIR" ]; then
-			WPA_CTRL_DIR="$WPA_SUP_CONF_CTRL_DIR"
-			WPA_SUP_CONF="-c $IF_WPA_CONF"
-		else
-			# specify the default ctrl_interface since none was defined in
-			# the given IF_WPA_CONF
-			WPA_SUP_CONF="-c $IF_WPA_CONF -C $WPA_CTRL_DIR"
-		fi
-	else
-		# specify the default ctrl_interface
-		WPA_SUP_CONF="-C $WPA_CTRL_DIR"
-	fi
-}
-
-do_stop () {
-	if test_wpa_cli; then
-		# if wpa_action is active for this IFACE and calling ifdown,
-		# do nothing
-		ifupdown_locked && exit 0
-	elif test_wpa_supplicant; then
-		# wpa_supplicant process exists for this IFACE, but wpa_cli
-		# process does not. Allow stop mode to kill this process.
-		:
-	else
-		exit 0
-	fi
-}
-
-case "$MODE" in 
-	start)
-		do_start
-		case "$PHASE" in
-			pre-up)
-				kill_wpa_supplicant
-				init_wpa_supplicant	|| exit 1
-				conf_wpa_supplicant 	|| { kill_wpa_supplicant; exit 1; }
-				;;
-			post-up)
-				init_wpa_cli 		|| { kill_wpa_supplicant; exit 1; }
-				;;
-		esac
-		;;
-
-	stop)
-		do_stop
-		case "$PHASE" in
-			pre-down)
-				kill_wpa_cli
-				;;
-			post-down)
-				kill_wpa_supplicant
-				;;
-			*)
-				wpa_msg stderr "unknown phase: \"$PHASE\""
-				exit 1
-				;;
-		esac
-		;;
-	
-	*)
-		wpa_msg stderr "unknown mode: \"$MODE\""
-		exit 1
-		;;
-esac
-
-exit 0
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_action b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_action
deleted file mode 100644
index 7ef57ac..0000000
--- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_action
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers 
-# <pkg-wpa-devel@lists.alioth.debian.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# On Debian GNU/Linux systems, the text of the GPL license,
-# version 2, can be found in /usr/share/common-licenses/GPL-2.
-
-if [ -n "$IF_WPA_ROAM_MAINT_DEBUG" ]; then
-	set -x
-fi
-
-if [ -z "$1" ] || [ -z "$2" ]; then
-	echo "Usage: $0 IFACE ACTION"
-	exit 1
-fi
-
-# network interface
-WPA_IFACE="$1"
-# [CONNECTED|DISCONNECTED|stop|reload|check]
-WPA_ACTION="$2"
-
-if [ -f /etc/wpa_supplicant/functions.sh ]; then
-	. /etc/wpa_supplicant/functions.sh
-else
-	exit 0
-fi
-
-case "$WPA_ACTION" in
-	"CONNECTED")
-		wpa_log_env
-		wpa_hysteresis_check || exit 1
-		wpa_hysteresis_event
-		if ifup; then
-			wpa_cli status | wpa_msg log
-		else
-			wpa_cli status | wpa_msg log
-			wpa_cli reassociate
-		fi
-		;;
-
-	"DISCONNECTED")
-		wpa_log_env
-		wpa_hysteresis_check || exit 1
-		ifdown
-		if_post_down_up
-		;;
-
-	"stop"|"down")
-		test_wpa_cli && kill_wpa_cli
-		ifdown
-		test_wpa_supplicant && kill_wpa_supplicant
-		;;
-
-	"restart"|"reload")
-		test_wpa_supplicant || exit 1
-		reload_wpa_supplicant
-		;;
-	
-	"check")
-		test_wpa_supplicant || exit 1
-		test_wpa_cli || exit 1
-		;;
-
-	*)
-		echo "Unknown action: \"$WPA_ACTION\""
-		exit 1
-		;;
-esac
-
-exit 0
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_action.8 b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_action.8
deleted file mode 100644
index e8f1b28..0000000
--- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_action.8
+++ /dev/null
@@ -1,148 +0,0 @@
-.TH WPA_ACTION "8" "26 May 2006" "" ""
-.SH NAME
-wpa_action \- wpa_cli action script
-.SH SYNOPSIS
-\fBwpa_action\fR \fIIFACE ACTION\fR
-.SH "DESCRIPTION"
-\fBwpa_action\fR is a shell script designed to control the \fBifupdown\fR
-framework according to \fIACTION\fR events received from \fBwpa_supplicant\fR.
-\fBwpa_cli\fR receives \fICONNECTED\fR and \fIDISCONNECTED\fR events from
-\fBwpa_supplicant\fR via the crtl_iface socket and gives the \fIACTION\fR event
-to the \fBwpa_action\fR script as an argument, along with the \fIIFACE\fR to be
-acted upon.
-.PP
-\fBwpa_action\fR also receives an environment variable from \fBwpa_cli\fR,
-\fIWPA_ID_STR\fR, containing an alphanumeric identification string for the
-\fICURRENT\fR network block. \fIWPA_ID_STR\fR is provided by the 'id_str'
-network block option of \fBwpa_supplicant.conf\fR, and provides a means to map
-the \fIACTION\fR to a \fILOGICAL\fR interface configured in the \fBinterfaces\fR
-file.
-.PP
-If either the ifupdown \fBinterfaces\fR or \fIifstate\fR file cannot be found,
-\fBwpa_action\fR will exit silently (status 0). \fBwpa_action\fR will search
-the following locations for their existance:
-.nf
-	/etc/network/run/ifstate
-	/var/run/network/ifstate
-	/etc/network/interfaces
-.fi
-.PP
-.SH IFACE
-Network interface to be acted upon, for example 'eth1' or 'wlan0'.
-.SH ACTION
-An \fIACTION\fR to be performed on the \fIIFACE\fR.
-.TP
-\fBCONNECTED\fR
-\fBwpa_supplicant\fR has completed authentication.
-\fBifup\fR \fIIFACE=WPA_ID_STR\fR is invoked and the action is logged to
-syslog. Network settings for the \fILOGICAL\fR interface \fIWPA_ID_STR\fR
-are applied.
-.TP
-\fBDISCONNECTED\fR
-\fBwpa_supplicant\fR has detected disconnection.
-\fBifdown\fR \fIIFACE=WPA_ID_STR\fR is invoked and the action is logged to
-syslog. Network settings for the \fILOGICAL\fR interface \fIWPA_ID_STR\fR
-are undone.
-.TP
-\fBstop\fR
-The 'stop' \fIACTION\fR is a called manually by the user, to stop the 
-\fBwpa_cli\fR daemon, invoke \fBifdown\fR \fIIFACE\fR (if the \fIIFACE\fR is
-present in the \fIifstate\fR file) and stop the \fBwpa_supplicant\fR daemon.
-.TP
-\fBreload\fR
-The 'reload' \fIACTION\fR can be used to reload the \fBwpa_supplicant\fR
-configuration file specified by \fIwpa-roam\fR . 'restart' is a synonym 
-for 'reload' and can be used equally. The action is logged to
-\fI/var/log/wpa_action.log\fR.
-.SH ENVIRONMENT
-An alphanumeric identification string provided by the 'id_str' network block
-option of \fBwpa_supplicant.conf\fR is exported to \fBwpa_action\fR as an 
-environment variable, \fIWPA_ID_STR\fR. When 'id_str' is not configured for the
-\fICURRENT\fR network block, 'default' is substituted for the absent
-\fIWPA_ID_STR\fR environment variable.
-.PP
-A unique network identifier, \fIWPA_ID\fR, is exported to \fBwpa_action\fR. It
-is the number assigned to the \fICURRENT\fR \fBwpa_supplicant\fR network block
-(network_id).
-.SH USAGE
-The only reasons for \fBwpa_action\fR to be explicitly executed by the user is
-to stop \fBwpa_cli\fR from controlling \fBifupdown\fR or reload the 
-\fIwpa_supplicant.conf\fR file after editing.
-.PP
-.RS
-\fBwpa_action\fR \fIeth1 stop\fR
-.RE
-.PP
-Otherwise, \fBwpa_action\fR is given as an argument to a \fBwpa_cli\fR
-daemon.
-.PP
-.RS
-\fBwpa_cli\fR \fI-i eth1 -a /sbin/wpa_action -B\fR
-.RE
-.PP
-This can be done by using the \fIwpa-roam\fR option in the \fBinterfaces\fR
-file. \fIwpa-roam\fR takes one argument, a user provided 
-\fBwpa_supplicant.conf\fR file. 
-.PP
-The inet \fIMETHOD\fR must be 'manual' for this interface, as it will
-be configured according to \fBwpa_cli\fR action events. Also supply a 'default'
-\fBinterfaces\fR stanza using the dhcp inet \fIMETHOD\fR so that networks
-without an 'id_str' option can fallback to attempting to receive an ip via
-dhcp. If one or more networks requires additional network configuration,
-provide an unique 'id_str' for each network, and an \fBinterfaces\fR stanza
-using the 'id_str' value as a \fILOGICAL\fR interface. The following interfaces
-file is configured to use dhcp for any network without an 'id_str', a static ip
-for the network with an 'id_str' of 'home_static' and dhcp plus an additional
-post-up command for the network with an 'id_str' of 'uni'.
-.PP
-An example wpa_supplicant.conf configured to roam between 3 different networks:
-.PP
-.RS
-.nf
-network={
-	ssid="foo"
-	id_str="uni"
-	key_mgmt=NONE
-}
-
-network={
-	ssid="bar"
-	id_str="home_static"
-	psk=123456789...
-}
-
-network={
-	ssid=""
-	key_mgmt=NONE
-}
-.fi
-.RE
-.PP
-The corresponding \fBinterfaces\fR file would contain \fILOGICAL\fR interfaces,
-that correlate to each unique 'id_str' provided by the configuration file:
-.PP
-.RS
-.nf
-iface eth1 inet manual
-	wpa-driver wext
-	wpa-roam /etc/wpa_supplicant/wpa_supplicant.conf
-
-iface default inet dhcp
-
-iface uni inet dhcp
-
-iface home_static inet static
-        address 192.168.0.20
-        netmask 255.255.255.0
-        network 192.168.0.0
-        broadcast 192.168.0.255
-        gateway 192.168.0.1
-.fi
-.RE
-.PP
-.SH SEE ALSO
-\fBwpa_cli(8)\fR, \fBwpa_supplicant(8)\fR, \fBwpa_supplicant.conf(5)\fR,
-\fBifup(8)\fR, \fBinterfaces(5)\fR
-.SH AUTHOR
-This manual page was written by Kel Modderman <kel@otaku42.de> for
-the Debian GNU system (but may be used by others).
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/action_wpa.sh b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/action_wpa.sh
new file mode 100644
index 0000000..6d90fa6
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/action_wpa.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Action script to enable/disable wpa-roam interfaces in reaction to
+# ifplugd events.
+#
+# Copyright: Copyright (c) 2008-2010, Kel Modderman <kel@otaku42.de>
+# License:   GPL-2
+#
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+if [ ! -x /usr/sbin/wpa_action ]; then
+	exit 0
+fi
+
+# ifplugd(8) - <iface> <action>
+#
+# If an ifplugd managed interface is brought up, disconnect any
+# wpa-roam managed interfaces so that only one "roaming" interface
+# remains active on the system.
+
+IFPLUGD_IFACE="${1}"
+
+case "${2}" in
+	up)
+		COMMAND=disconnect
+		;;
+	down)
+		COMMAND=reconnect
+		;;
+	*)
+		echo "$0: unknown arguments: ${@}" >&2
+		exit 1
+		;;
+esac
+
+for CTRL in /var/run/wpa_supplicant/*; do
+	[ -S "${CTRL}" ] || continue
+
+	IFACE="${CTRL#/var/run/wpa_supplicant/}"
+
+	# skip if ifplugd is managing this interface
+	if [ "${IFPLUGD_IFACE}" = "${IFACE}" ]; then
+		continue
+	fi
+
+	if wpa_action "${IFACE}" check; then
+		wpa_cli -i "${IFACE}" "${COMMAND}"
+	fi
+done
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/functions.sh b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/functions.sh
new file mode 100644
index 0000000..b9e0eb2
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/functions.sh
@@ -0,0 +1,1015 @@
+#!/bin/sh
+
+#####################################################################
+## Purpose
+# This file contains common shell functions used by scripts of the
+# wpasupplicant package to allow ifupdown to manage wpa_supplicant.
+# It also contains some functions used by wpa_action(8) that allow
+# ifupdown to be managed by wpa_cli(8) action events.
+#
+# This file is provided by the wpasupplicant package.
+
+#####################################################################
+# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers 
+# <pkg-wpa-devel@lists.alioth.debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# On Debian GNU/Linux systems, the text of the GPL license,
+# version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+#####################################################################
+## global variables
+# wpa_supplicant variables
+WPA_SUP_BIN="/usr/sbin/wpa_supplicant"
+WPA_SUP_PNAME="wpa_supplicant"
+WPA_SUP_PIDFILE="/var/run/wpa_supplicant.${WPA_IFACE}.pid"
+
+# wpa_cli variables
+WPA_CLI_BIN="/usr/sbin/wpa_cli"
+WPA_CLI_PNAME="wpa_cli"
+WPA_CLI_PIDFILE="/var/run/wpa_action.${WPA_IFACE}.pid"
+WPA_CLI_TIMESTAMP="/var/run/wpa_action.${WPA_IFACE}.timestamp"
+WPA_CLI_IFUPDOWN="/var/run/wpa_action.${WPA_IFACE}.ifupdown"
+
+# sendsigs omission interface, present in initscripts (>= 2.86.ds1-48)
+if [ -d /lib/init/rw/sendsigs.omit.d/ ]; then
+	# Debian
+	WPA_SUP_OMIT_PIDFILE="/lib/init/rw/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
+elif [ -d /var/run/sendsigs.omit.d/ ]; then
+	# Ubuntu, see https://launchpad.net/bugs/181541 for status
+	WPA_SUP_OMIT_PIDFILE="/var/run/sendsigs.omit.d/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
+else
+	WPA_SUP_OMIT_PIDFILE=
+fi
+
+# default ctrl_interface socket directory
+if [ -z "$WPA_CTRL_DIR" ]; then
+	WPA_CTRL_DIR="/var/run/wpa_supplicant"
+fi
+
+# verbosity variables
+if [ -n "$IF_WPA_VERBOSITY" ] || [ "$VERBOSITY" = "1" ]; then
+	TO_NULL="/dev/stdout"
+	DAEMON_VERBOSITY="--verbose"
+else
+	TO_NULL="/dev/null"
+	DAEMON_VERBOSITY="--quiet"
+fi
+
+#####################################################################
+## wpa_cli wrapper
+# Path to common ctrl_interface socket and iface supplied.
+# NB: WPA_CTRL_DIR cannot be used for interactive commands, it is
+# set only in the environment that wpa_cli provides when processing
+# action events.
+#
+wpa_cli () {
+	"$WPA_CLI_BIN" -p "$WPA_CTRL_DIR" -i "$WPA_IFACE" "$@"
+
+	return "$?"
+}
+
+#####################################################################
+## verbose and stderr message wrapper
+# Ensures a standard and easily identifiable message is printed by
+# scripts using this function library.
+#
+# log		Log a message to syslog when called non-interactively
+#		by wpa_action
+#
+# verbose	To stdout when IF_WPA_VERBOSITY or VERBOSITY is true
+#
+# action	Same as verbose but without newline
+#		Useful for allowing wpa_cli commands to echo result
+#		value of 'OK' or 'FAILED'
+#
+# stderr	Echo warning or error messages to stderr
+#
+# NB: when called by wpa_action, there is no redirection (verbose)
+#
+wpa_msg () {
+	if [ "$1" = "log" ]; then
+		shift
+		case "$WPA_ACTION" in
+			"CONNECTED"|"DISCONNECTED")
+				[ -x /usr/bin/logger ] || return
+				if [ "$#" -gt 0 ]; then
+					logger -t "wpa_action" "$@"
+				else
+					logger -t "wpa_action"
+				fi
+				;;
+			*)
+				[ "$#" -gt 0 ] && echo "wpa_action: $@"
+				;;
+		esac
+		return
+	fi
+	
+	case "$1" in 
+		"verbose")
+			shift
+			echo "$WPA_SUP_PNAME: $@" >$TO_NULL
+			;;
+		"action")
+			shift
+			echo -n "$WPA_SUP_PNAME: $@ -- " >$TO_NULL
+			;;
+		"stderr")
+			shift
+			echo "$WPA_SUP_PNAME: $@" >/dev/stderr
+			;;
+		*)
+			;;
+	esac
+}
+
+#####################################################################
+## validate daemon pid files
+# Test daemon process ID files via start-stop-daemon with a signal 0
+# given the exec binary and pidfile location.
+#
+# $1	daemon
+# $2	pidfile
+#
+# Returns true when pidfile exists, the process ID exists _and_ was
+# created by the exec binary.
+#
+# If the test fails, but the pidfile exists, it is stale
+#
+test_daemon_pidfile () {
+	local DAEMON
+	local PIDFILE
+	
+	if [ -n "$1" ]; then
+		DAEMON="$1"
+	fi
+	
+	if [ -f "$2" ]; then
+		PIDFILE="$2"
+	fi
+	
+	if [ -n "$DAEMON" ] && [ -f "$PIDFILE" ]; then
+		if start-stop-daemon --stop --quiet --signal 0 \
+			--exec "$DAEMON" --pidfile "$PIDFILE"; then
+			return 0
+		else
+			rm -f "$PIDFILE"
+			return 1
+		fi
+	else
+		return 1
+	fi
+}
+
+# validate wpa_supplicant pidfile
+test_wpa_supplicant () {
+	test_daemon_pidfile "$WPA_SUP_BIN" "$WPA_SUP_PIDFILE"
+}
+
+# validate wpa_cli pidfile
+test_wpa_cli () {
+	test_daemon_pidfile "$WPA_CLI_BIN" "$WPA_CLI_PIDFILE"
+}
+
+#####################################################################
+## daemonize wpa_supplicant
+# Start wpa_supplicant via start-stop-dameon with all required
+# options. Will start if environment variable WPA_SUP_CONF is present
+#
+# Default options:
+# -B	dameonize/background process
+# -D	driver backend ('wext' if none given)
+# -P	process ID file
+# -C	path to ctrl_interface socket directory
+# -s    log to syslog
+#
+# Conditional options:
+# -c	configuration file
+# -W	wait for wpa_cli to attach to ctrl_interface socket
+# -b	bridge interface name
+# -f	path to log file
+#
+init_wpa_supplicant () {
+	[ -n "$WPA_SUP_CONF" ] || return 0
+
+	local WPA_SUP_OPTIONS
+	WPA_SUP_OPTIONS="-s -B -P $WPA_SUP_PIDFILE -i $WPA_IFACE"
+
+	if [ -n "$WPA_ACTION_SCRIPT" ]; then
+		if [ -x "$WPA_ACTION_SCRIPT" ]; then
+			WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -W"
+			wpa_msg verbose "wait for wpa_cli to attach"
+		else
+			wpa_msg stderr "action script \"$WPA_ACTION_SCRIPT\" not executable"
+			return 1
+		fi
+	fi
+
+	if [ -n "$IF_WPA_BRIDGE" ]; then
+		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -b $IF_WPA_BRIDGE"
+		wpa_msg verbose "wpa-bridge $IF_WPA_BRIDGE"
+	fi
+
+	if [ -n "$IF_WPA_DRIVER" ]; then
+		wpa_msg verbose "wpa-driver $IF_WPA_DRIVER"
+		case "$IF_WPA_DRIVER" in
+			hostap|ipw|madwifi|ndiswrapper)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D nl80211,wext"
+				wpa_msg stderr "\"$IF_WPA_DRIVER\" wpa-driver is unsupported"
+				wpa_msg stderr "using \"nl80211,wext\" wpa-driver instead ..."
+				;;
+			*)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D $IF_WPA_DRIVER"
+				;;
+		esac
+	else
+		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D nl80211,wext"
+		wpa_msg verbose "wpa-driver nl80211,wext (default)"
+	fi
+
+	if [ -n "$IF_WPA_DEBUG_LEVEL" ]; then
+		case "$IF_WPA_DEBUG_LEVEL" in
+			3)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -t -ddd"
+				;;
+			2)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -t -dd"
+				;;
+			1)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -t -d"
+				;;
+			0)
+				# wpa_supplicant default verbosity
+				;;
+			-1)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -q"
+				;;
+			-2)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -qq"
+				;;
+		esac
+		wpa_msg verbose "using debug level: $IF_WPA_DEBUG_LEVEL"
+	fi
+
+	if [ -n "$IF_WPA_LOGFILE" ]; then
+		# custom log file
+		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -f $IF_WPA_LOGFILE"
+		WPA_SUP_LOGFILE="$IF_WPA_LOGFILE"
+		wpa_msg verbose "logging to $IF_WPA_LOGFILE"
+	fi
+
+	wpa_msg verbose "$WPA_SUP_BIN $WPA_SUP_OPTIONS $WPA_SUP_CONF"
+		
+	start-stop-daemon --start --oknodo $DAEMON_VERBOSITY \
+		--name $WPA_SUP_PNAME --startas $WPA_SUP_BIN --pidfile $WPA_SUP_PIDFILE \
+		-- $WPA_SUP_OPTIONS $WPA_SUP_CONF
+
+	if [ "$?" -ne 0 ]; then
+		wpa_msg stderr "$WPA_SUP_BIN daemon failed to start"
+		return 1
+	fi
+
+	if [ -n "$WPA_SUP_OMIT_PIDFILE" ]; then
+		local WPA_PIDFILE_WAIT
+		local MAX_WPA_PIDFILE_WAIT
+		WPA_PIDFILE_WAIT="0"
+		MAX_WPA_PIDFILE_WAIT="5"
+		until [ -s "$WPA_SUP_PIDFILE" ]; do
+			if [ "$WPA_PIDFILE_WAIT" -ge "$MAX_WPA_PIDFILE_WAIT" ]; then
+				wpa_msg stderr "timed out waiting for creation of $WPA_SUP_PIDFILE"
+				return 1
+			else
+				wpa_msg verbose "waiting for \"$WPA_SUP_PIDFILE\": " \
+					"$WPA_PIDFILE_WAIT (max. $MAX_WPA_PIDFILE_WAIT)"
+			fi
+
+			WPA_PIDFILE_WAIT=$(($WPA_PIDFILE_WAIT + 1))
+			sleep 1
+		done
+		wpa_msg verbose "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+		cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+	else
+		wpa_msg verbose "sendsigs omission pidfile not created"
+	fi
+
+	local WPA_SOCKET_WAIT
+	local MAX_WPA_SOCKET_WAIT
+	WPA_SOCKET_WAIT="0"
+	MAX_WPA_SOCKET_WAIT="5"
+	until [ -S "$WPA_CTRL_DIR/$WPA_IFACE" ]; do
+		if [ "$WPA_SOCKET_WAIT" -ge "$MAX_WPA_SOCKET_WAIT" ]; then
+			wpa_msg stderr "ctrl_interface socket not found at $WPA_CTRL_DIR/$WPA_IFACE"
+			return 1
+		else
+			wpa_msg verbose "waiting for \"$WPA_CTRL_DIR/$WPA_IFACE\": " \
+				"$WPA_SOCKET_WAIT (max. $MAX_WPA_SOCKET_WAIT)"
+		fi
+		
+		WPA_SOCKET_WAIT=$(($WPA_SOCKET_WAIT + 1))
+		sleep 1
+	done
+	
+	wpa_msg verbose "ctrl_interface socket located at $WPA_CTRL_DIR/$WPA_IFACE"
+}
+
+#####################################################################
+## stop wpa_supplicant process
+# Kill wpa_supplicant via start-stop-daemon, given the location of
+# the pidfile or ctrl_interface socket path and interface name
+#
+kill_wpa_supplicant () {
+	test_wpa_supplicant || return 0
+
+	wpa_msg verbose "terminating $WPA_SUP_PNAME daemon via pidfile $WPA_SUP_PIDFILE"
+
+	start-stop-daemon --stop --oknodo $DAEMON_VERBOSITY \
+		--exec $WPA_SUP_BIN --pidfile $WPA_SUP_PIDFILE
+
+	if [ -f "$WPA_SUP_PIDFILE" ]; then
+		rm -f "$WPA_SUP_PIDFILE"
+	fi
+
+	if [ -f "$WPA_SUP_OMIT_PIDFILE" ]; then
+		wpa_msg verbose "removing $WPA_SUP_OMIT_PIDFILE"
+		rm -f "$WPA_SUP_OMIT_PIDFILE"
+	fi
+}
+
+#####################################################################
+## reload wpa_supplicant process
+# Sending a HUP signal causes wpa_supplicant to reparse its
+# configuration file
+#
+reload_wpa_supplicant () {
+	if test_wpa_supplicant; then
+		wpa_msg verbose "reloading wpa_supplicant configuration file via HUP signal"
+		start-stop-daemon --stop --signal HUP \
+			--name "$WPA_SUP_PNAME" --pidfile "$WPA_SUP_PIDFILE"
+	else
+		wpa_msg verbose "cannot $WPA_ACTION, $WPA_SUP_PIDFILE does not exist"
+	fi
+}
+
+#####################################################################
+## daemonize wpa_cli and action script
+# If environment variable WPA_ACTION_SCRIPT is present, wpa_cli will
+# be spawned via start-stop-daemon
+#
+# Required options:
+# -a	action script => wpa_action
+# -P	process ID file
+# -B	background process
+#
+init_wpa_cli () {
+	[ -n "$WPA_ACTION_SCRIPT" ] || return 0
+
+	local WPA_CLI_OPTIONS
+	WPA_CLI_OPTIONS="-B -P $WPA_CLI_PIDFILE -i $WPA_IFACE"
+
+	wpa_msg verbose "$WPA_CLI_BIN $WPA_CLI_OPTIONS -p $WPA_CTRL_DIR -a $WPA_ACTION_SCRIPT"
+		
+	start-stop-daemon --start --oknodo $DAEMON_VERBOSITY \
+		--name $WPA_CLI_PNAME --startas $WPA_CLI_BIN --pidfile $WPA_CLI_PIDFILE \
+		-- $WPA_CLI_OPTIONS -p $WPA_CTRL_DIR -a $WPA_ACTION_SCRIPT
+
+	if [ "$?" -ne 0 ]; then
+		wpa_msg stderr "$WPA_CLI_BIN daemon failed to start"
+		return 1
+	fi
+}
+
+#####################################################################
+## stop wpa_cli process
+# Kill wpa_cli via start-stop-daemon, given the location of the
+# pidfile
+#
+kill_wpa_cli () {
+	test_wpa_cli || return 0
+	
+	wpa_msg verbose "terminating $WPA_CLI_PNAME daemon via pidfile $WPA_CLI_PIDFILE"
+	
+	start-stop-daemon --stop --oknodo $DAEMON_VERBOSITY \
+		--exec $WPA_CLI_BIN --pidfile $WPA_CLI_PIDFILE
+	
+	if [ -f "$WPA_CLI_PIDFILE" ]; then
+		rm -f "$WPA_CLI_PIDFILE"
+	fi
+
+	if [ -f "$WPA_CLI_TIMESTAMP" ]; then
+		rm -f "$WPA_CLI_TIMESTAMP"
+	fi
+
+	if [ -L "$WPA_CLI_IFUPDOWN" ]; then
+		rm -f "$WPA_CLI_IFUPDOWN"
+	fi
+}
+
+#####################################################################
+## higher level wpa_cli wrapper for variable and set_network commands
+# wpa_cli_do <value> <type> <variable> [set_network variable] <desc>
+#
+# $1	envorinment variable
+# $2	data type of variable {raw|ascii}
+# $3	wpa_cli variable, if $3 is set_network, shift and take 
+#	set_network subvariable
+# $4	wpa-* string as it would appear in interfaces file, enhances
+#	verbose messages
+#
+wpa_cli_do () {
+	if [ -z "$1" ]; then
+		return 0
+	fi
+	
+	local WPACLISET_VALUE
+	local WPACLISET_VARIABLE
+	local WPACLISET_DESC
+	
+	case "$2" in
+		ascii)
+			# Double quote
+			WPACLISET_VALUE="\"$1\""
+			;;
+		raw|*)
+			# Provide raw value
+			WPACLISET_VALUE="$1"
+			;;
+	esac
+	
+	case "$3" in
+		set_network)
+			if [ -z "$WPA_ID" ]; then
+				return 1
+			fi
+			shift
+			WPACLISET_VARIABLE="set_network $WPA_ID $3"
+			;;
+		*)
+			WPACLISET_VARIABLE="$3"
+			;;
+	esac
+	
+	case "$4" in
+		*-psk|*-passphrase|*-passwd*|*-wep-key*)
+			WPACLISET_DESC="$4 *****"
+			;;
+		*)
+			WPACLISET_DESC="$4 $WPACLISET_VALUE"
+			;;
+	esac
+
+	wpa_msg action "$WPACLISET_DESC"
+	
+	wpa_cli $WPACLISET_VARIABLE "$WPACLISET_VALUE" >$TO_NULL
+
+	if [ "$?" -ne 0 ]; then
+		wpa_msg stderr "$WPACLISET_DESC failed!"
+	fi
+}
+
+#####################################################################
+## check value data type in plaintext or hex
+# returns 0 if input consists of hexadecimal digits only, 1 otherwise
+#
+ishex () {
+	if [ -z "$1" ]; then 
+		return 0
+	fi
+	
+	case "$1" in
+		*[!0-9a-fA-F]*)
+			# plaintext
+			return 1
+			;;
+		*)
+			# hexadecimal
+			return 0
+			;;
+	esac
+}
+
+#####################################################################
+## sanity check and set psk|passphrase
+# Warn about strange psk|passphrase values
+#
+# $1	psk or passphrase value
+# 
+# If psk is surrounded by quotes strip them.
+#
+# If psk contains all hexadecimal characters and string length is 64:
+#	is 256bit hexadecimal
+# else:
+# 	is plaintext
+#
+# plaintext passphrases must be 8 - 63 characters in length
+# 256-bit hexadecimal key must be 64 characters in length
+#
+wpa_key_check_and_set () {
+	if [ "$#" -ne 3 ]; then
+		return 0
+	fi
+
+	local KEY
+	local KEY_LEN
+	local KEY_TYPE
+	local ENC_TYPE
+	
+	case "$1" in
+		'"'*'"')
+			# Strip surrounding quotation marks
+			KEY=$(echo -n "$1" | sed 's/^"//;s/"$//')
+			;;
+		*)
+			KEY="$1"
+			;;
+	esac
+
+	KEY_LEN="${#KEY}"
+
+	case "$2" in
+		wep_key*)
+			ENC_TYPE="WEP"
+			;;
+		psk)
+			ENC_TYPE="WPA"
+			;;
+		*)
+			return 0
+			;;
+	esac
+
+	if [ "$ENC_TYPE" = "WEP" ]; then
+		if ishex "$KEY"; then
+			case "$KEY_LEN" in
+				10|26|32|58)
+					# 64/128/152/256-bit WEP
+					KEY_TYPE="raw"
+					;;
+				*)
+					KEY_TYPE="ascii"
+					;;
+			esac
+		else
+			KEY_TYPE="ascii"
+		fi
+
+		if [ "$KEY_TYPE" = "ascii" ]; then
+			if [ "$KEY_LEN" -lt "5" ]; then
+				wpa_msg stderr "WARNING: plaintext or ascii WEP key has $KEY_LEN characters,"
+				wpa_msg stderr "it must have at least 5 to be valid."
+			fi
+		fi
+	elif [ "$ENC_TYPE" = "WPA" ]; then
+		if ishex "$KEY"; then
+			case "$KEY_LEN" in
+				64)
+					# 256-bit WPA
+					KEY_TYPE="raw"
+					;;
+				*)
+					KEY_TYPE="ascii"
+					;;
+			esac
+		else
+			KEY_TYPE="ascii"
+		fi
+
+		if [ "$KEY_TYPE" = "ascii" ]; then
+			if [ "$KEY_LEN" -lt "8" ] || [ "$KEY_LEN" -gt "63" ]; then
+				wpa_msg stderr "WARNING: plaintext or ascii WPA key has $KEY_LEN characters,"
+				wpa_msg stderr "it must have between 8 and 63 to be valid."
+				wpa_msg stderr "If the WPA key is a 256-bit hexadecimal key, it must have"
+				wpa_msg stderr "exactly 64 characters."
+			fi
+		fi
+	fi
+
+	wpa_cli_do "$KEY" "$KEY_TYPE" set_network "$2" "$3"
+}
+
+#####################################################################
+## formulate a usable configuration from interfaces(5) wpa- lines
+# A series of wpa_cli commands corresponding to environment variables
+# created as a result of wpa- lines in an interfaces stanza.
+#
+# NB: no-act when roaming daemon is used (to avoid prematurely
+# attaching to ctrl_interface socket)
+#
+conf_wpa_supplicant () {
+	if [ -n "$WPA_ACTION_SCRIPT" ]; then
+		return 0
+	fi
+
+	if [ "$IF_WPA_DRIVER" = "wired" ]; then
+		IF_WPA_AP_SCAN="0"
+		wpa_msg verbose "forcing ap_scan=0 (required for wired IEEE8021X auth)"
+	fi
+
+	if [ -n "$IF_WPA_ESSID" ]; then
+		# #403316, be similar to wireless tools
+		IF_WPA_SSID="$IF_WPA_ESSID"
+	fi
+	
+	wpa_cli_do "$IF_WPA_AP_SCAN" raw \
+		ap_scan wpa-ap-scan
+	
+	wpa_cli_do "$IF_WPA_PREAUTHENTICATE" raw \
+		preauthenticate wpa-preauthenticate
+		
+	if [ -n "$IF_WPA_SSID" ] || [ "$IF_WPA_DRIVER" = "wired" ] || \
+		[ -n "$IF_WPA_KEY_MGMT" ]; then
+		
+		case "$IF_WPA_SSID" in
+			'"'*'"')
+				IF_WPA_SSID=$(echo -n "$IF_WPA_SSID" | sed 's/^"//;s/"$//')
+				;;
+			*)
+				;;
+		esac
+		
+		WPA_ID=$(wpa_cli add_network)
+
+		wpa_msg verbose "configuring network block -- $WPA_ID"
+		
+		wpa_cli_do "$IF_WPA_SSID" ascii \
+			set_network ssid wpa-ssid
+		
+		wpa_cli_do "$IF_WPA_PRIORITY" raw \
+			set_network priority wpa-priority
+		
+		wpa_cli_do "$IF_WPA_BSSID" raw \
+			set_network bssid wpa-bssid
+		
+		if [ -s "$IF_WPA_PSK_FILE" ]; then
+			IF_WPA_PSK=$(cat "$IF_WPA_PSK_FILE")
+		fi
+		
+		# remain compat with wpa-passphrase-file
+		if [ -s "$IF_WPA_PASSPHRASE_FILE" ]; then
+			IF_WPA_PSK=$(cat "$IF_WPA_PASSPHRASE_FILE")
+		fi
+		
+		# remain compat with wpa-passphrase
+		if [ -n "$IF_WPA_PASSPHRASE" ]; then
+			IF_WPA_PSK="$IF_WPA_PASSPHRASE"
+		fi
+	
+		if [ -n "$IF_WPA_PSK" ]; then
+			wpa_key_check_and_set "$IF_WPA_PSK" \
+				psk wpa-psk
+		fi
+		
+		wpa_cli_do "$IF_WPA_PAIRWISE" raw \
+			set_network pairwise wpa-pairwise
+		
+		wpa_cli_do "$IF_WPA_GROUP" raw \
+			set_network group wpa-group
+
+		wpa_cli_do "$IF_WPA_MODE" raw \
+			set_network mode wpa-mode
+
+		wpa_cli_do "$IF_WPA_FREQUENCY" raw \
+			set_network frequency wpa-frequency
+
+		wpa_cli_do "$IF_WPA_SCAN_FREQ" raw \
+			set_network scan_freq wpa-scan-freq
+
+		wpa_cli_do "$IF_WPA_FREQ_LIST" raw \
+			set_network freq_list wpa-freq-list
+		
+		wpa_cli_do "$IF_WPA_KEY_MGMT" raw \
+			set_network key_mgmt wpa-key-mgmt
+		
+		wpa_cli_do "$IF_WPA_PROTO" raw \
+			set_network proto wpa-proto
+		
+		wpa_cli_do "$IF_WPA_AUTH_ALG" raw \
+			set_network auth_alg wpa-auth-alg
+		
+		wpa_cli_do "$IF_WPA_SCAN_SSID" raw \
+			set_network scan_ssid wpa-scan-ssid
+		
+		wpa_cli_do "$IF_WPA_IDENTITY" ascii \
+			set_network identity wpa-identity
+		
+		wpa_cli_do "$IF_WPA_ANONYMOUS_IDENTITY" ascii \
+			set_network anonymous_identity wpa-anonymous-identity
+		
+		wpa_cli_do "$IF_WPA_EAP" raw \
+			set_network eap wpa-eap
+		
+		wpa_cli_do "$IF_WPA_EAPPSK" raw \
+			set_network eappsk wpa-eappsk
+
+		wpa_cli_do "$IF_WPA_NAI" ascii \
+			set_network nai wpa-nai
+
+		wpa_cli_do "$IF_WPA_PASSWORD" ascii \
+			set_network password wpa-password
+
+		wpa_cli_do "$IF_WPA_CA_CERT" ascii \
+			set_network ca_cert wpa-ca-cert
+
+		wpa_cli_do "$IF_WPA_CA_PATH" ascii \
+			set_network ca_path wpa-ca-path
+
+		wpa_cli_do "$IF_WPA_CLIENT_CERT" ascii \
+			set_network client_cert wpa-client-cert
+
+		wpa_cli_do "$IF_WPA_PRIVATE_KEY" ascii \
+			set_network private_key wpa-private-key
+
+		wpa_cli_do "$IF_WPA_PRIVATE_KEY_PASSWD" ascii \
+			set_network private_key_passwd wpa-private-key-passwd
+		
+		wpa_cli_do "$IF_WPA_DH_FILE" ascii \
+			set_network dh_file wpa-dh-file
+
+		wpa_cli_do "$IF_WPA_SUBJECT_MATCH" ascii \
+			set_network subject_match wpa-subject-match
+
+		wpa_cli_do "$IF_WPA_ALTSUBJECT_MATCH" ascii \
+			set_network altsubject_match wpa-altsubject-match
+
+		wpa_cli_do "$IF_WPA_CA_CERT2" ascii \
+			set_network ca_cert2 wpa-ca-cert2
+
+		wpa_cli_do "$IF_WPA_CA_PATH2" ascii \
+			set_network ca_path2 wpa-ca-path2
+
+		wpa_cli_do "$IF_WPA_CLIENT_CERT2" ascii \
+			set_network client_cert2 wpa-client-cert2
+
+		wpa_cli_do "$IF_WPA_PRIVATE_KEY2" ascii \
+			set_network private_key2 wpa-private-key2
+
+		wpa_cli_do "$IF_WPA_PRIVATE_KEY_PASSWD2" ascii \
+			set_network private_key_passwd2 wpa-private-key-passwd2
+		
+		wpa_cli_do "$IF_WPA_DH_FILE2" ascii \
+			set_network dh_file2 wpa-dh-file2
+
+		wpa_cli_do "$IF_WPA_SUBJECT_MATCH2" ascii \
+			set_network subject_match2 wpa-subject-match2
+
+		wpa_cli_do "$IF_WPA_ALTSUBJECT_MATCH2" ascii \
+			set_network altsubject_match2 wpa-altsubject-match2
+		
+		wpa_cli_do "$IF_WPA_EAP_METHODS" raw \
+			set_network eap_methods wpa-eap-methods
+
+		wpa_cli_do "$IF_WPA_PHASE1" ascii \
+			set_network phase1 wpa-phase1
+
+		wpa_cli_do "$IF_WPA_PHASE2" ascii \
+			set_network phase2 wpa-phase2
+
+		wpa_cli_do "$IF_WPA_PCSC" raw \
+			set_network pcsc wpa-pcsc
+
+		wpa_cli_do "$IF_WPA_PIN" ascii \
+			set_network pin wpa-pin
+
+		wpa_cli_do "$IF_WPA_ENGINE" raw \
+			set_network engine wpa-engine
+
+		wpa_cli_do "$IF_WPA_ENGINE_ID" ascii \
+			set_network engine_id wpa-engine-id
+
+		wpa_cli_do "$IF_WPA_KEY_ID" ascii \
+			set_network key_id wpa-key-id
+
+		wpa_cli_do "$IF_WPA_EAPOL_FLAGS" raw \
+			set_network eapol_flags wpa-eapol-flags
+		
+		if [ -n "$IF_WPA_WEP_KEY0" ]; then
+			wpa_key_check_and_set "$IF_WPA_WEP_KEY0" \
+				wep_key0 wpa-wep-key0
+		fi
+		
+		if [ -n "$IF_WPA_WEP_KEY1" ]; then
+			wpa_key_check_and_set "$IF_WPA_WEP_KEY1" \
+				wep_key1 wpa-wep-key1
+		fi
+
+		if [ -n "$IF_WPA_WEP_KEY2" ]; then
+			wpa_key_check_and_set "$IF_WPA_WEP_KEY2" \
+				wep_key2 wpa-wep-key2
+		fi
+
+		if [ -n "$IF_WPA_WEP_KEY3" ]; then
+			wpa_key_check_and_set "$IF_WPA_WEP_KEY3" \
+				wep_key3 wpa-wep-key3
+		fi
+		
+		wpa_cli_do "$IF_WPA_WEP_TX_KEYIDX" raw \
+			set_network wep_tx_keyidx wpa-wep-tx-keyidx
+		
+		wpa_cli_do "$IF_WPA_PROACTIVE_KEY_CACHING" raw \
+			set_network proactive_key_caching wpa-proactive-key-caching
+			
+		wpa_cli_do "$IF_WPA_PAC_FILE" ascii \
+			set_network pac_file wpa-pac-file
+		
+		wpa_cli_do "$IF_WPA_PEERKEY" raw \
+			set_network peerkey wpa-peerkey
+			
+		wpa_cli_do "$IF_FRAGMENT_SIZE" raw \
+			set_network fragment_size wpa-fragment-size
+
+		wpa_cli_do "$IF_WPA_ID_STR" ascii \
+			set_network id_str wpa-id-str
+		
+		wpa_cli_do "$WPA_ID" raw \
+			enable_network "enabling network block"
+	fi
+}
+
+#####################################################################
+## Log wpa_cli environment variables
+wpa_log_env () {
+	wpa_msg log "WPA_IFACE=$WPA_IFACE WPA_ACTION=$WPA_ACTION"
+	wpa_msg log "WPA_ID=$WPA_ID WPA_ID_STR=$WPA_ID_STR WPA_CTRL_DIR=$WPA_CTRL_DIR"
+}
+
+#####################################################################
+## hysteresis checking
+# Networking tools such as dhcp clients used with ifupdown can
+# synthesize artificial ACTION events, particuarly just after a
+# DISCONNECTED/CONNECTED events are experienced in quick succession.
+# This can lead to infinite event loops, and in extreme cases has the
+# potential to cause system instability.
+#
+wpa_hysteresis_event () {
+	echo "$(date +%s)" > "$WPA_CLI_TIMESTAMP" 2>/dev/null
+}
+
+wpa_hysteresis_check () {
+	if [ -f "$WPA_CLI_TIMESTAMP" ]; then
+		local TIME
+		local TIMESTAMP
+		local TIMEWAIT
+		TIME=$(date +%s)
+		# current time minus 4 second event buffer
+		TIMEWAIT=$(($TIME-4))
+		# get time of last event
+		TIMESTAMP=$(cat $WPA_CLI_TIMESTAMP)
+		# compare values, allowing new action to be processed 
+		# only if last action was more than 4 seconds ago
+		if [ "$TIMEWAIT" -le "$TIMESTAMP" ]; then
+			wpa_msg log "$WPA_ACTION event blocked by hysteresis check"
+			return 1
+		fi
+	fi
+
+	return 0
+}
+
+#####################################################################
+## ifupdown locking functions
+# A collection of rudimentary locking functions to lock ifup/ifdown
+# actions.
+#
+
+ifupdown_lock () {
+	ln -s lock "$WPA_CLI_IFUPDOWN"
+}
+
+ifupdown_locked () {
+	[ -L "$WPA_CLI_IFUPDOWN" ] && return 0
+
+	return 1
+}
+
+ifupdown_unlock () {
+	rm -f "$WPA_CLI_IFUPDOWN"
+}
+
+#####################################################################
+## apply mapping logic and ifup logical interface
+# Apply mapping logic via id_str or external mapping script, check
+# state of IFACE with respect to ifupdown and ifup logical interaface
+#
+ifup () {
+	local INTERFACES_FILE
+	local IFSTATE_FILE
+	local IFUP_RETVAL
+	local WPA_LOGICAL_IFACE
+
+	if [ -e /etc/network/interfaces ]; then
+		INTERFACES_FILE="/etc/network/interfaces"
+	else
+		wpa_msg log "/etc/network/interfaces does not exist, $WPA_IFACE will not be configured"
+		return 1
+	fi
+
+	if [ -e /etc/network/run/ifstate ]; then
+		# debian's ifupdown
+		IFSTATE_FILE="/etc/network/run/ifstate"
+	elif [ -e /var/run/network/ifstate ]; then
+		# ubuntu's
+		IFSTATE_FILE="/var/run/network/ifstate"
+	else
+		unset IFSTATE_FILE
+	fi
+	
+	if [ -z "$IF_WPA_MAPPING_SCRIPT_PRIORITY" ] && [ -n "$WPA_ID_STR" ]; then
+		WPA_LOGICAL_IFACE="$WPA_ID_STR"
+	fi
+	
+	if [ -z "$WPA_LOGICAL_IFACE" ] && [ -n "$IF_WPA_MAPPING_SCRIPT" ]; then
+		local WPA_MAP_STDIN
+		
+		WPA_MAP_STDIN=$(set | sed -n 's/^\(IF_WPA_MAP[0-9]*\)=.*/echo \$\1/p')
+		
+		if [ -n "$WPA_MAP_STDIN" ]; then
+			WPA_LOGICAL_IFACE=$(eval "$WPA_MAP_STDIN" | "$IF_WPA_MAPPING_SCRIPT" "$WPA_IFACE")
+		else		
+			WPA_LOGICAL_IFACE=$("$IF_WPA_MAPPING_SCRIPT" "$WPA_IFACE")
+		fi
+		
+		if [ -n "$WPA_LOGICAL_IFACE" ]; then
+			wpa_msg log "mapping script result: $WPA_LOGICAL_IFACE"
+		else
+			wpa_msg log "mapping script failed."
+		fi
+	fi
+
+	if [ -z "$WPA_LOGICAL_IFACE" ]; then
+		if [ -n "$IF_WPA_ROAM_DEFAULT_IFACE" ]; then
+			WPA_LOGICAL_IFACE="$IF_WPA_ROAM_DEFAULT_IFACE"
+		else
+			WPA_LOGICAL_IFACE="default"
+		fi
+	fi
+
+	if [ -n "$WPA_LOGICAL_IFACE" ]; then
+		if egrep -q "^iface[[:space:]]+${WPA_LOGICAL_IFACE}[[:space:]]+inet" "$INTERFACES_FILE"; then
+			: # logical network is defined
+		else
+			wpa_msg log "network settings not defined for $WPA_LOGICAL_IFACE in $INTERFACES_FILE"
+			WPA_LOGICAL_IFACE="default"
+		fi
+
+		wpa_msg log "ifup $WPA_IFACE=$WPA_LOGICAL_IFACE"
+
+		ifupdown_lock
+
+		if [ -n "$IFSTATE_FILE" ] && grep -q "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
+			# Force settings over the unconfigured "master" IFACE
+			/sbin/ifup -v --force "$WPA_IFACE=$WPA_LOGICAL_IFACE"
+		else
+			/sbin/ifup -v "$WPA_IFACE=$WPA_LOGICAL_IFACE"
+		fi
+		IFUP_RETVAL="$?"
+
+		ifupdown_unlock
+	fi
+
+	wpa_msg log "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+	cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+
+	return "$IFUP_RETVAL"
+}
+
+#####################################################################
+## ifdown IFACE
+# Check IFACE state and ifdown as requested.
+#
+ifdown () {
+	wpa_msg log "ifdown $WPA_IFACE"
+
+	ifupdown_lock
+
+	/sbin/ifdown -v "$WPA_IFACE"
+
+	ifupdown_unlock
+
+	wpa_msg log "removing sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+	rm -f "$WPA_SUP_OMIT_PIDFILE"
+}
+
+#####################################################################
+## keep IFACE scanning
+# After ifdown, the IFACE may be left "down", and inhibits 
+# wpa_supplicant's ability to continue roaming.
+#
+# NB: use iproute if present, flushing the IFACE first
+#
+if_post_down_up () {
+	if [ -x /bin/ip ]; then
+		ip addr flush dev "$WPA_IFACE" 2>/dev/null
+		ip link set "$WPA_IFACE" up
+	else
+		ifconfig "$WPA_IFACE" up
+	fi
+}
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/ifupdown.sh b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/ifupdown.sh
new file mode 100644
index 0000000..9dab925
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/ifupdown.sh
@@ -0,0 +1,172 @@
+#!/bin/sh
+
+#####################################################################
+## Purpose
+# This file is executed by ifupdown in pre-up, post-up, pre-down and
+# post-down phases of network interface configuration. It allows
+# ifup(8), and ifdown(8) to manage wpa_supplicant(8) and wpa_cli(8)
+# processes running in daemon mode.
+#
+# /etc/wpa_supplicant/functions.sh is sourced by this file.
+#
+# This file is provided by the wpasupplicant package.
+
+#####################################################################
+# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers 
+# <pkg-wpa-devel@lists.alioth.debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# On Debian GNU/Linux systems, the text of the GPL license,
+# version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+if [ -n "$IF_WPA_MAINT_DEBUG" ]; then
+	set -x
+fi
+
+# quit if we're called for the loopback
+if [ "$IFACE" = lo ]; then
+	exit 0
+fi
+
+# allow wpa_supplicant interface to be specified via wpa-iface
+# useful for starting wpa_supplicant on one interface of a bridge
+if [ -n "$IF_WPA_IFACE" ]; then
+	WPA_IFACE="$IF_WPA_IFACE"
+else
+	WPA_IFACE="$IFACE"
+fi
+
+# source functions
+if [ -f /etc/wpa_supplicant/functions.sh ]; then
+	. /etc/wpa_supplicant/functions.sh
+else
+	exit 0
+fi
+
+# quit if executables are not installed
+if [ ! -x "$WPA_SUP_BIN" ] || [ ! -x "$WPA_CLI_BIN" ]; then
+	exit 0
+fi
+
+do_start () {
+	if test_wpa_cli; then
+		# if wpa_action is active for this IFACE, do nothing
+		ifupdown_locked && exit 0
+
+		# if the administrator is calling ifup, say something useful
+		if [ "$PHASE" = "pre-up" ]; then
+			wpa_msg stderr "wpa_action is managing ifup/ifdown state of $WPA_IFACE"
+			wpa_msg stderr "execute \`ifdown --force $WPA_IFACE' to stop wpa_action"
+		fi
+		exit 1
+	elif ! set | grep -q "^IF_WPA"; then
+		# no wpa- option defined for IFACE, do nothing
+		exit 0
+	fi
+
+	# ensure stale ifupdown_lock marker is purged
+	ifupdown_unlock
+
+	# preliminary sanity checks for roaming daemon
+	if [ -n "$IF_WPA_ROAM" ]; then
+		if [ "$METHOD" != "manual" ]; then
+			wpa_msg stderr "wpa-roam can only be used with the \"manual\" inet METHOD"
+			exit 1
+		fi
+		if [ -n "$IF_WPA_MAPPING_SCRIPT" ]; then
+			if ! type "$IF_WPA_MAPPING_SCRIPT" >/dev/null; then
+				wpa_msg stderr "wpa-mapping-script \"$IF_WPA_MAPPING_SCRIPT\" is not valid"
+				exit 1
+			fi
+		fi
+		if [ -n "$IF_WPA_MAPPING_SCRIPT_PRIORITY" ] && [ -z "$IF_WPA_MAPPING_SCRIPT" ]; then
+			wpa_msg stderr "\"wpa-mapping-script-priority 1\" is invalid without a wpa-mapping-script"
+			exit 1
+		fi
+		IF_WPA_CONF="$IF_WPA_ROAM"
+		WPA_ACTION_SCRIPT="/usr/sbin/wpa_action"
+	fi
+
+	# master function; determines if ifupdown.sh should do something or not
+	if [ -n "$IF_WPA_CONF" ] && [ "$IF_WPA_CONF" != "managed" ]; then
+		if [ ! -s "$IF_WPA_CONF" ]; then
+			wpa_msg stderr "cannot read contents of $IF_WPA_CONF"
+			exit 1
+		fi	
+		WPA_SUP_CONF_CTRL_DIR=$(sed -n -e 's/[[:space:]]*#.*//g' -e 's/[[:space:]]\+.*$//g' \
+			-e 's/^ctrl_interface=\(DIR=\)\?\(.*\)/\2/p' "$IF_WPA_CONF")
+		if [ -n "$WPA_SUP_CONF_CTRL_DIR" ]; then
+			WPA_CTRL_DIR="$WPA_SUP_CONF_CTRL_DIR"
+			WPA_SUP_CONF="-c $IF_WPA_CONF"
+		else
+			# specify the default ctrl_interface since none was defined in
+			# the given IF_WPA_CONF
+			WPA_SUP_CONF="-c $IF_WPA_CONF -C $WPA_CTRL_DIR"
+		fi
+	else
+		# specify the default ctrl_interface
+		WPA_SUP_CONF="-C $WPA_CTRL_DIR"
+	fi
+}
+
+do_stop () {
+	if test_wpa_cli; then
+		# if wpa_action is active for this IFACE and calling ifdown,
+		# do nothing
+		ifupdown_locked && exit 0
+	elif test_wpa_supplicant; then
+		# wpa_supplicant process exists for this IFACE, but wpa_cli
+		# process does not. Allow stop mode to kill this process.
+		:
+	else
+		exit 0
+	fi
+}
+
+case "$MODE" in 
+	start)
+		do_start
+		case "$PHASE" in
+			pre-up)
+				kill_wpa_supplicant
+				init_wpa_supplicant	|| exit 1
+				conf_wpa_supplicant 	|| { kill_wpa_supplicant; exit 1; }
+				;;
+			post-up)
+				init_wpa_cli 		|| { kill_wpa_supplicant; exit 1; }
+				;;
+		esac
+		;;
+
+	stop)
+		do_stop
+		case "$PHASE" in
+			pre-down)
+				kill_wpa_cli
+				;;
+			post-down)
+				kill_wpa_supplicant
+				;;
+			*)
+				wpa_msg stderr "unknown phase: \"$PHASE\""
+				exit 1
+				;;
+		esac
+		;;
+	
+	*)
+		wpa_msg stderr "unknown mode: \"$MODE\""
+		exit 1
+		;;
+esac
+
+exit 0
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action
new file mode 100644
index 0000000..7ef57ac
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers 
+# <pkg-wpa-devel@lists.alioth.debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# On Debian GNU/Linux systems, the text of the GPL license,
+# version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+if [ -n "$IF_WPA_ROAM_MAINT_DEBUG" ]; then
+	set -x
+fi
+
+if [ -z "$1" ] || [ -z "$2" ]; then
+	echo "Usage: $0 IFACE ACTION"
+	exit 1
+fi
+
+# network interface
+WPA_IFACE="$1"
+# [CONNECTED|DISCONNECTED|stop|reload|check]
+WPA_ACTION="$2"
+
+if [ -f /etc/wpa_supplicant/functions.sh ]; then
+	. /etc/wpa_supplicant/functions.sh
+else
+	exit 0
+fi
+
+case "$WPA_ACTION" in
+	"CONNECTED")
+		wpa_log_env
+		wpa_hysteresis_check || exit 1
+		wpa_hysteresis_event
+		if ifup; then
+			wpa_cli status | wpa_msg log
+		else
+			wpa_cli status | wpa_msg log
+			wpa_cli reassociate
+		fi
+		;;
+
+	"DISCONNECTED")
+		wpa_log_env
+		wpa_hysteresis_check || exit 1
+		ifdown
+		if_post_down_up
+		;;
+
+	"stop"|"down")
+		test_wpa_cli && kill_wpa_cli
+		ifdown
+		test_wpa_supplicant && kill_wpa_supplicant
+		;;
+
+	"restart"|"reload")
+		test_wpa_supplicant || exit 1
+		reload_wpa_supplicant
+		;;
+	
+	"check")
+		test_wpa_supplicant || exit 1
+		test_wpa_cli || exit 1
+		;;
+
+	*)
+		echo "Unknown action: \"$WPA_ACTION\""
+		exit 1
+		;;
+esac
+
+exit 0
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action.8 b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action.8
new file mode 100644
index 0000000..e8f1b28
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action.8
@@ -0,0 +1,148 @@
+.TH WPA_ACTION "8" "26 May 2006" "" ""
+.SH NAME
+wpa_action \- wpa_cli action script
+.SH SYNOPSIS
+\fBwpa_action\fR \fIIFACE ACTION\fR
+.SH "DESCRIPTION"
+\fBwpa_action\fR is a shell script designed to control the \fBifupdown\fR
+framework according to \fIACTION\fR events received from \fBwpa_supplicant\fR.
+\fBwpa_cli\fR receives \fICONNECTED\fR and \fIDISCONNECTED\fR events from
+\fBwpa_supplicant\fR via the crtl_iface socket and gives the \fIACTION\fR event
+to the \fBwpa_action\fR script as an argument, along with the \fIIFACE\fR to be
+acted upon.
+.PP
+\fBwpa_action\fR also receives an environment variable from \fBwpa_cli\fR,
+\fIWPA_ID_STR\fR, containing an alphanumeric identification string for the
+\fICURRENT\fR network block. \fIWPA_ID_STR\fR is provided by the 'id_str'
+network block option of \fBwpa_supplicant.conf\fR, and provides a means to map
+the \fIACTION\fR to a \fILOGICAL\fR interface configured in the \fBinterfaces\fR
+file.
+.PP
+If either the ifupdown \fBinterfaces\fR or \fIifstate\fR file cannot be found,
+\fBwpa_action\fR will exit silently (status 0). \fBwpa_action\fR will search
+the following locations for their existance:
+.nf
+	/etc/network/run/ifstate
+	/var/run/network/ifstate
+	/etc/network/interfaces
+.fi
+.PP
+.SH IFACE
+Network interface to be acted upon, for example 'eth1' or 'wlan0'.
+.SH ACTION
+An \fIACTION\fR to be performed on the \fIIFACE\fR.
+.TP
+\fBCONNECTED\fR
+\fBwpa_supplicant\fR has completed authentication.
+\fBifup\fR \fIIFACE=WPA_ID_STR\fR is invoked and the action is logged to
+syslog. Network settings for the \fILOGICAL\fR interface \fIWPA_ID_STR\fR
+are applied.
+.TP
+\fBDISCONNECTED\fR
+\fBwpa_supplicant\fR has detected disconnection.
+\fBifdown\fR \fIIFACE=WPA_ID_STR\fR is invoked and the action is logged to
+syslog. Network settings for the \fILOGICAL\fR interface \fIWPA_ID_STR\fR
+are undone.
+.TP
+\fBstop\fR
+The 'stop' \fIACTION\fR is a called manually by the user, to stop the 
+\fBwpa_cli\fR daemon, invoke \fBifdown\fR \fIIFACE\fR (if the \fIIFACE\fR is
+present in the \fIifstate\fR file) and stop the \fBwpa_supplicant\fR daemon.
+.TP
+\fBreload\fR
+The 'reload' \fIACTION\fR can be used to reload the \fBwpa_supplicant\fR
+configuration file specified by \fIwpa-roam\fR . 'restart' is a synonym 
+for 'reload' and can be used equally. The action is logged to
+\fI/var/log/wpa_action.log\fR.
+.SH ENVIRONMENT
+An alphanumeric identification string provided by the 'id_str' network block
+option of \fBwpa_supplicant.conf\fR is exported to \fBwpa_action\fR as an 
+environment variable, \fIWPA_ID_STR\fR. When 'id_str' is not configured for the
+\fICURRENT\fR network block, 'default' is substituted for the absent
+\fIWPA_ID_STR\fR environment variable.
+.PP
+A unique network identifier, \fIWPA_ID\fR, is exported to \fBwpa_action\fR. It
+is the number assigned to the \fICURRENT\fR \fBwpa_supplicant\fR network block
+(network_id).
+.SH USAGE
+The only reasons for \fBwpa_action\fR to be explicitly executed by the user is
+to stop \fBwpa_cli\fR from controlling \fBifupdown\fR or reload the 
+\fIwpa_supplicant.conf\fR file after editing.
+.PP
+.RS
+\fBwpa_action\fR \fIeth1 stop\fR
+.RE
+.PP
+Otherwise, \fBwpa_action\fR is given as an argument to a \fBwpa_cli\fR
+daemon.
+.PP
+.RS
+\fBwpa_cli\fR \fI-i eth1 -a /sbin/wpa_action -B\fR
+.RE
+.PP
+This can be done by using the \fIwpa-roam\fR option in the \fBinterfaces\fR
+file. \fIwpa-roam\fR takes one argument, a user provided 
+\fBwpa_supplicant.conf\fR file. 
+.PP
+The inet \fIMETHOD\fR must be 'manual' for this interface, as it will
+be configured according to \fBwpa_cli\fR action events. Also supply a 'default'
+\fBinterfaces\fR stanza using the dhcp inet \fIMETHOD\fR so that networks
+without an 'id_str' option can fallback to attempting to receive an ip via
+dhcp. If one or more networks requires additional network configuration,
+provide an unique 'id_str' for each network, and an \fBinterfaces\fR stanza
+using the 'id_str' value as a \fILOGICAL\fR interface. The following interfaces
+file is configured to use dhcp for any network without an 'id_str', a static ip
+for the network with an 'id_str' of 'home_static' and dhcp plus an additional
+post-up command for the network with an 'id_str' of 'uni'.
+.PP
+An example wpa_supplicant.conf configured to roam between 3 different networks:
+.PP
+.RS
+.nf
+network={
+	ssid="foo"
+	id_str="uni"
+	key_mgmt=NONE
+}
+
+network={
+	ssid="bar"
+	id_str="home_static"
+	psk=123456789...
+}
+
+network={
+	ssid=""
+	key_mgmt=NONE
+}
+.fi
+.RE
+.PP
+The corresponding \fBinterfaces\fR file would contain \fILOGICAL\fR interfaces,
+that correlate to each unique 'id_str' provided by the configuration file:
+.PP
+.RS
+.nf
+iface eth1 inet manual
+	wpa-driver wext
+	wpa-roam /etc/wpa_supplicant/wpa_supplicant.conf
+
+iface default inet dhcp
+
+iface uni inet dhcp
+
+iface home_static inet static
+        address 192.168.0.20
+        netmask 255.255.255.0
+        network 192.168.0.0
+        broadcast 192.168.0.255
+        gateway 192.168.0.1
+.fi
+.RE
+.PP
+.SH SEE ALSO
+\fBwpa_cli(8)\fR, \fBwpa_supplicant(8)\fR, \fBwpa_supplicant.conf(5)\fR,
+\fBifup(8)\fR, \fBinterfaces(5)\fR
+.SH AUTHOR
+This manual page was written by Kel Modderman <kel@otaku42.de> for
+the Debian GNU system (but may be used by others).
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bbappend b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bbappend
deleted file mode 100644
index 8ad898b..0000000
--- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bbappend
+++ /dev/null
@@ -1,40 +0,0 @@
-DEPENDS += "openssl"
-PR .= "-vuplus0"
-
-SRC_URI += " \
-        file://action_wpa.sh \
-        file://functions.sh \
-        file://ifupdown.sh \
-        file://wpa_action \
-        file://wpa_action.8 \
-"
-
-do_configure_append() {
-        sed -e '/^CONFIG_TLS = gnutls/d' -i .config
-        echo "CONFIG_DEBUG_SYSLOG=y" >> .config
-}
-do_install_append() {
-        rm -rf ${D}${sysconfdir}/network/if-*.d
-
-        install -d ${D}${sysconfdir}/wpa_supplicant
-        install -m 755 ${WORKDIR}/action_wpa.sh ${D}${sysconfdir}/wpa_supplicant
-        install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant
-        install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant
-
-        install -d ${D}${sbindir}
-        install -m 755 ${WORKDIR}/wpa_action ${D}${sbindir}
-
-        install -d ${D}${mandir}/man8
-        install -m 755 ${WORKDIR}/wpa_action.8 ${D}${mandir}/man8
-
-        install -d ${D}${sysconfdir}/network/if-down.d
-        install -d ${D}${sysconfdir}/network/if-post-down.d
-        install -d ${D}${sysconfdir}/network/if-pre-up.d
-        install -d ${D}${sysconfdir}/network/if-up.d
-        ln -s ../../wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-down.d/${PN}
-        ln -s ../../wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/${PN}
-        ln -s ../../wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/${PN}
-        ln -s ../../wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-up.d/${PN}
-}
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bbappend b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bbappend
new file mode 100644
index 0000000..8920c9b
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bbappend
@@ -0,0 +1,40 @@
+DEPENDS += "openssl"
+PR .= "-vuplus0"
+
+SRC_URI += " \
+        file://action_wpa.sh \
+        file://functions.sh \
+        file://ifupdown.sh \
+        file://wpa_action \
+        file://wpa_action.8 \
+"
+
+do_configure_append() {
+        sed -e '/^CONFIG_TLS = gnutls/d' -i wpa_supplicant/.config
+        echo "CONFIG_DEBUG_SYSLOG=y" >> wpa_supplicant/.config
+}
+do_install_append() {
+        rm -rf ${D}${sysconfdir}/network/if-*.d
+
+        install -d ${D}${sysconfdir}/wpa_supplicant
+        install -m 755 ${WORKDIR}/action_wpa.sh ${D}${sysconfdir}/wpa_supplicant
+        install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant
+        install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant
+
+        install -d ${D}${sbindir}
+        install -m 755 ${WORKDIR}/wpa_action ${D}${sbindir}
+
+        install -d ${D}${mandir}/man8
+        install -m 755 ${WORKDIR}/wpa_action.8 ${D}${mandir}/man8
+
+        install -d ${D}${sysconfdir}/network/if-down.d
+        install -d ${D}${sysconfdir}/network/if-post-down.d
+        install -d ${D}${sysconfdir}/network/if-pre-up.d
+        install -d ${D}${sysconfdir}/network/if-up.d
+        ln -s ../../wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-down.d/${PN}
+        ln -s ../../wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/${PN}
+        ln -s ../../wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/${PN}
+        ln -s ../../wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-up.d/${PN}
+}
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"