[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, lenny, updated. debian/2.0.dfsg1-3-8-g1c0d5f7

[Russ Allbery]

The following commit has been merged in the lenny branch:
commit 1c0d5f70f485ff9501b99cf8abcf32e5afaa81ac
Author: Russ Allbery <rra at debian.org>
Date:   Tue Oct 14 20:58:36 2008 -0700

    Indent long description and wait for shibd to exit
    
    Rather than just sending shibd a signal and assuming success, wait for it
    to exit, since it can take some time to stop after a TERM signal.  This
    should fix restart problems where shibd wasn't started because the prior
    version had not exited yet.

diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index b99c3cd..7ffc1f6 100644
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -63,14 +63,13 @@ start)
 stop)
     echo -n "Stopping $DESC: "
     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-        --exec $DAEMON
+        --retry TERM/30/KILL/5 --exec $DAEMON
     echo "$NAME."
     ;;
 restart|force-reload)
     echo -n "Restarting $DESC: "
     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-        --exec $DAEMON
-    sleep 1
+        --retry TERM/30/KILL/5 --exec $DAEMON
     start-stop-daemon --background --start --quiet \
         --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
     echo "$NAME."

-- 
Debian packaging for the 2.0 Apache Shibboleth SP