Package: release.debian.org User: release.debian.org@packages.debian.org Usertags: pu Version: fcgiwrap doesn't stop properly on squeeze (#602199). I just uploaded 1.0.3-2 with Jordi's fixes that were pending since four months to unstable. I'd like to propose the attached fix for squeeze, too.
diff -Nru fcgiwrap-1.0/debian/changelog fcgiwrap-1.0/debian/changelog --- fcgiwrap-1.0/debian/changelog 2010-05-25 21:38:28.000000000 +0200 +++ fcgiwrap-1.0/debian/changelog 2011-03-29 13:49:50.000000000 +0200 @@ -1,3 +1,12 @@ +fcgiwrap (1.0-1+squeeze1) stable; urgency=low + + * Non-maintainer upload. + * Unquote $pid and $DAEMON on stop_daemon() so it actually stops + (closes: #602199). + * Reduce the wait when just stopping (closes: #602200). + + -- Philipp Kern <pkern@debian.org> Tue, 29 Mar 2011 13:47:24 +0200 + fcgiwrap (1.0-1) unstable; urgency=low * New upstream release. diff -Nru fcgiwrap-1.0/debian/init fcgiwrap-1.0/debian/init --- fcgiwrap-1.0/debian/init 2010-05-25 21:35:04.000000000 +0200 +++ fcgiwrap-1.0/debian/init 2011-03-29 13:49:20.000000000 +0200 @@ -39,6 +39,8 @@ # If this value is set too low you might not # let some servers to die gracefully and # 'restart' will not work +QDIETIME=0.5 # The same as DIETIME, but a lot shorter for the + # stop case. #STARTTIME=2 # Time to wait for the server to start, in seconds # If this value is set each time the server is @@ -49,7 +51,6 @@ # be a false positive (says it did not start # when it actually did) - # Include defaults if available if [ -f /etc/default/$NAME ] ; then . /etc/default/$NAME @@ -137,13 +138,13 @@ [ ! -e "$PIDFILE" ] && return PIDS="$(cat "$PIDFILE")" for pid in $PIDS; do - if running_pid '$pid' '$DAEMON'; then + if running_pid $pid $DAEMON; then kill -15 $pid # Is it really dead? - sleep "$DIETIME"s + sleep "$QDIETIME"s if running_pid $pid $DAEMON; then kill -9 $pid - sleep "$DIETIME"s + sleep "$QDIETIME"s if running_pid $pid $DAEMON; then echo "Cannot kill $NAME (pid=$pid)!" exit 1
Attachment:
signature.asc
Description: Digital signature