- major changes in default caching-nameserver configuration - it couldbind-9_4_1-6_fc7

    satisfy RFCs now (#243565)

1 files changed, 21 insertions, 42 deletions

diff --git a/bind.spec b/bind.spec
index 439b2c0..29cdcab 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.4.1
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,21 +38,11 @@ Source11: 	named.service
 Source12: 	README.sdb_pgsql
 Source13: 	namedSetForwarders
 Source14: 	namedGetForwarders
-Source16: 	named.caching-nameserver.conf
-Source17: 	named.root
-Source18: 	named.local
-Source19: 	localhost.zone
-Source20: 	localdomain.zone
-Source21: 	named.ip6.local
-Source22: 	named.broadcast
-Source23: 	named.zero
 Source24:	Copyright.caching-nameserver
 Source26: 	bind-chroot-admin.in
-Source27:       named.rfc1912.zones
 Source28:	libbind.pc
 Source29:	named.conf.sample
-Source30:       named.rfc1912.zones.sample
-Source31:       named.root.hints
+Source32:	config.tar
 #
 Patch:  	bind-9.2.0rc3-varrun.patch
 Patch1: 	bind-9.3.3rc2-rndckey.patch
@@ -451,17 +441,8 @@ find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';';
 # Ghost config files:
 touch ${RPM_BUILD_ROOT}/etc/named.conf
 # 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
-install -m 644 %{SOURCE17} ${RPM_BUILD_ROOT}/var/named/named.ca
-install -m 644 %{SOURCE18} ${RPM_BUILD_ROOT}/var/named/named.local
-install -m 644 %{SOURCE19} ${RPM_BUILD_ROOT}/var/named/localhost.zone
-install -m 644 %{SOURCE20} ${RPM_BUILD_ROOT}/var/named/localdomain.zone
-install -m 644 %{SOURCE21} ${RPM_BUILD_ROOT}/var/named/named.ip6.local
-install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}/var/named/named.broadcast
-install -m 644 %{SOURCE23} ${RPM_BUILD_ROOT}/var/named/named.zero
-for f in /etc/named.caching-nameserver.conf /var/named/{named.ca,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero}; do
+tar '-C' ${RPM_BUILD_ROOT} '-xf' %{SOURCE32}
+for f in /etc/named.caching-nameserver.conf /etc/named.rfc1912.zones /var/named/{named.ca,named.localhost,named.empty,named.loopback}; do
     touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f;
 done
 install -m 644 %{SOURCE5}  ./rfc1912.txt
@@ -470,20 +451,20 @@ install -m 644 %{SOURCE24} ./Copyright
 sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %{SOURCE26} > bind-chroot-admin;
 install -m 754 bind-chroot-admin ${RPM_BUILD_ROOT}/%{_sbindir}
 # sample bind configuration files for %doc:
-mkdir -p sample/etc sample/var/named/{data,slaves}
+mkdir -p sample/{etc,var/named/{data,slaves}}
+for f in ${RPM_BUILD_ROOT}{/etc/named.rfc1912.zones,/var/named/{named.ca,named.localhost,named.empty,named.loopback}}; do
+    cp -fp $f sample;
+done
 cp -fp %{SOURCE29} sample/etc/named.conf
-cp -fp %{SOURCE30} sample/etc/named.rfc1912.zones
-cp -fp %{SOURCE31} sample/etc/
-cp -fp %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} sample/var/named
 for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do 
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
-  ns localhost.' > sample/var/named/$f; 
+  ns localhost.' >  sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.183 2007/06/05 12:16:15 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.184 2007/06/18 12:59:42 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:
-;d}' > sample/etc/rndc.conf;
+;d}' >  sample/etc/rndc.conf;
 #
 chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*so.*
 :;
@@ -733,18 +714,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %config(noreplace) %{chroot_prefix}/etc/named.conf
 %config %verify(not link) /var/named/named.ca
 %ghost  %config %{chroot_prefix}/var/named/named.ca
-%config %verify(not link) /var/named/named.local
-%ghost  %config %{chroot_prefix}/var/named/named.local
-%config %verify(not link) /var/named/localhost.zone
-%ghost  %config %{chroot_prefix}/var/named/localhost.zone
-%config %verify(not link) /var/named/localdomain.zone
-%ghost  %config %{chroot_prefix}/var/named/localdomain.zone
-%config %verify(not link) /var/named/named.ip6.local
-%ghost  %config %{chroot_prefix}/var/named/named.ip6.local
-%config %verify(not link) /var/named/named.broadcast
-%ghost  %config %{chroot_prefix}/var/named/named.broadcast
-%config %verify(not link) /var/named/named.zero
-%ghost  %config %{chroot_prefix}/var/named/named.zero
+%config %verify(not link) /var/named/named.localhost
+%ghost  %config %{chroot_prefix}/var/named/named.localhost
+%config %verify(not link) /var/named/named.loopback
+%ghost  %config %{chroot_prefix}/var/named/named.loopback
+%config %verify(not link) /var/named/named.empty
+%ghost  %config %{chroot_prefix}/var/named/named.empty
 %defattr(0644,root,root,0755)
 %doc Copyright
 %doc rfc1912.txt
@@ -809,6 +784,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Mon Jun 18 2007 Adam Tkac <atkac redhat com> 31:9.4.1-6.fc7
+- major changes in default caching-nameserver configuration (configuration
+  could now honor RFCs, #243565)
+
 * Tue Jun 05 2007 Adam Tkac <atkac redhat com> 31:9.4.1-5.fc7
 - added /var/named/dynamic directory. This directory is primary designed
   for dynamic DNS zones. In future releases named could write only into