From 7323239b7410430ad21a8844aa9b930394b89a9f Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Mon, 13 Jul 2009 13:02:42 +0000
Subject: [PATCH] - fix broken symlinks in bind-libs (#509635) - fix typos in
 /etc/sysconfig/named (#509650) - add DEBUG option to /etc/sysconfig/named
 (#510283)

---
 bind.spec       | 13 ++++++++++++-
 named.init      | 11 +++++++++++
 named.sysconfig |  7 ++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/bind.spec b/bind.spec
index 5e87ac6..abe0121 100644
--- a/bind.spec
+++ b/bind.spec
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  2%{?dist}
+Release:  3%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -426,6 +426,12 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
+# bind-libs between 32:9.6.1-0.1.b1 and 32:9.6.1-0.4.rc1 have bigger SOnames
+# than current bind - https://bugzilla.redhat.com/show_bug.cgi?id=509635.
+# Remove this trigger when SOnames get bigger.
+%triggerpostun -n bind-libs -- bind-libs > 32:9.6.1-0.1.b1
+/sbin/ldconfig
+
 %post chroot
 if [ "$1" -gt 0 ]; then
   [ -e %{chroot_prefix}/dev/random ] || \
@@ -577,6 +583,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Jul 13 2009 Adam Tkac <atkac redhat com> 32:9.6.1-3
+- fix broken symlinks in bind-libs (#509635)
+- fix typos in /etc/sysconfig/named (#509650)
+- add DEBUG option to /etc/sysconfig/named (#510283)
+
 * Wed Jun 24 2009 Adam Tkac <atkac redhat com> 32:9.6.1-2
 - improved "chroot automount" patches (#504596)
 - host should fail if specified server doesn't respond (#507469)
diff --git a/named.init b/named.init
index af4f9f1..6dd4311 100755
--- a/named.init
+++ b/named.init
@@ -47,6 +47,17 @@ fi
   [ /etc/sysconfig/dnssec -nt /etc/named.conf ] && \
    /usr/sbin/dnssec-configure -b --norestart --dnssec="$DNSSEC" --dlv="$DLV"
 
+# Enable/disable debugging
+if [ "x$DEBUG" = 'xyes' ]; then
+  chown named.named /var/named
+  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    setsebool named_write_master_zones 1
+else
+  chown root.named /var/named
+  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    setsebool named_write_master_zones 0
+fi
+
 ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf
 /etc/named.dnssec.keys /etc/named.rfc1912.zones /etc/rndc.conf /etc/rndc.key
 /usr/lib64/bind /usr/lib/bind'
diff --git a/named.sysconfig b/named.sysconfig
index 0bf0462..7c4e9e0 100644
--- a/named.sysconfig
+++ b/named.sysconfig
@@ -13,7 +13,7 @@
 #          - /var/named
 #          - /etc/pki/dnssec-keys
 #          - /etc/named
-#          - /usr/lib64/bind of /usr/lib/bind (architecture dependant)
+#          - /usr/lib64/bind or /usr/lib/bind (architecture dependent)
 #
 #	  Those files are mounted as well if target file doesn't exist in
 #	  chroot.
@@ -28,3 +28,8 @@
 #                            at startup. Don't add -t here, use ROOTDIR instead.
 #
 # KEYTAB_FILE="/dir/file"    --  Specify named service keytab file (for GSS-TSIG)
+#
+# DEBUG="yes|no"         -- This option controls if you would like to debug
+# 			    named process. If you set this option to "yes" then
+# 			    /var/named/ directory become writable by named user
+# 			    and named will be able to write core dumps there.