rpms/bind/F-8 bind-9.5-gssapi-header.patch, NONE, 1.1 bind.spec, 1.232, 1.233 named.init, 1.62, 1.63

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019

Modified Files:
	bind.spec named.init 
Added Files:
	bind-9.5-gssapi-header.patch 
Log Message:
- added dst/gssapi.h to -devel subpackage (#419091)
- improved fix for (#417431)


bind-9.5-gssapi-header.patch:

--- NEW FILE bind-9.5-gssapi-header.patch ---
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 =


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- bind.spec	11 Dec 2007 12:25:40 -0000	1.232
+++ bind.spec	12 Dec 2007 13:28:21 -0000	1.233
@@ -21,7 +21,7 @@
 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)
@@ -63,6 +63,7 @@
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch80:	bind-9.5-edns.patch
+Patch84:	bind-9.5-gssapi-header.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -258,6 +259,7 @@
 %patch73 -p1 -b .libidn
 %patch80 -p1 -b .edns
 %patch83 -p1 -b .libidn2
+%patch84 -p1 -b .gssapi-header
 :;
 
 
@@ -665,6 +667,10 @@
 %{_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)


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/named.init,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- named.init	11 Dec 2007 12:25:40 -0000	1.62
+++ named.init	12 Dec 2007 13:28:21 -0000	1.63
@@ -32,7 +32,7 @@
 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 @@
   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