From 81d733cda698c442fc07b4863a238650a85deaa0 Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Aug 03 2006 12:50:58 +0000
Subject: - init: use killproc() delay to avoid race killing parent


---

diff --git a/httpd.init b/httpd.init
index 46fa126..6009d23 100755
--- a/httpd.init
+++ b/httpd.init
@@ -65,9 +65,13 @@ start() {
         [ $RETVAL = 0 ] && touch ${lockfile}
         return $RETVAL
 }
+
+# When stopping httpd a delay of >10 second is required before SIGKILLing the
+# httpd parent; this gives enough time for the httpd parent to SIGKILL any
+# errant children.
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc $httpd
+	killproc -d 10 $httpd
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
diff --git a/httpd.spec b/httpd.spec
index bd387a1..1148862 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.3
-Release: 2
+Release: 3
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -49,6 +49,7 @@ BuildRequires: autoconf, perl, pkgconfig, xmlto >= 0.0.11, findutils
 BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
 BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0, 
 Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find
+Requires: initscripts >= 8.36
 Obsoletes: httpd-suexec
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
 Prereq: sh-utils, textutils, /usr/sbin/useradd
@@ -481,6 +482,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Aug  3 2006 Joe Orton <jorton@redhat.com> 2.2.3-3
+- init: use killproc() delay to avoid race killing parent
+
 * Fri Jul 28 2006 Joe Orton <jorton@redhat.com> 2.2.3-2
 - update to 2.2.3
 - trim %%changelog to >=2.0.52