[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.1.dfsg1-2-22-gd7c3214

[Russ Allbery]

The following commit has been merged in the master branch:
commit 0309ef45aa9d7b4c8386bd530eb07068c5da06a2
Merge: 7657e201bafd5b9af9c9b2a8967c0a72fd836fea f1ce1d22991633fdf3c83e437b0a2e00a5c9a8bf
Author: Russ Allbery <rra at debian.org>
Date:   Fri Aug 21 11:40:40 2009 -0700

    Merge branch 'debian'

diff --combined configs/shibd-debian.in
index 3b59c86,889372d..d9e6e56
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -50,6 -50,9 +50,9 @@@ DAEMON_OPTS="$DAEMON_OPTS -p $PIDFILE
  
  case "$1" in
  start)
+     # Ensure @-PKGRUNDIR-@ exists.  /var/run may be on a tmpfs file system.
+     [ -d '@-PKGRUNDIR-@' ] || mkdir -p '@-PKGRUNDIR-@'
+ 
      # Don't start shibd if NO_START is set.
      if [ "$NO_START" = 1 ] ; then
          echo "Not starting $DESC (see /etc/default/$NAME)"
@@@ -63,15 -66,19 +66,18 @@@
  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)
+     # Ensure @-PKGRUNDIR-@ exists.  /var/run may be on a tmpfs file system.
+     [ -d '@-PKGRUNDIR-@' ] || mkdir -p '@-PKGRUNDIR-@'
+ 
      echo -n "Restarting $DESC: "
      start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 -        --exec $DAEMON
 -    sleep 1
 -    start-stop-daemon --start --quiet \
 -        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
 +        --retry TERM/30/KILL/5 --exec $DAEMON
 +    start-stop-daemon --start --quiet --pidfile $PIDFILE \
 +        --exec $DAEMON -- $DAEMON_OPTS
      echo "$NAME."
      ;;
  *)

-- 
Debian packaging for the 2.0 Apache Shibboleth SP