rpms/memcached/EL-4 memcached.spec,1.4,1.5 memcached.sysv,1.2,1.3

[Paul Lindner]

Author: plindner

Update of /cvs/pkgs/rpms/memcached/EL-4
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18837

Modified Files:
	memcached.spec memcached.sysv 
Log Message:
Patch from Remi Collet to fix pidfile problems observed on EL-4



Index: memcached.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/EL-4/memcached.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- memcached.spec	13 Aug 2009 20:32:41 -0000	1.4
+++ memcached.spec	15 Jun 2010 16:25:12 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           memcached
 Version:        1.2.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
 Group:          System Environment/Daemons
@@ -109,6 +109,9 @@ exit 0
 
 
 %changelog
+* Tue Jun 15 2010 Paul Lindner <lindner at inuus.com> - 1.2.8-2
+- Patch from Remi Collet - EL-4 does not have pidfile params
+
 * Thu Aug 13 2009 Paul Lindner <lindner at mirth.inuus.com> - 1.2.8-1
 - Fix init script for EL-4, patch from Ingvar Hagelund
 


Index: memcached.sysv
===================================================================
RCS file: /cvs/pkgs/rpms/memcached/EL-4/memcached.sysv,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- memcached.sysv	3 Oct 2007 18:45:44 -0000	1.2
+++ memcached.sysv	15 Jun 2010 16:25:12 -0000	1.3
@@ -35,19 +35,19 @@ start () {
 	# insure that /var/run/memcached has proper permissions
         chown $USER /var/run/memcached
 
-	daemon --pidfile /var/run/memcached/memcached.pid memcached -d -p $PORT -u $USER  -m $CACHESIZE -c $MAXCONN -P /var/run/memcached/memcached.pid $OPTIONS
+	daemon memcached -d -p $PORT -u $USER  -m $CACHESIZE -c $MAXCONN -P /var/run/memcached/memcached.pid $OPTIONS
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/memcached
 }
 stop () {
 	echo -n $"Stopping $prog: "
-	killproc -p /var/run/memcached/memcached.pid /usr/bin/memcached
+	killproc /usr/bin/memcached
 	RETVAL=$?
 	echo
 	if [ $RETVAL -eq 0 ] ; then
 	    rm -f /var/lock/subsys/memcached
-	    rm -f /var/run/memcached.pid
+	    rm -f /var/run/memcached/memcached.pid
 	fi
 }