rpms/wpa_supplicant/F-8 wpa_supplicant.logrotate, NONE, 1.1 wpa_supplicant.init.d, 1.4, 1.5 wpa_supplicant.spec, 1.38, 1.39 wpa_supplicant.sysconfig, 1.4, 1.5

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4084

Modified Files:
	wpa_supplicant.init.d wpa_supplicant.spec 
	wpa_supplicant.sysconfig 
Added Files:
	wpa_supplicant.logrotate 
Log Message:
* Mon Dec  3 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-18
- Add logrotate config file (rh #404181)
- Add new LSB initscript header to initscript with correct deps (rh #244029)
- Move other runtime arguments to /etc/sysconfig/wpa_supplicant




--- NEW FILE wpa_supplicant.logrotate ---
/var/log/wpa_supplicant.log {
    missingok
    notifempty
    size 30k
    create 0600 root root
}


Index: wpa_supplicant.init.d
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.init.d,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wpa_supplicant.init.d	15 Nov 2007 20:46:08 -0000	1.4
+++ wpa_supplicant.init.d	3 Dec 2007 19:03:45 -0000	1.5
@@ -11,6 +11,15 @@
 # processname: wpa_supplicant
 # config:      /etc/wpa_supplicant/wpa_supplicant.conf
 #
+### BEGIN INIT INFO
+# Provides: wpa_supplicant
+# Required-Start: $local_fs $messagebus
+# Required-Stop: $local_fs $messagebus
+# Default-Start:  3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop wpa_supplicant
+# Description: wpa_supplicant is a tool for connecting to wireless networks
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -27,7 +36,7 @@
 
 start() {
  	echo -n $"Starting $prog: $conf, $INTERFACES, $DRIVERS"
-	daemon $prog -c $conf $INTERFACES $DRIVERS -B -u -f
+	daemon $prog -c $conf $INTERFACES $DRIVERS -B $OTHER_ARGS
 	retval=$?
 	echo
 	[ $retval -eq 0 ] && touch $lockfile


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wpa_supplicant.spec	15 Nov 2007 20:46:08 -0000	1.38
+++ wpa_supplicant.spec	3 Dec 2007 19:03:45 -0000	1.39
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.5.7
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Source4: %{name}.sysconfig
 Source5: madwifi-headers-r1475.tar.bz2
 Source6: fi.epitest.hostap.WPASupplicant.service
+Source7: %{name}.logrotate
 Patch0: wpa_supplicant-assoc-timeout.patch
 Patch1: wpa_supplicant-driver-wext-debug.patch
 Patch2: wpa_supplicant-wep-key-fix.patch
@@ -86,6 +87,8 @@
 install -d %{buildroot}/%{_sysconfdir}/sysconfig
 install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/rc.d/init.d/%{name}
 install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
+install -d %{buildroot}/%{_sysconfdir}/logrotate.d
+install -m 0644 %{SOURCE7} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
 # config
 install -d %{buildroot}/%{_sysconfdir}/%{name}
@@ -138,6 +141,7 @@
 %doc COPYING ChangeLog README eap_testing.txt todo.txt wpa_supplicant.conf examples
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_sysconfdir}/rc.d/init.d/%{name}
 %{_sysconfdir}/dbus-1/system.d/%{name}.conf
 %{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
@@ -154,6 +158,11 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Mon Dec  3 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-18
+- Add logrotate config file (rh #404181)
+- Add new LSB initscript header to initscript with correct deps (rh #244029)
+- Move other runtime arguments to /etc/sysconfig/wpa_supplicant
+
 * Thu Nov 15 2007 Dan Williams <dcbw at redhat.com> - 0.5.7-17
 - Start after messagebus service (rh #385191)
 - Fix initscript 'condrestart' command (rh #217281)


Index: wpa_supplicant.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/F-8/wpa_supplicant.sysconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wpa_supplicant.sysconfig	3 Dec 2007 18:48:25 -0000	1.4
+++ wpa_supplicant.sysconfig	3 Dec 2007 19:03:45 -0000	1.5
@@ -5,3 +5,8 @@
 # Use the flag "-D" before each driver, like so:
 #  DRIVERS="-Dwext"
 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"