From 5067517e871ea8c8ca8acec3c388978d950228c4 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Dec 12 2007 13:27:02 +0000
Subject: - added dst/gssapi.h to -devel subpackage (#419091)

- improved fix for (#417431)

---

diff --git a/bind-9.5-gssapi-header.patch b/bind-9.5-gssapi-header.patch
new file mode 100644
index 0000000..fe8c694
--- /dev/null
+++ b/bind-9.5-gssapi-header.patch
@@ -0,0 +1,12 @@
+diff -up bind-9.5.0b1/lib/dns/include/dst/Makefile.in.gssapi-header bind-9.5.0b1/lib/dns/include/dst/Makefile.in
+--- bind-9.5.0b1/lib/dns/include/dst/Makefile.in.gssapi-header	2007-12-11 15:50:55.000000000 +0100
++++ bind-9.5.0b1/lib/dns/include/dst/Makefile.in	2007-12-11 15:51:15.000000000 +0100
+@@ -21,7 +21,7 @@ top_srcdir =	@top_srcdir@
+ 
+ @BIND9_VERSION@
+ 
+-HEADERS =	dst.h lib.h result.h
++HEADERS =	dst.h gssapi.h lib.h result.h
+ 
+ SUBDIRS =
+ TARGETS =
diff --git a/bind.spec b/bind.spec
index 02d7208..91a8199 100644
--- a/bind.spec
+++ b/bind.spec
@@ -21,7 +21,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	19.1.%{RELEASEVER}%{?dist}
+Release: 	19.2.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,6 +62,7 @@ Patch63:	bind-9.4.0-dnssec-directory.patch
 Patch69:	bind-9.5.0-generate-xml.patch
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
+Patch84:	bind-9.5-gssapi-header.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -256,6 +257,7 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %endif
 %patch73 -p1 -b .libidn
 %patch83 -p1 -b .libidn2
+%patch84 -p1 -b .gssapi-header
 :;
 
 
@@ -412,7 +414,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.236 2007/12/11 12:23:32 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.237 2007/12/12 13:27:02 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
  *\
  * NOTE: you only need to create this file if it is to\
  * differ from the following default contents:
@@ -665,6 +667,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Dec 12 2007 Adam Tkac <atkac redhat com> 32:9.5.0-19.2.b1
+- added dst/gssapi.h to -devel subpackage (#419091)
+- improved fix for (#417431)
+
 * Mon Dec 10 2007 Adam Tkac <atkac redhat com> 32:9.5.0-19.1.b1
 - fixed shutdown with initscript when rndc doesn't work (#417431)
 - fixed IDN patch (#412241)
diff --git a/named.init b/named.init
index 3304aff..dff9a04 100755
--- a/named.init
+++ b/named.init
@@ -32,7 +32,7 @@ if [ -x /usr/sbin/named-sdb ]; then
 fi
 
 # Don't kill named during clean-up
-NAMED_SHUTDOWN_TIMEOUT=${NAMED_SHUTDOWN_TIMEOUT:-100}
+NAMED_SHUTDOWN_TIMEOUT=${NAMED_SHUTDOWN_TIMEOUT:-25}
 
 if [ -n "$ROOTDIR" ]; then
    ROOTDIR=`echo $ROOTDIR | sed 's#//*#/#g;s#/$##'`;
@@ -139,22 +139,20 @@ stop() {
   echo -n $"Stopping named: "
   [ -x /usr/sbin/rndc ] && /usr/sbin/rndc stop >/dev/null 2>&1;
   RETVAL=$?
-  # is it still here?
-  if /sbin/pidof -o %PPID "$named" >/dev/null; then
-    timeout=0
-    killproc "$named" -TERM >/dev/null 2>&1
-    RETVAL=0
-    while [ `/sbin/pidof -o %PPID "$named" >/dev/null` ]; do
-        if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
-	  RETVAL=1
-          echo $"no response, killing with -TERM "
-          break
-        else
-          sleep 2 && echo -n "."
-          timeout=$((timeout+2))
-        fi;
-    done
-  fi;
+  # was rndc successful?
+  [ "$RETVAL" -eq 0 ] || killproc "$named" -TERM >/dev/null 2>&1
+
+  timeout=0
+  RETVAL=0
+  while [ `/sbin/pidof -o %PPID "$named" >/dev/null` ]; do
+    if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
+      RETVAL=1
+      break
+    else
+      sleep 2 && echo -n "."
+      timeout=$((timeout+2))
+    fi;
+  done
 
   # remove pid files
   if [ $RETVAL -eq 0 ]; then