[SCM] Debian packaging for the Shibboleth Apache SP branch, debian, updated. upstream/1.3.1.dfsg1-154-g657542e

[Russ Allbery]

The following commit has been merged in the debian branch:
commit 657542ea9becb2d1daf040bed64ea15a18f74d93
Author: Russ Allbery <rra at debian.org>
Date:   Tue Oct 14 21:51:19 2008 -0700

    Wait for shibd to exit on stop or restart
    
    * Wait for shibd to exit on stop or restart.  This fixes a bug in
      restart that could lead to no new shibd being started because the old
      one had not yet exited.

diff --git a/debian/changelog b/debian/changelog
index a5285b5..09f805f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 shibboleth-sp (1.3.1.dfsg1-3) UNRELEASED; urgency=low
 
   * Unlink the correct Apache configuration on package removal.
+  * Wait for shibd to exit on stop or restart.  This fixes a bug in
+    restart that could lead to no new shibd being started because the old
+    one had not yet exited.
 
  -- Russ Allbery <rra at debian.org>  Tue, 14 Oct 2008 21:49:36 -0700
 
diff --git a/debian/libapache2-mod-shib.shibd.init b/debian/libapache2-mod-shib.shibd.init
index 5da628c..61150f1 100755
--- a/debian/libapache2-mod-shib.shibd.init
+++ b/debian/libapache2-mod-shib.shibd.init
@@ -48,14 +48,13 @@ start)
 stop)
     echo -n "Stopping $DESC: "
     start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-        --exec $DAEMON
+        --retry TERM/30/KILL/5 --exec $DAEMON
     echo "$NAME."
     ;;
 restart|force-reload)
     echo -n "Restarting $DESC: "
     start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-        --exec $DAEMON
-    sleep 1
+        --retry TERM/30/KILL/5 --exec $DAEMON
     start-stop-daemon --background --start --quiet \
         --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
     echo "$NAME."

-- 
Debian packaging for the Shibboleth Apache SP