diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index 682a5db..eaf51eb 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -268,7 +268,7 @@ function sync_files() /usr/bin/chcon -h --reference=/var/named /var/named{/,/*} >/dev/null 2>&1; /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/slaves /var/named/{slaves,data}{/,/*} >/dev/null 2>&1; /sbin/restorecon /var/named/named.ca ${BIND_CHROOT_PREFIX}/var/named/named.ca >/dev/null 2>&1; - /sbin/restorecon ${BIND_CHROOT_PREFIX}; + /sbin/restorecon ${BIND_CHROOT_PREFIX} >/dev/null 2>&1; /usr/bin/chcon -h --reference=${BIND_CHROOT_PREFIX}/var/named/named.ca /var/named/named.ca >/dev/null 2>&1; fi; /sbin/service named condrestart diff --git a/bind.spec b/bind.spec index e0ef7d3..a6505b0 100644 --- a/bind.spec +++ b/bind.spec @@ -17,7 +17,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: BSD-like Version: 9.3.2 -Release: 39%{?dist} +Release: 40%{?dist} Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -495,7 +495,7 @@ find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; # # Ghost config files: touch ${RPM_BUILD_ROOT}/etc/named.conf -# bind-config files: +# caching-nameserver files: mkdir -p ${RPM_BUILD_ROOT}/{etc,var/named} install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}/etc/named.caching-nameserver.conf install -m 644 %{SOURCE27} ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones @@ -524,7 +524,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.125 2006/08/28 14:05:37 dwalsh 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.126 2006/09/05 11:03:16 stransky 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: @@ -852,6 +852,10 @@ rm -rf ${RPM_BUILD_ROOT} :; %changelog +* Tue Sep 5 2006 Martin Stransky - 30:9.3.2-40 +- suppressed messages from bind-chroot-admin +- cleared notes about bind-config + * Mon Aug 22 2006 Martin Stransky - 30:9.3.2-39 - added fix for #203522 - "bind-chroot-admin -e" command fails diff --git a/named.caching-nameserver.conf b/named.caching-nameserver.conf index 8c5ee4f..9eda77e 100644 --- a/named.caching-nameserver.conf +++ b/named.caching-nameserver.conf @@ -1,7 +1,7 @@ // // named.caching-nameserver.conf // -// Provided by Red Hat bind-config package to configure the +// Provided by Red Hat caching-nameserver package to configure the // ISC BIND named(8) DNS server as a caching only nameserver // (as a localhost DNS resolver only). // @@ -9,7 +9,7 @@ // // DO NOT EDIT THIS FILE - use system-config-bind or an editor // to create named.conf - edits to this file will be lost on -// bind-config package upgrade. +// caching-nameserver package upgrade. // options { listen-on port 53 { 127.0.0.1; }; diff --git a/named.rfc1912.zones b/named.rfc1912.zones index 2a3b74d..143f1e8 100644 --- a/named.rfc1912.zones +++ b/named.rfc1912.zones @@ -1,6 +1,6 @@ // named.rfc1912.zones: // -// Provided by Red Hat bind-config package +// Provided by Red Hat caching-nameserver package // // ISC BIND named zone configuration for zones recommended by // RFC 1912 section 4.1 : localhost TLDs and address zones