From 858dd5a62e2651178113de58d3e7128b738b70b3 Mon Sep 17 00:00:00 2001
From: "Shell.Xu" <shell909090@gmail.com>
Date: Sat, 23 Aug 2014 23:04:54 +0800
Subject: [PATCH] * fix init.d issue, pass test on server

---
 debian/control             |  2 +-
 debian/init.d              | 19 +++++++------------
 debian/shadowsocks.default |  2 ++
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index c8c1549..ad22e42 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: https://github.com/clowwindy/shadowsocks
 
 Package: shadowsocks
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-m2crypto
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-setuptools, python-m2crypto
 Description: Fast tunnel proxy that helps you bypass firewalls
  A secure socks5 proxy, designed to protect your Internet traffic.
  .
diff --git a/debian/init.d b/debian/init.d
index 1413cbd..2f4f352 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -21,6 +21,7 @@ DAEMON=/usr/bin/ssserver     # Introduce the server's location here
 DAEMON_ARGS=""               # Arguments to run the daemon with
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
+LOGFILE=/var/log/$NAME.log
 
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
@@ -44,10 +45,12 @@ do_start()
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON \
+	    --background --make-pidfile --chdir / --chuid $USERID --no-close --test > /dev/null \
 		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON \
+	    --background --make-pidfile --chdir / --chuid $USERID --no-close -- \
+		$DAEMON_ARGS $DAEMON_OPTS >> $LOGFILE 2>&1 \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
@@ -64,17 +67,9 @@ do_stop()
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
 	# Many daemons don't delete their pidfiles when they exit.
 	rm -f $PIDFILE
 	return "$RETVAL"
diff --git a/debian/shadowsocks.default b/debian/shadowsocks.default
index 62831c2..f82b17a 100644
--- a/debian/shadowsocks.default
+++ b/debian/shadowsocks.default
@@ -2,6 +2,8 @@
 # sourced by /etc/init.d/shadowsocks
 # installed at /etc/default/shadowsocks by the maintainer scripts
 
+USERID="nobody"
+
 #
 # This is a POSIX shell fragment
 #