[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc1-91-gdeb8e1a

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit df1c26cd3e486fe4a5321c733d09b4326876640b
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 10 11:10:11 2013 +0100

    Fixing #675081

diff --git a/debian/changelog b/debian/changelog
index 45dc0fb..761afe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+proftpd-dfsg (1.3.5~rc1-2) UNRELEASED; urgency=low
+
+  * Now signal() uses a schedule for --retry in start-stop-daemon instead of a 
+    simple fixed delay. This should be safe in every situations when the init
+    script is called.
+    (closes: #675081)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Jan 2013 10:57:37 +0100
+
 proftpd-dfsg (1.3.5~rc1-1) experimental; urgency=low
 
   * New upstream pre-release.
diff --git a/debian/proftpd-basic.init b/debian/proftpd-basic.init
old mode 100644
new mode 100755
index ab19b20..212e5aa
--- a/debian/proftpd-basic.init
+++ b/debian/proftpd-basic.init
@@ -109,7 +109,7 @@ signal()
         	log_end_msg 0
     	else
 		SIGNAL="KILL"
-		start-stop-daemon --stop --signal $SIGNAL --quiet --pidfile "$PIDFILE"
+		start-stop-daemon --stop --signal $SIGNAL --quiet --pidfile "$PIDFILE" --retry=TERM/10/KILL/5
     		if [ $? != 0 ]; then
         		log_end_msg 1
         		[ $2 != 0 ] || exit 0
@@ -175,7 +175,6 @@ case "$1" in
     force-reload|restart)
 	if [ "x$RUN" = "xyes" ] ; then
 	    signal stop 1
-	    sleep 2
 	    start
 	else
 	    if [ "x$INETD" = "xyes" ] ; then

-- 
ProFTPD core package