packages: wicd/wicd.spec, wicd/wicd-init_status.patch (NEW) - fix daemon st...

[cactus]

Author: cactus                       Date: Thu Aug 20 21:03:56 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix daemon status and stop - send this patch upstream

---- Files affected:
packages/wicd:
   wicd.spec (1.24 -> 1.25) , wicd-init_status.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/wicd/wicd.spec
diff -u packages/wicd/wicd.spec:1.24 packages/wicd/wicd.spec:1.25
--- packages/wicd/wicd.spec:1.24	Tue Mar 17 09:24:50 2009
+++ packages/wicd/wicd.spec	Thu Aug 20 23:03:51 2009
@@ -1,15 +1,15 @@
 # $Revision$, $Date$
-# TODO: Fix daemon status and stop (wicd dead but subsys locked but daemon running)
 # TODO: Fix files list
 Summary:	wired and wireless network manager
 Summary(pl.UTF-8):	Zarządca sieci przewodowych i bezprzewodowych
 Name:		wicd
 Version:	1.5.9
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/wicd/%{name}-%{version}.tar.gz
 # Source0-md5:	4743a30eb8e3898b8b1a319b0c373ce5
+Patch0:		%{name}-init_status.patch
 URL:		http://wicd.net/
 # /etc/pld-release used to detect platform
 BuildRequires:	issue
@@ -37,6 +37,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+
 %{__python} setup.py configure \
 	--pidfile /var/run/wicd.pid
 
@@ -128,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2009/08/20 21:03:51  cactus
+- fix daemon status and stop - send this patch upstream
+
 Revision 1.24  2009/03/17 08:24:50  dzeus
 - up to 1.5.9
 

================================================================
Index: packages/wicd/wicd-init_status.patch
diff -u /dev/null packages/wicd/wicd-init_status.patch:1.1
--- /dev/null	Thu Aug 20 23:03:56 2009
+++ packages/wicd/wicd-init_status.patch	Thu Aug 20 23:03:51 2009
@@ -0,0 +1,54 @@
+--- wicd-1.5.9/in/init=pld=wicd.in.orig	2009-02-06 16:28:22.000000000 +0100
++++ wicd-1.5.9/in/init=pld=wicd.in	2009-08-20 22:48:55.000000000 +0200
+@@ -20,26 +20,28 @@
+ # [ -f /etc/sysconfig/wicd ] && . /etc/sysconfig/wicd
+ 
+ WICD_BIN=%SBIN%wicd
++WICD_PIDFILE=%PIDFILE%
++WICD_LOCKFILE=/var/lock/subsys/wicd
+ 
+ start() {
+ 	# Check if the service is already running?
+-	if [ ! -f /var/lock/subsys/wicd ]; then
++	if [ ! -f $WICD_LOCKFILE ]; then
+ 		msg_starting wicd
+ 		daemon $WICD_BIN
+ 		RETVAL=$?
+-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/wicd
++		[ $RETVAL -eq 0 ] && touch $WICD_LOCKFILE
+ 	else
+ 		msg_already_running wicd
+ 	fi
+ }
+ 
+ stop() {
+-	if [ -f /var/lock/subsys/wicd ]; then
++	if [ -f $WICD_LOCKFILE ]; then
+ 		# Stop daemons.
+ 		msg_stopping wicd
+ 		# killproc wicd
+-		killproc --pidfile /var/run/wicd.pid wicd -TERM
+-		rm -f /var/lock/subsys/wicd
++		killproc --pidfile $WICD_PIDFILE wicd -TERM
++		rm -f $WICD_LOCKFILE
+ 	else
+ 		msg_not_running wicd
+ 	fi
+@@ -47,7 +49,7 @@
+ 
+ 
+ condrestart() {
+-	if [ -f /var/lock/subsys/wicd ]; then
++	if [ -f $WICD_LOCKFILE ]; then
+ 		stop
+ 		start
+ 	else
+@@ -77,7 +79,7 @@
+ 	condrestart 7
+ 	;;
+   status)
+-	status wicd
++	status --pidfile $WICD_PIDFILE wicd
+ 	RETVAL=$?
+ 	;;
+   *)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wicd/wicd.spec?r1=1.24&r2=1.25&f=u