Fixing bug #293443

Package-Manager: portage-2.2_rc44/cvs/Linux i686

5 files changed, 95 insertions, 7 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 6ffa6397ee18..8aba1319b0e9 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.124 2009/10/06 17:34:11 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.125 2009/11/21 12:03:21 gurligebis Exp $
+
+  21 Nov 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  wpa_supplicant-0.6.9.ebuild, +files/wpa_supplicant-conf.d,
+  +files/wpa_supplicant-init.d:
+  Adding init script and conf.d file, fixing bug #293443
 
   06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org>
   wpa_supplicant-0.6.4.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 48f177ae53b3..ee739b3b590c 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -6,18 +6,20 @@ AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f7
 AUX wpa_supplicant-0.5.10-gcc-4.3.patch 1362 RMD160 2d3e8ee4cdda932e83127203db261e8fdcb5754d SHA1 f676db4ff6938b043e654e876c8976223b181b7d SHA256 e71a75a2a16741598d7f4588537e147271e960c1d0f9991ce9e0734850ef9944
 AUX wpa_supplicant-0.5.7-gnutls.patch 375 RMD160 b8868a503a71d2cc4ebd4826430654c3a6645ec0 SHA1 fdfa5fefc507fa133f7d41a7ca75c33b14d876f7 SHA256 7d4a2a6f70fd18757e139ca1d1dc2734fe854ea1879d62d378febce49feef3aa
 AUX wpa_supplicant-0.6.3-ps3_support.patch 10930 RMD160 e572a6c024e8f8b845fd404c775813e4f65b4de5 SHA1 88f804078bb25ebc0630b2dd5a5133126d24f7ba SHA256 b4b2082a4cd25c0fd23a783d2d8d55985a1acc44e30a9c6757e6252c4405711a
+AUX wpa_supplicant-conf.d 161 RMD160 8188ddf3448d31c6288d4201cc9d10d0c4ac3ee3 SHA1 c0ca31e2ddb9b2b5cbafc3eba66316e83688b808 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90
+AUX wpa_supplicant-init.d 1249 RMD160 b91b304a2913ce47f04c625e01e5cc504922cf0f SHA1 0e158f5954e4046af3bc157a1c85aab4bbcc71cb SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0
 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a
 DIST wpa_supplicant-0.6.4.tar.gz 995486 RMD160 338b901726779a47cb3c3cb43b11d3d38af3fe7d SHA1 c17a992bdcbe0d2427f0968c5a921e54cf28306f SHA256 0c10e59dd079c4e5d9ec6eebe9a8ac0e1b9e472cccef49c705f87a78391e79fa
 DIST wpa_supplicant-0.6.9.tar.gz 1178238 RMD160 e8427935b17c354c2654250501236dcd3f239307 SHA1 3764f7bda4e5c87caac2b9e134cb59996f073f09 SHA256 6e5284fa3f7c56e001fae92486eaa31340db5dd925dcb38bd572d2e8ed70f570
 EBUILD wpa_supplicant-0.6.4.ebuild 6465 RMD160 24e22e1c3f51df2c9edca1f4186d6c93704ccf84 SHA1 d190555fd05a1fbf591a54d9b3e50c8c551beee0 SHA256 56e3782f15e48c4315be606329383bec49d56084a3fe18dc175972fdd9eb9c88
-EBUILD wpa_supplicant-0.6.9.ebuild 7052 RMD160 3687ab6ad511288e3e5c3881843e18b0a26d137b SHA1 614f528c7647d33c79f8a983007dcbe998b57576 SHA256 4fb07e0fde96f0749693c60d129ce7ebfd50525d6af3bb46def9ad13a87544b8
+EBUILD wpa_supplicant-0.6.9.ebuild 7211 RMD160 23e79b285214864ac67a52887d035fc6c5ce5449 SHA1 5abae798141667e8197d6eedbda6c88afdbe5109 SHA256 52e61e1616a47c3799700db4229f65222bac7cd6b7114e425e5ff55a292594c9
 EBUILD wpa_supplicant-9999.ebuild 7581 RMD160 b988d4b5427c8b5b3c8716d76f07a857685b6aa5 SHA1 908209ae2fe0bf625d84c32f0575063e2eca02b2 SHA256 e35822c796849541ed403f4ca6b9487f3d2bcb28347087c3db975222e3d707d7
