[arch-commits] Commit in lighttpd/trunk (PKGBUILD lighttpd.rc.d)

[Pierre Schmitz]

    Date: Thursday, November 4, 2010 @ 06:38:11
  Author: pierre
Revision: 98171

fix FS#21586

Modified:
  lighttpd/trunk/PKGBUILD
  lighttpd/trunk/lighttpd.rc.d

---------------+
 PKGBUILD      |    4 ++--
 lighttpd.rc.d |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-04 08:44:09 UTC (rev 98170)
+++ PKGBUILD	2010-11-04 10:38:11 UTC (rev 98171)
@@ -3,7 +3,7 @@
 
 pkgname=lighttpd
 pkgver=1.4.28
-pkgrel=2
+pkgrel=3
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
         'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
 md5sums=('586eb535d31ac299652495b058dd87c4'
-         '701141f42df90097bbfc5c7f1f63beb9'
+         'f110637c56d360ecaecb3bf6f7918229'
          '913e2157fa78d990c32146f387d44c2b'
          '2803a9ee7f20409c69f1566d2d90720e')
 

Modified: lighttpd.rc.d
===================================================================
--- lighttpd.rc.d	2010-11-04 08:44:09 UTC (rev 98170)
+++ lighttpd.rc.d	2010-11-04 10:38:11 UTC (rev 98171)
@@ -76,7 +76,7 @@
 	local PID=$(get_pid)
 	[ -n "$PID" ] && kill $PID &> /dev/null
 	if [ $? -gt 0 ]; then
-		stat_die
+		stat_fail
 	else
 		local pid_file=$(get_pid_file)
 		[ -f "${pid_file}" ] && rm -f "${pid_file}"
@@ -113,6 +113,9 @@
 	restart)
 		test_config
 		stop
+		while [ -n "$(get_pid)" ]; do
+			sleep 1
+		done
 		start
 		;;
 	status)