rpms/wpa_supplicant/F-11 wpa_supplicant-0.5.10-dbus-service-file.patch, 1.1, 1.2 wpa_supplicant.spec, 1.59, 1.60 wpa_supplicant.sysconfig, 1.5, 1.6

[Daniel Williams]

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32484

Modified Files:
	wpa_supplicant-0.5.10-dbus-service-file.patch 
	wpa_supplicant.spec wpa_supplicant.sysconfig 
Log Message:
* Sun Nov 29 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.8-6
- Fix supplicant initscript return value (rh #521807)



wpa_supplicant-0.5.10-dbus-service-file.patch:
 dbus-wpa_supplicant.service |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: wpa_supplicant-0.5.10-dbus-service-file.patch
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-11/wpa_supplicant-0.5.10-dbus-service-file.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- wpa_supplicant-0.5.10-dbus-service-file.patch	3 Mar 2008 17:20:11 -0000	1.1
+++ wpa_supplicant-0.5.10-dbus-service-file.patch	29 Nov 2009 22:31:58 -0000	1.2
@@ -5,5 +5,5 @@ diff -up wpa_supplicant-0.6.3/wpa_suppli
  [D-BUS Service]
  Name=fi.epitest.hostap.WPASupplicant
 -Exec=/sbin/wpa_supplicant -u
-+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -u -f /var/log/wpa_supplicant.log
++Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B -u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid
  User=root


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-11/wpa_supplicant.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- wpa_supplicant.spec	29 Nov 2009 22:08:41 -0000	1.59
+++ wpa_supplicant.spec	29 Nov 2009 22:31:58 -0000	1.60
@@ -2,7 +2,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.6.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -153,8 +153,11 @@ fi
 %{_bindir}/wpa_gui
 
 %changelog
+* Sun Nov 29 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.8-6
+- Fix supplicant initscript return value (rh #521807)
+
 * Sun Nov 29 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.8-5
-- Fix race when connecting to WPA-Enterprise/802.1x-enabled access points
+- Fix race when connecting to WPA-Enterprise/802.1x-enabled access points (rh #508509)
 - Don't double-scan when attempting to associate
 
 * Wed May 13 2009 Dan Williams <dcbw at redhat.com> - 1:0.6.8-4


Index: wpa_supplicant.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-11/wpa_supplicant.sysconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- wpa_supplicant.sysconfig	8 Mar 2008 20:09:35 -0000	1.5
+++ wpa_supplicant.sysconfig	29 Nov 2009 22:31:59 -0000	1.6
@@ -9,4 +9,8 @@ DRIVERS=""
 # Other arguments
 #   -u   Enable the D-Bus interface (required for use with NetworkManager)
 #   -f   Log to /var/log/wpa_supplicant.log
-OTHER_ARGS="-u -f /var/log/wpa_supplicant.log"
+#   -P   Write pid file to /var/run/wpa_supplicant.pid 
+#        required to return proper codes by init scripts (e.g. double "start" action)
+#        -B to daemonize that has to be used together with -P is already in wpa_supplicant.init.d
+OTHER_ARGS="-u -f /var/log/wpa_supplicant.log -P /var/run/wpa_supplicant.pid"
+