-MISC ChangeLog 26720 RMD160 e2f5e6d9c989d11d9b3f425bd80c3df975cd620f SHA1 3b3b8ede737830d945aca15cee7ab94ab0175e67 SHA256 8fd4dd21d98c11b5922175131a86e77a9fbaa00a2465bd2a89f0885cc9840ce4
+MISC ChangeLog 26939 RMD160 cbab11c6f3d4c3f1cfdb484d48947db95385320b SHA1 84c01114ed81e0e52cb09e260f69331adc262d2d SHA256 e6dd948bff18aa6f6eb1c5a6032537b2beb66112ddeba7e8827e3aedcae7ac4e
 MISC metadata.xml 571 RMD160 71dd26fb78e0841fdf8094e70f69ed8f3467767f SHA1 d506d908102c64873349b144915070b19bdd5fda SHA256 d51b505588babd99225c67330dcb85a438c3739e8aa56c2b65c14a91a46aa4fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrLf5sACgkQ+CZEqwt+F6YMhACfZ4AJENxuODptFA/Cpntj0p++
-0iYAnAw7fJPwGKBfpicKNkCNTRqETscg
-=vO5T
+iEYEARECAAYFAksH1x0ACgkQsR7PQhRXYEm/9wCfah7a6SMNMcPJl9CE8H1fQYtZ
+BbMAnRmy0IDoMEY4sdVWkR0kV8Fh/kie
+=9fYt
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d
new file mode 100644
index 000000000000..104b9dc5d8c3
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d
@@ -0,0 +1,6 @@
+# conf.d file for wpa_supplicant
+#
+# Please check man 8 wpa_supplicant for more information about the options
+# wpa_supplicant accepts.
+#
+wpa_supplicant_args=""
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d
new file mode 100644
index 000000000000..8429a3733840
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d
@@ -0,0 +1,70 @@
+#!/sbin/runscript
+# Copyright (c) 2009 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
+
+command=/usr/sbin/wpa_supplicant
+: ${wpa_supplicant_conf:=/etc/wpa_supplicant/wpa_supplicant.conf}
+wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if
+command_args="$wpa_supplicant_args -B -c$wpa_supplicant_conf $wpa_supplicant_if"
+name="WPA Supplicant Daemon"
+
+depend()
+{
+	need localmount
+	use logger
+	after bootmisc modules
+	before dns dhcpcd net
+	keyword -shutdown
+}
+
+find_wireless()
+{
+	local iface=
+
+	case "$RC_UNAME" in
+	Linux)
+		for iface in /sys/class/net/*; do
+			if [ -e "$iface"/wireless -o \
+				-e "$iface"/phy80211 ]
+			then
+				echo "${iface##*/}"
+				return 0
+			fi
+		done
+		;;
+	*)
+		for iface in /dev/net/* $(ifconfig -l 2>/dev/null); do
+			if ifconfig "${iface##*/}" 2>/dev/null | \
+				grep -q "[ ]*ssid "
+			then
+				echo "${iface##*/}"
+				return 0
+			fi
+		done
+		;;
+	esac
+	
+	return 1
+}
+
+append_wireless()
+{
+	local iface= i=
+
+	iface=$(find_wireless)
+	if [ -n "$iface" ]; then
+		for i in $iface; do
+			command_args="$command_args -i$i"
+		done
+	else
+		eerror "Could not find a wireless interface"
+	fi
+}
+
+start_pre()
+{
+	case " $command_args" in
+	*" -i"*) ;;
+	*) append_wireless;;
+	esac
+}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
index add9c285a5cc..79b2403f454b 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.6.9.ebuild,v 1.7 2009/07/24 16:42:43 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild,v 1.8 2009/11/21 12:03:21 gurligebis Exp $
 
 EAPI="2"
 
@@ -190,6 +190,11 @@ src_install() {
 		dosym /usr/bin/wpa_cli /bin/wpa_cli || die
 	fi
 
+	if has_version ">=sys-apps/openrc-0.5.0"; then
+		newinitd "$FILESDIR"/${PN}-init.d wpa_supplicant
+		newconfd "$FILESDIR"/${PN}-conf.d wpa_supplicant
+	fi
+
 	exeinto /etc/wpa_supplicant/
 	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh