- marked caching-nameserver as obsolete (#244604)bind-9_4_1-7_fc8

- fixed typo in initscript (causes that named doesn't detect NetworkManager
    correctly)
- next cleanup in configuration - moved configfiles into config.tar
- removed delay between start & restart in initscript

11 files changed, 17 insertions, 254 deletions

diff --git a/.cvsignore b/.cvsignore
index 7284b18..7085344 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 bind-9.4.1.tar.gz
 bind-chroot.tar.bz2
 libbind-man.tar.gz
+config.tar
diff --git a/bind.spec b/bind.spec
index 10e8bbf..9cd4d25 100644
--- a/bind.spec
+++ b/bind.spec
@@ -16,7 +16,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	BSD-like
 Version: 	9.4.1
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,18 +37,11 @@ Source11: 	named.service
 Source12: 	README.sdb_pgsql
 Source13: 	namedSetForwarders
 Source14: 	namedGetForwarders
-Source16: 	named.conf
-Source17: 	named.root
-Source18: 	named.localhost
-Source19:	named.loopback
-Source20: 	named.empty
 Source21:	Copyright.caching-nameserver
 Source22: 	bind-chroot-admin.in
-Source23:       named.rfc1912.zones
 Source24:	libbind.pc
 Source25:	named.conf.sample
-Source26:       named.rfc1912.zones.sample
-Source27:       named.root.hints
+Source28:	config.tar
 
 # Common patches
 Patch0:  	bind-9.2.0rc3-varrun.patch
@@ -93,6 +86,8 @@ Requires(pre): 	shadow-utils
 Requires(preun):chkconfig >= 1.3.26
 Obsoletes: bind-config
 Provides:  bind-config
+Obsoletes: caching-nameserver
+Provides:  caching-nameserver
 %if %{selinux}
 Requires(post):	policycoreutils
 %endif
@@ -409,13 +404,7 @@ find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';';
 # Ghost config files:
 touch ${RPM_BUILD_ROOT}/etc/named.conf
 # configuration files:
-mkdir -p ${RPM_BUILD_ROOT}/{etc,var/named}
-install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}/etc/named.conf
-install -m 644 %{SOURCE23} ${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.localhost
-install -m 644 %{SOURCE19} ${RPM_BUILD_ROOT}/var/named/named.loopback
-install -m 644 %{SOURCE20} ${RPM_BUILD_ROOT}/var/named/named.empty
+tar -C ${RPM_BUILD_ROOT} -xf %{SOURCE28}
 for f in /etc/named.conf /var/named/{named.ca,named.localhost,named.loopback,named.empty}; do
     touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f;
 done
@@ -427,9 +416,8 @@ 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}
 cp -fp %{SOURCE25} sample/etc/named.conf
-cp -fp %{SOURCE26} sample/etc/named.rfc1912.zones
-cp -fp %{SOURCE27} sample/etc/
-cp -fp %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} sample/var/named
+cp -fp ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones sample/etc/named.rfc1912.zones
+cp -fp ${RPM_BUILD_ROOT}/var/named/{named.ca,named.localhost,named.loopback,named.empty}  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; 
@@ -722,6 +710,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Jun 13 2007 Adam Tkac <atkac redhat com> 31:9.4.1-7.fc8
+- marked caching-nameserver as obsolete (#244604)
+- fixed typo in initscript (causes that named doesn't detect NetworkManager
+  correctly)
+- next cleanup in configuration - moved configfiles into config.tar
+- removed delay between start & stop in restart function in named.init
+
 * Tue Jun 12 2007 Adam Tkac <atkac redhat com> 31:9.4.1-6.fc8
 - major changes in initscript. Could be LSB compatible now
 - removed caching-nameserver subpackage. Move configs from this
diff --git a/named.conf b/named.conf
deleted file mode 100644
index efd7e56..0000000
--- a/named.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// named.caching-nameserver.conf
-//
-// 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).
-//
-// See /usr/share/doc/bind*/sample/ for example named configuration files.
-//
-// DO NOT EDIT THIS FILE - use system-config-bind or an editor
-// to create named.conf - edits to this file will be lost on 
-// caching-nameserver package upgrade.
-//
-
-options {
-	listen-on port 53 { 127.0.0.1; };
-	listen-on-v6 port 53 { ::1; };
-	directory 	"/var/named";
-	dump-file 	"/var/named/data/cache_dump.db";
-        statistics-file "/var/named/data/named_stats.txt";
-        memstatistics-file "/var/named/data/named_mem_stats.txt";
-	allow-query     { localhost; };
-	recursion yes;
-};
-
-logging {
-        channel default_debug {
-                file "data/named.run";
-                severity dynamic;
-        };
-};
-
-zone "." IN {
-	type hint;
-	file "named.ca";
-};
-
-include "/etc/named.rfc1912.zones";
-
diff --git a/named.init b/named.init
index 8c3176e..2e1863a 100755
--- a/named.init
+++ b/named.init
@@ -53,7 +53,7 @@ if [ -z $dbusEnabled ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then
       dbusEnabled=1;
     fi;
   done
-  [ -z $NetworkManagerEnabled ] || OPTIONS="$OPTIONS -D";
+  [ -z $dbusEnabled ] || OPTIONS="$OPTIONS -D";
 fi;
 
 # Check if all what named needs running
@@ -212,7 +212,6 @@ rhstatus() {
 }	
 restart() {
 	stop
-	sleep 2
 	start
 }	
 reload() {
diff --git a/named.localhost b/named.localhost
deleted file mode 100644
index 26d4f87..0000000
--- a/named.localhost
+++ /dev/null
@@ -1,10 +0,0 @@
-$TTL 1D
-@	IN SOA	localhost. root.localhost. (
-						0	; serial
-						3H	; refresh
-						1H	; retry
-						1W	; expire
-						3H )	; minimum
-@	IN	NS	localhost.
-@	IN	A	127.0.0.1
-@	IN	AAAA	::1
diff --git a/named.loopback b/named.loopback
deleted file mode 100644
index 1f69aa9..0000000
--- a/named.loopback
+++ /dev/null
@@ -1,9 +0,0 @@
-$TTL 1D
-@	IN SOA	localhost. root.localhost. (
-						0	; serial
-						3H	; refresh
-						1H	; retry
-						1W	; expire
-						3H )	; minimum
-	IN	NS	localhost.
-	IN	PTR	localhost.
diff --git a/named.rfc1912.zones b/named.rfc1912.zones
deleted file mode 100644
index d3ae226..0000000
--- a/named.rfc1912.zones
+++ /dev/null
@@ -1,40 +0,0 @@
-// named.rfc1912.zones:
-//
-// 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
-// 
-// See /usr/share/doc/bind*/sample/ for example named configuration files.
-//
-
-zone "localhost.localdomain" IN {
-	type master;
-	file "named.localhost";
-	allow-update { none; };
-};
-
-zone "localhost" IN {
-	type master;
-	file "named.localhost";
-	allow-update { none; };
-};
-
-zone "1.0.0.127.in-addr.arpa" IN {
-	type master;
-	file "named.loopback";
-	allow-update { none; };
-};
-
-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN {
-	type master;
-	file "named.loopback";
-	allow-update { none; };
-};
-
-zone "0.in-addr.arpa" IN {			// "this" network
-	type master;
-	file "named.empty";
-	allow-update { none; };
-};
-
diff --git a/named.rfc1912.zones.sample b/named.rfc1912.zones.sample
deleted file mode 100644
index c9b4aaf..0000000
--- a/named.rfc1912.zones.sample
+++ /dev/null
@@ -1,40 +0,0 @@
-// named.rfc1912.zones:
-//
-// ISC BIND named zone configuration for zones recommended by
-// RFC 1912 section 4.1 : localhost TLDs and address zones
-// 
-zone "localdomain" IN {
-	type master;
-	file "localdomain.zone";
-	allow-update { none; };
-};
-
-zone "localhost" IN {
-	type master;
-	file "localhost.zone";
-	allow-update { none; };
-};
-
-zone "0.0.127.in-addr.arpa" IN {
-	type master;
-	file "named.local";
-	allow-update { none; };
-};
-
-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN {
-        type master;
-	file "named.ip6.local";
-	allow-update { none; };
-};
-
-zone "255.in-addr.arpa" IN {
-	type master;
-	file "named.broadcast";
-	allow-update { none; };
-};
-
-zone "0.in-addr.arpa" IN {
-	type master;
-	file "named.zero";
-	allow-update { none; };
-};
diff --git a/named.root b/named.root
deleted file mode 100644
index c6c435c..0000000
--- a/named.root
+++ /dev/null
@@ -1,80 +0,0 @@
-;       This file holds the information on root name servers needed to
-;       initialize cache of Internet domain name servers
-;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers).
-;
-;       This file is made available by InterNIC 
-;       under anonymous FTP as
-;           file                /domain/named.cache
-;           on server           FTP.INTERNIC.NET
-;       -OR-                    RS.INTERNIC.NET
-;
-;       last update:    Jan 29, 2004
-;       related version of root zone:   2004012900
-;
-;
-; formerly NS.INTERNIC.NET
-;
-.                        3600000  IN  NS    A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-;
-; formerly NS1.ISI.EDU
-;
-.                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
-;
-; formerly C.PSI.NET
-;
-.                        3600000      NS    C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-;
-; formerly TERP.UMD.EDU
-;
-.                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     128.8.10.90
-;
-; formerly NS.NASA.GOV
-;
-.                        3600000      NS    E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
-;
-; formerly NS.ISC.ORG
-;
-.                        3600000      NS    F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-;
-; formerly NS.NIC.DDN.MIL
-;
-.                        3600000      NS    G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
-;
-; formerly AOS.ARL.ARMY.MIL
-;
-.                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
-;
-; formerly NIC.NORDU.NET
-;
-.                        3600000      NS    I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-;
-; operated by VeriSign, Inc.
-;
-.                        3600000      NS    J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
-;
-; operated by RIPE NCC
-;
-.                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129 
-;
-; operated by ICANN
-;
-.                        3600000      NS    L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET.      3600000      A     198.32.64.12
-;
-; operated by WIDE
-;
-.                        3600000      NS    M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-; End of File
diff --git a/named.root.hints b/named.root.hints
deleted file mode 100644
index 7c5971d..0000000
--- a/named.root.hints
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//   The 'named.root' root cache hints zone for the bind DNS 'named' nameserver.
-//
-//   named's cache must be primed with the addresses of the root zone '.' nameservers. 
-//   The root zone file can be obtained by querying the root 'A' nameserver:
-//     $ dig . ns @198.41.0.4 > named.root
-//   Or by download via FTP / HTTP:
-//     $ wget ftp://ftp.rs.internic.net/domain/named.root 
-//   
-//   Every view that is to provide recursive service must include this zone.
-//
-zone "." IN {
-	type hint;
-	file "named.root";
-};
\ No newline at end of file
diff --git a/sources b/sources
index e99e8fd..607ce30 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 09b54d35036cb0423b2e618f21766285  bind-9.4.1.tar.gz
 dd2b4f4b795a0a989b0a01f93db3a57b  bind-chroot.tar.bz2
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz
+ba44f6cbd6d54dcb4d357a44276ba294  config.tar