From 463476dd2f6054d1f52de6c581f428a50b78bdb6 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Sep 15 2009 15:34:16 +0000
Subject: - improve chroot related documentation (#507795)

- add NetworkManager dispatcher script to reload named when network
    interface is activated/deactivated (#490275)
- don't set/unset named_write_master_zones SELinux boolean every time in
    initscript, modify it only when it's actually needed

---

diff --git a/bind.spec b/bind.spec
index df54630..024f320 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:  9.%{PATCHVER}%{?dist}
+Release:  10.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +30,7 @@ Source:   ftp://ftp.isc.org/isc/bind9/%{VERSION}/bind-%{VERSION}.tar.gz
 Source1:  named.sysconfig
 Source2:  named.init
 Source3:  named.logrotate
+Source4:  named.NetworkManager
 Source5:  rfc1912.txt
 Source7:  bind-9.3.1rc1-sdb_tools-Makefile.in
 Source8:  dnszone.schema
@@ -292,7 +293,7 @@ cp  --preserve=timestamps %{SOURCE5} doc/rfc
 gzip -9 doc/rfc/*
 
 # Build directory hierarchy
-mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d}
+mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d,NetworkManager/dispatcher.d}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/bind
 mkdir -p ${RPM_BUILD_ROOT}/var/named/{slaves,data,dynamic}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
@@ -318,6 +319,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 install -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named
 install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
+install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}/etc/NetworkManager/dispatcher.d/13-named
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
 %if %{SDB}
@@ -493,6 +495,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/bind
 %config(noreplace) %{_sysconfdir}/sysconfig/named
 %{_sysconfdir}/rc.d/init.d/named
+%{_sysconfdir}/NetworkManager/dispatcher.d/13-named
 %{_sbindir}/dnssec*
 %{_sbindir}/named-check*
 %{_sbindir}/lwresd
@@ -582,6 +585,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Thu Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.6.1-10.P1
+- improve chroot related documentation (#507795)
+- add NetworkManager dispatcher script to reload named when network interface is
+  activated/deactivated (#490275)
+- don't set/unset named_write_master_zones SELinux boolean every time in 
+  initscript, modify it only when it's actually needed
+
 * Tue Sep 01 2009 Adam Tkac <atkac redhat com> 32:9.6.1-9.P1
 - next attempt to fix the postun trigger (#520385)
 - remove obsolete bind-9.3.1rc1-fix_libbind_includedir.patch
diff --git a/named.NetworkManager b/named.NetworkManager
new file mode 100644
index 0000000..bd9a588
--- /dev/null
+++ b/named.NetworkManager
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Check if named is running
+/sbin/service named status > /dev/null 2>&1 || exit 0
+
+[ "$2" = 'up' -o "$2" = 'down' ] && /sbin/service named reload
diff --git a/named.init b/named.init
index 6dd4311..0d40dfb 100755
--- a/named.init
+++ b/named.init
@@ -50,12 +50,16 @@ fi
 # 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
+  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'off' ]; then
+      setsebool named_write_master_zones 1
+  fi;
 else
   chown root.named /var/named
-  [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
-    setsebool named_write_master_zones 0
+  if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled &&
+    [ `getsebool named_write_master_zones | awk '{ print $3; }'` = 'on' ]; then
+      setsebool named_write_master_zones 0
+  fi;
 fi
 
 ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf
diff --git a/named.sysconfig b/named.sysconfig
index 7c4e9e0..da4c724 100644
--- a/named.sysconfig
+++ b/named.sysconfig
@@ -22,7 +22,10 @@
 #          - /etc/rndc.key
 #          - /etc/named.rfc1912.zones
 #          - /etc/named.dnssec.keys
-#                          
+#
+#	Don't forget to add "$AddUnixListenSocket /var/named/chroot/dev/log"
+#	line to your /etc/rsyslog.conf file. Otherwise your logging becomes
+#	broken when rsyslogd daemon is restarted (due update, for example).
 #
 # OPTIONS="whatever"     --  These additional options will be passed to named
 #                            at startup. Don't add -t here, use ROOTDIR instead.