summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2011-07-08 07:06:21 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2011-07-08 07:06:21 +0000
commit82442751419f44889c31bd1c0af85ecc7d5a4abb (patch)
treedbccd2b66eb0ed53023ff52f7c97c8065065692c /net-wireless
parentVersion bump. Remove intermediate version. (diff)
downloadgentoo-2-82442751419f44889c31bd1c0af85ecc7d5a4abb.tar.gz
gentoo-2-82442751419f44889c31bd1c0af85ecc7d5a4abb.tar.bz2
gentoo-2-82442751419f44889c31bd1c0af85ecc7d5a4abb.zip
Now #373921 should be fixed
(Portage version: 2.2.0_alpha43/cvs/Linux i686)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/wpa_supplicant/ChangeLog8
-rw-r--r--net-wireless/wpa_supplicant/files/wpa_cli.sh11
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild (renamed from net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild)2
3 files changed, 14 insertions, 7 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index bdf14d397f07..09a22e153db4 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-wireless/wpa_supplicant
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.160 2011/07/07 07:54:54 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.161 2011/07/08 07:06:21 gurligebis Exp $
+
+*wpa_supplicant-0.7.3-r5 (08 Jul 2011)
+
+ 08 Jul 2011; <gurligebis@gentoo.org> -wpa_supplicant-0.7.3-r4.ebuild,
+ +wpa_supplicant-0.7.3-r5.ebuild, files/wpa_cli.sh:
+ Another go at bug #373921
*wpa_supplicant-0.7.3-r4 (07 Jul 2011)
diff --git a/net-wireless/wpa_supplicant/files/wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_cli.sh
index 4b1da4307ca5..4fd0d2cdaa28 100644
--- a/net-wireless/wpa_supplicant/files/wpa_cli.sh
+++ b/net-wireless/wpa_supplicant/files/wpa_cli.sh
@@ -3,7 +3,7 @@
# 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.2 2011/07/07 07:54:55 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v 1.3 2011/07/08 07:06:21 gurligebis Exp $
if [ -z "$1" -o -z "$2" ]; then
logger -t wpa_cli "Insufficient parameters"
@@ -29,7 +29,9 @@ case ${ACTION} in
EXEC="${EXEC} start"
;;
DISCONNECTED)
- EXEC="${EXEC} stop"
+ # Deactivated, since stopping /etc/init.d/net.wlanX
+ # stops the network completly.
+ EXEC="false ${EXEC} stop"
;;
*)
logger -t wpa_cli "Unknown action ${ACTION}"
@@ -41,6 +43,5 @@ esac
# stopping the interface and a background process - like wpa_cli - is.
export IN_BACKGROUND=true
-# Removed, since stopping /etc/init.d/net.wlanX stops the network completly.
-#logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"
-#${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"
+logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"
+${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild
index 49ae8d88a996..9d495dd750fd 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.7.3-r4.ebuild,v 1.1 2011/07/07 07:54:54 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild,v 1.1 2011/07/08 07:06:21 gurligebis Exp $
EAPI="2"