rpms/3proxy/devel 3proxy.init,1.3,1.4 3proxy.spec,1.4,1.5

[Pavel Alexeev]

Author: hubbitus

Update of /cvs/pkgs/rpms/3proxy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25496

Modified Files:
	3proxy.init 3proxy.spec 
Log Message:
- Again new init-script for Fix BZ#533144 :).




Index: 3proxy.init
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/3proxy.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 3proxy.init	24 Nov 2009 23:24:56 -0000	1.3
+++ 3proxy.init	28 Nov 2009 14:07:53 -0000	1.4
@@ -4,14 +4,13 @@
 #
 # Written by Dag Wieers <dag at wieers.com>.
 # Rewrote for ALT Linux by Pavlov Konstantin <thresh at altlinux.ru>
-# Modified for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan at hubbitus.info>
+# Modifyed for Fedora by Pavel Alexeev aka Pahan-Hubbitus <Pahan at hubbitus.info>
 #
 # chkconfig: - 02 98
 # description: 3proxy Proxy Server
 #
 # processname: 3proxy
 # config: /etc/3proxy.cfg
-# pidfile: /var/run/3proxy.pid
 
 WITHOUT_RC_COMPAT=1
 
@@ -22,25 +21,25 @@ prog=3proxy
 CONFIG=/etc/3proxy.cfg
 PROXY=/usr/bin/3proxy
 RETVAL=0
-PIDFILE=/var/run/3proxy.pid
 LOCKFILE=/var/lock/subsys/3proxy
 #LOGFILE=/var/log/3proxy.log
 
 start() {
 	echo -n $"Starting $prog: "
-	daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
+	# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
+	daemon "$PROXY" "$CONFIG"
 	RETVAL=$?
 	echo
-		[ $RETVAL = 0 ] && touch ${LOCKFILE}
+		[ 0 -eq $RETVAL ] && touch ${LOCKFILE}
 	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc -p "${PIDFILE}" -d 1 "$PROXY"
+	killproc -d 3 "$prog"
 	RETVAL=$?
 	echo
-		[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
+		[ 0 -eq $RETVAL ] && rm -f ${LOCKFILE}
 	return $RETVAL
 }
 
@@ -51,7 +50,7 @@ restart() {
 
 reload(){
 	echo -n $"Reloading $prog: "
-	killproc -p ${pidfile} $httpd -USR1
+	killproc $prog -USR1
 	RETVAL=$?
 	echo
 }
@@ -74,11 +73,11 @@ case "$1" in
 	RETVAL=$?
 	;;
   status)
-	status -p "$PIDFILE" "$PROXY"
+	status "$PROXY"
 	RETVAL=$?
 	;;
   *)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|status|reload}"
 	RETVAL=1
 	;;
 esac


Index: 3proxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/3proxy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 3proxy.spec	24 Nov 2009 23:24:56 -0000	1.4
+++ 3proxy.spec	28 Nov 2009 14:07:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		3proxy
 Version:		0.6
-Release:		6%{?dist}
+Release:		7%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -101,6 +101,9 @@ fi
 %{_mandir}/man8/*.8.gz
 
 %changelog
+* Wed Nov 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-7
+- Again new init-script for Fix BZ#533144 :).
+
 * Wed Nov 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-6
 - Forgot commit new init-script for Fix BZ#533144.