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

[Pavel Alexeev]

Author: hubbitus

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

Modified Files:
	.cvsignore 3proxy.init 3proxy.spec sources 
Log Message:
- Forgot commit new init-script for Fix BZ#533144.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Nov 2009 11:16:39 -0000	1.4
+++ .cvsignore	24 Nov 2009 23:24:56 -0000	1.5
@@ -1,3 +1,3 @@
-3proxy.init
-3proxy.cfg
 3proxy-0.6.tgz
+3proxy.cfg
+3proxy.init


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


Index: 3proxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/3proxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 3proxy.spec	9 Nov 2009 12:10:27 -0000	1.3
+++ 3proxy.spec	24 Nov 2009 23:24:56 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		3proxy
 Version:		0.6
-Release:		5%{?dist}
+Release:		6%{?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-6
+- Forgot commit new init-script for Fix BZ#533144.
+
 * Sun Nov 8 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-5
 - Fix BZ#533144:
 - Add reload section to service file, fix stop.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Nov 2009 11:16:39 -0000	1.4
+++ sources	24 Nov 2009 23:24:56 -0000	1.5
@@ -1,3 +1,3 @@
-5b15eaeb993ca0b048a5bc0f2b53465b  3proxy.init
-d9a0d2959ed2d5511ea59c563d34b692  3proxy.cfg
 2ebd9c06939021f6c2aca31d67782f71  3proxy-0.6.tgz
+d9a0d2959ed2d5511ea59c563d34b692  3proxy.cfg
+9aff12ce0d7dfc69ac7b4794a7747ae0  3proxy.init