From d69ee3dd245998558deae7dfb87ae3ccc48c409f Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 03:37:57 +0000 Subject: auto-import changelog data from bind-9.2.4rc6-1.src.rpm Fri Jul 16 2004 Jason Vas Dias - Upgraded to ISC version 9.2.4rc6 Fri Jul 16 2004 Jason Vas Dias - Fixed named.init generation of error messages on - 'service named stop' and 'service named reload' - as per bug 127775 --- diff --git a/.cvsignore b/.cvsignore index db9bc4e..b174f1d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1,5 @@ -bind-9.2.3.tar.bz2 bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 +bind-9.2.4rc6.tar.gz bind-chroot.tar.gz bind-manpages.patch.bz2 bind-manpages.tar.bz2 diff --git a/bind-nonexec.patch b/bind-nonexec.patch index c0678b2..a502f87 100644 --- a/bind-nonexec.patch +++ b/bind-nonexec.patch @@ -1,66 +1,66 @@ ---- bind-9.2.2/lib/bind/Makefile.in.nonexec 2003-07-30 14:40:41.081001798 -0400 -+++ bind-9.2.2/lib/bind/Makefile.in 2003-07-30 14:41:13.093062788 -0400 -@@ -109,7 +109,7 @@ installdirs: +--- bind-9.2.4rc6/lib/bind/Makefile.in.nonexec 2004-03-09 04:17:23.000000000 -0500 ++++ bind-9.2.4rc6/lib/bind/Makefile.in 2004-07-16 19:23:30.000000000 -0400 +@@ -111,7 +111,7 @@ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL} ${INSTALL_DATA} libbind.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL} ${INSTALL_PROGRAM} libbind.@A@ ${DESTDIR}${libdir} - +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libbind.@A@ ${DESTDIR}${libdir} clean distclean:: ---- bind-9.2.2/lib/dns/Makefile.in.nonexec 2003-07-30 14:39:04.705849948 -0400 -+++ bind-9.2.2/lib/dns/Makefile.in 2003-07-30 14:39:22.621205149 -0400 -@@ -107,7 +107,7 @@ installdirs: + rm -f libbind.@SA@ libbind.la +--- bind-9.2.4rc6/lib/dns/Makefile.in.nonexec 2004-04-14 20:35:27.000000000 -0400 ++++ bind-9.2.4rc6/lib/dns/Makefile.in 2004-07-16 19:25:40.000000000 -0400 +@@ -136,7 +136,7 @@ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL} ${INSTALL_PROGRAM} libdns.@A@ ${DESTDIR}${libdir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f libdns.@A@ timestamp ---- bind-9.2.2/lib/isc/Makefile.in.nonexec 2003-07-30 14:14:54.868958681 -0400 -+++ bind-9.2.2/lib/isc/Makefile.in 2003-07-30 14:27:43.821361581 -0400 -@@ -105,7 +105,7 @@ installdirs: +--- bind-9.2.4rc6/lib/isc/Makefile.in.nonexec 2004-03-09 01:11:44.000000000 -0500 ++++ bind-9.2.4rc6/lib/isc/Makefile.in 2004-07-16 19:24:46.000000000 -0400 +@@ -105,7 +105,7 @@ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL} ${INSTALL_PROGRAM} libisc.@A@ ${DESTDIR}${libdir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f libisc.@A@ libisc.la timestamp ---- bind-9.2.2/lib/isccc/Makefile.in.nonexec 2003-07-30 14:39:51.672537962 -0400 -+++ bind-9.2.2/lib/isccc/Makefile.in 2003-07-30 14:40:03.276472611 -0400 -@@ -80,7 +80,7 @@ installdirs: +--- bind-9.2.4rc6/lib/isccc/Makefile.in.nonexec 2004-03-09 01:12:25.000000000 -0500 ++++ bind-9.2.4rc6/lib/isccc/Makefile.in 2004-07-16 19:26:40.000000000 -0400 +@@ -80,7 +80,7 @@ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL} ${INSTALL_DATA} libisccc.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL} ${INSTALL_PROGRAM} libisccc.@A@ ${DESTDIR}${libdir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccc.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccc.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f libisccc.@A@ timestamp ---- bind-9.2.2/lib/isccfg/Makefile.in.nonexec 2003-07-30 14:41:59.601792847 -0400 -+++ bind-9.2.2/lib/isccfg/Makefile.in 2003-07-30 14:42:02.355540027 -0400 -@@ -75,7 +75,7 @@ installdirs: +--- bind-9.2.4rc6/lib/isccfg/Makefile.in.nonexec 2004-03-09 01:12:30.000000000 -0500 ++++ bind-9.2.4rc6/lib/isccfg/Makefile.in 2004-07-16 19:27:22.000000000 -0400 +@@ -77,7 +77,7 @@ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL} ${INSTALL_DATA} libisccfg.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL} ${INSTALL_PROGRAM} libisccfg.@A@ ${DESTDIR}${libdir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccfg.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f libisccfg.@A@ timestamp ---- bind-9.2.2/lib/lwres/Makefile.in.nonexec 2003-07-30 14:42:09.941843533 -0400 -+++ bind-9.2.2/lib/lwres/Makefile.in 2003-07-30 14:42:12.256631013 -0400 -@@ -76,7 +76,7 @@ installdirs: +--- bind-9.2.4rc6/lib/lwres/Makefile.in.nonexec 2004-03-09 01:12:32.000000000 -0500 ++++ bind-9.2.4rc6/lib/lwres/Makefile.in 2004-07-16 19:28:19.000000000 -0400 +@@ -76,7 +76,7 @@ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir} install:: timestamp installdirs -- ${LIBTOOL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir} -+ ${LIBTOOL} ${INSTALL_PROGRAM} liblwres.@A@ ${DESTDIR}${libdir} +- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir} ++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} liblwres.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f liblwres.@A@ liblwres.la timestamp diff --git a/bind.spec b/bind.spec index e303b7a..3332e11 100644 --- a/bind.spec +++ b/bind.spec @@ -4,7 +4,7 @@ Summary: A DNS (Domain Name System) server. Name: bind License: BSD-like Group: System Environment/Daemons -Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.bz2 +Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.gz Source1: bind-manpages.tar.bz2 Source2: named.sysconfig Source3: named.init @@ -14,7 +14,7 @@ Source6: rfc1912.txt Source7: bind-chroot.tar.gz Patch: bind-9.2.0rc3-varrun.patch Patch1: bind-9.2.1-key.patch -Patch2: bind-config.patch +Patch2: bind-9.2.1-config.patch Patch3: bind-posixthreads.patch Patch4: bind-bsdcompat.patch Patch5: bind-nonexec.patch @@ -22,11 +22,10 @@ Patch6: bind-9.2.2-nsl.patch Patch7: bind-9.2.2-pie.patch Patch8: bind-manpages.patch.bz2 Patch9: bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 - Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root -Version: 9.2.3 -Release: 18 +Version: 9.2.4rc6 +Release: 1 BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig fileutils tar Requires(pre,preun): shadow-utils @@ -146,7 +145,7 @@ fi %setup -q -n %{name}-%{version} %patch -p1 -b .varrun %patch1 -p1 -b .key -%patch2 -p1 -b .configure +%patch2 -p1 -b .config %if %{posix_threads} %patch3 -p1 -b .posixthreads %endif @@ -156,7 +155,6 @@ fi %patch7 -p1 -b .pie %patch8 -p1 -b .man-pages %patch9 -p0 -b .deprecation_msg_shut_up - %build libtoolize --copy --force; aclocal; autoconf @@ -326,6 +324,18 @@ rm -rf ${RPM_BUILD_ROOT} ${RPM_BUILD_DIR}/%{name}-%{version} %endif %changelog + +* Fri Jul 16 2004 Jason Vas Dias +- Upgraded to ISC version 9.2.4rc6 + +* Fri Jul 16 2004 Jason Vas Dias +- Fixed named.init generation of error messages on +- 'service named stop' and 'service named reload' +- as per bug 127775 + +* Thu Jun 23 2004 Daniel Walsh 9.2.3-19 +- Bump for rhel 3.0 U3 + * Thu Jun 23 2004 Daniel Walsh 9.2.3-18 - remove disable-linux-caps @@ -944,4 +954,3 @@ versions). - Used buildroot - patched bin/named/ns_udp.c to use for include on Redhat 5.0 instead of - diff --git a/named.init b/named.init index 6dfd476..73fa736 100755 --- a/named.init +++ b/named.init @@ -46,7 +46,7 @@ start() { stop() { # Stop daemons. echo -n $"Stopping $prog: " - /usr/sbin/rndc stop + /usr/sbin/rndc stop >/dev/null 2>&1 RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/named || { killproc named @@ -71,8 +71,13 @@ restart() { } reload() { echo -n $"Reloading $prog: " - /usr/sbin/rndc reload >/dev/null 2>&1 || /usr/bin/kill -HUP `/sbin/pidof -o %PPID named` - [ "$?" -eq 0 ] && success $"$prog reload" || failure $"$prog reload" + p=`/sbin/pidof -o %PPID named` + RETVAL=$? + if [ "$RETVAL" -eq 0 ]; then + /usr/sbin/rndc reload >/dev/null 2>&1 || /usr/bin/kill -HUP $p; + RETVAL=$? + fi + [ "$RETVAL" -eq 0 ] && success $"$prog reload" || failure $"$prog reload" echo return $? } diff --git a/sources b/sources index 4864133..c21f31e 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -3551c7bf39d9b50c9826bb7d6f501b96 bind-9.2.3.tar.bz2 f1266fa636426e2f3ce6771f09ce787f bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 +f63054b2fc51e9af97bde8d432ccf6aa bind-9.2.4rc6.tar.gz c7633478012957e98e2c39b2a070f888 bind-chroot.tar.gz -8b23572c278767cb64ced447df3ffdcc bind-manpages.patch.bz2 +1ae2dcc356623ef5fd130893e95a9b94 bind-manpages.patch.bz2 c2f6322d4ef48684478cbb3c5cccbd3f bind-manpages.tar.bz2