Accepting request 621328 from home:kukuk:branches:network

- Add bind.conf and bind-chrootenv.conf to install the default
  files in /var/lib/named and create chroot environment on systems
  using transactional-updates [bsc#1100369] [FATE#325524].

OBS-URL: https://build.opensuse.org/request/show/621328
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=249

bind-chrootenv.conf

@@ -0,0 +1,16 @@
+# See tmpfiles.d(5) for details
+#Type Path        Mode UID  GID  Age Argument
+d /var/lib/named 755 named named - -
+d /var/lib/named/dev 755 root root - -
+c /var/lib/named/dev/null 666 root root - 1:3
+c /var/lib/named/dev/random 666 root root - 1:8
+c /var/lib/named/dev/urandom 664 root root - 1:9
+d /var/lib/named/etc 755 root root - -
+d /var/lib/named/etc/named.d 755 root root - -
+d /var/lib/named/log 755 named named - -
+d /var/lib/named/var - - - - -
+d /var/lib/named/var/lib - - - - -
+L /var/lib/named/var/lib/named - - - - ../..
+L /var/lib/named/var/log - - - - ../log
+d /var/lib/named/var/run - - - - -
+d /var/lib/named/var/run/named 755 named named - -

bind.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul  6 11:09:23 CEST 2018 - kukuk@suse.de
+
+- Add bind.conf and bind-chrootenv.conf to install the default
+  files in /var/lib/named and create chroot environment on systems
+  using transactional-updates [bsc#1100369] [FATE#325524].
+
 -------------------------------------------------------------------
 Fri Jun 22 15:10:39 CEST 2018 - kukuk@suse.de
 

bind.conf

@@ -0,0 +1,10 @@
+# See tmpfiles.d(5) for details
+#Type Path        Mode UID  GID  Age Argument
+d /var/lib/named 755 named named - -
+d /var/lib/named/dyn 755 named named - -
+d /var/lib/named/master 755 named named - -
+d /var/lib/named/slave 755 named named - -
+C /var/lib/named/127.0.0.zone - - - - -
+C /var/lib/named/localhost.zone - - - - -
+C /var/lib/named/named.root.key - - - - -
+C /var/lib/named/root.hint - - - - -

bind.spec

@@ -70,6 +70,9 @@ Source9:        ftp://ftp.internic.net/domain/named.root
 # url http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt no longer exists...
 Source40:       dnszone-schema.txt
 Source60:       dlz-schema.txt
+# configuation files for systemd-tmpfiles
+Source70:       bind.conf
+Source71:       bind-chrootenv.conf
 Patch0:         configure.in.diff
 Patch1:         Makefile.in.diff
 Patch2:         bind-99-libidn.patch
@@ -408,6 +411,11 @@ done
                 install -m 0755 vendor-files/system/${file}.init %{buildroot}/usr/sbin/${file}.init
 		ln -s /sbin/service %{buildroot}%{_sbindir}/rc${file}
 	done
+	install -D -m 0644 %{SOURCE70} %{buildroot}%{_prefix}/lib/tmpfiles.d/bind.conf
+	install -D -m 0644 %{SOURCE71} %{buildroot}%{_prefix}/lib/tmpfiles.d/bind-chrootenv.conf
+	install -D -m 0644 ${RPM_SOURCE_DIR}/named.root %{buildroot}%{_datadir}/factory%{_localstatedir}/lib/named/root.hint
+	install -m 0644 vendor-files/config/{127.0.0,localhost}.zone %{buildroot}%{_datadir}/factory%{_localstatedir}/lib/named
+	install -m 0644 bind.keys %{buildroot}%{_datadir}/factory%{_localstatedir}/lib/named/named.root.key
 %else
 	for file in lwresd named; do
 		install -m 0754 vendor-files/init/${file} %{buildroot}%{_initddir}/${file}
@@ -469,6 +477,7 @@ install -m 0644 bind.keys %{buildroot}%{_localstatedir}/lib/named/named.root.key
 %if %{with_systemd}
 %{fillup_only -nsa named named}
 %service_add_post named.service
+%tmpfiles_create bind.conf
 %else
 %{fillup_and_insserv -nf named}
 if [ -x %{_bindir}/systemctl ]; then
@@ -509,6 +518,9 @@ fi
 %post chrootenv
 %{fillup_only -nsa named common}
 %{fillup_only -nsa syslog named}
+%if %{with_systemd}
+%tmpfiles_create bind-chrootenv.conf
+%endif
 
 %pre lwresd
 %{GROUPADD_NAMED}
@@ -556,6 +568,8 @@ fi
 %if %{with_systemd}
 %config %{_unitdir}/named.service
 %{_sbindir}/named.init
+%{_prefix}/lib/tmpfiles.d/bind.conf
+%{_datadir}/factory
 %else
 %config /%{_sysconfdir}/init.d/named
 %endif
@@ -613,6 +627,9 @@ fi
 %{_libdir}/liblwres.so.%{lwres_sonum}*
 
 %files chrootenv
+%if %{with_systemd}
+%{_prefix}/lib/tmpfiles.d/bind-chrootenv.conf
+%endif
 %attr(-,named,named) %dir %{_var}/lib/named
 %dir %{_var}/lib/named%{_sysconfdir}
 %dir %{_var}/lib/named%{_sysconfdir}/named.d