- added dst/gssapi.h to -devel subpackage (#419091)
- improved fix for (#417431)
This commit is contained in:
parent
7c05423481
commit
72f5cc831d
|
@ -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 =
|
|
@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
|
||||||
Name: bind
|
Name: bind
|
||||||
License: ISC
|
License: ISC
|
||||||
Version: 9.5.0
|
Version: 9.5.0
|
||||||
Release: 19.1.%{RELEASEVER}%{?dist}
|
Release: 19.2.%{RELEASEVER}%{?dist}
|
||||||
Epoch: 32
|
Epoch: 32
|
||||||
Url: http://www.isc.org/products/BIND/
|
Url: http://www.isc.org/products/BIND/
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
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
|
Patch69: bind-9.5.0-generate-xml.patch
|
||||||
Patch71: bind-9.5-overflow.patch
|
Patch71: bind-9.5-overflow.patch
|
||||||
Patch72: bind-9.5-dlz-64bit.patch
|
Patch72: bind-9.5-dlz-64bit.patch
|
||||||
|
Patch84: bind-9.5-gssapi-header.patch
|
||||||
|
|
||||||
# SDB patches
|
# SDB patches
|
||||||
Patch11: bind-9.3.2b2-sdbsrc.patch
|
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
|
%endif
|
||||||
%patch73 -p1 -b .libidn
|
%patch73 -p1 -b .libidn
|
||||||
%patch83 -p1 -b .libidn2
|
%patch83 -p1 -b .libidn2
|
||||||
|
%patch84 -p1 -b .gssapi-header
|
||||||
:;
|
:;
|
||||||
|
|
||||||
|
|
||||||
|
@ -665,6 +667,10 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||||
%{_sbindir}/bind-chroot-admin
|
%{_sbindir}/bind-chroot-admin
|
||||||
|
|
||||||
%changelog
|
%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
|
* 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 shutdown with initscript when rndc doesn't work (#417431)
|
||||||
- fixed IDN patch (#412241)
|
- fixed IDN patch (#412241)
|
||||||
|
|
10
named.init
10
named.init
|
@ -32,7 +32,7 @@ if [ -x /usr/sbin/named-sdb ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Don't kill named during clean-up
|
# 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
|
if [ -n "$ROOTDIR" ]; then
|
||||||
ROOTDIR=`echo $ROOTDIR | sed 's#//*#/#g;s#/$##'`;
|
ROOTDIR=`echo $ROOTDIR | sed 's#//*#/#g;s#/$##'`;
|
||||||
|
@ -139,22 +139,20 @@ stop() {
|
||||||
echo -n $"Stopping named: "
|
echo -n $"Stopping named: "
|
||||||
[ -x /usr/sbin/rndc ] && /usr/sbin/rndc stop >/dev/null 2>&1;
|
[ -x /usr/sbin/rndc ] && /usr/sbin/rndc stop >/dev/null 2>&1;
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
# is it still here?
|
# was rndc successful?
|
||||||
if /sbin/pidof -o %PPID "$named" >/dev/null; then
|
[ "$RETVAL" -eq 0 ] || killproc "$named" -TERM >/dev/null 2>&1
|
||||||
|
|
||||||
timeout=0
|
timeout=0
|
||||||
killproc "$named" -TERM >/dev/null 2>&1
|
|
||||||
RETVAL=0
|
RETVAL=0
|
||||||
while [ `/sbin/pidof -o %PPID "$named" >/dev/null` ]; do
|
while [ `/sbin/pidof -o %PPID "$named" >/dev/null` ]; do
|
||||||
if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
|
if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
|
||||||
RETVAL=1
|
RETVAL=1
|
||||||
echo $"no response, killing with -TERM "
|
|
||||||
break
|
break
|
||||||
else
|
else
|
||||||
sleep 2 && echo -n "."
|
sleep 2 && echo -n "."
|
||||||
timeout=$((timeout+2))
|
timeout=$((timeout+2))
|
||||||
fi;
|
fi;
|
||||||
done
|
done
|
||||||
fi;
|
|
||||||
|
|
||||||
# remove pid files
|
# remove pid files
|
||||||
if [ $RETVAL -eq 0 ]; then
|
if [ $RETVAL -eq 0 ]; then
|
||||||
|
|
Loading…
Reference in New Issue