From 8b99b04f2a986e58eb18287576d3d70dc20f3c473e62ece3ef2d16095491660f Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Thu, 16 Jun 2016 12:00:45 +0000
Subject: [PATCH] - Remove the start/stop dependency of named and lwresd on
 remote-fs   to break a service dependency cycle (bsc#947483, bsc#963971). -
 Make /var/lib/named owned by the named user (bsc#908850,   bsc#875691). -
 Call systemd service macros with the full service name. - Security update
 9.10.3-P4:

OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=194
---
 bind.changes         | 11 ++++++++++-
 bind.spec            | 18 +++++++++---------
 vendor-files.tar.bz2 |  4 ++--
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/bind.changes b/bind.changes
index 8ce7f60..b663378 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 16 09:57:29 UTC 2016 - max@suse.com
+
+- Remove the start/stop dependency of named and lwresd on remote-fs
+  to break a service dependency cycle (bsc#947483, bsc#963971).
+- Make /var/lib/named owned by the named user (bsc#908850,
+  bsc#875691).
+- Call systemd service macros with the full service name.
+
 -------------------------------------------------------------------
 Thu Apr 14 09:56:18 UTC 2016 - lnussel@suse.de
 
@@ -7,7 +16,7 @@ Thu Apr 14 09:56:18 UTC 2016 - lnussel@suse.de
 -------------------------------------------------------------------
 Fri Mar 11 13:56:10 UTC 2016 - max@suse.com
 
-- Security update 9.10.3-P3:
+- Security update 9.10.3-P4:
   * CVE-2016-1285, bsc#970072: assert failure on input parsing can
     cause premature exit.
   * CVE-2016-1286, bsc#970073: An error when parsing signature
diff --git a/bind.spec b/bind.spec
index 4f4c6c5..2870fcb 100644
--- a/bind.spec
+++ b/bind.spec
@@ -591,13 +591,13 @@ test -e ${TEMP_SYSCONFIG_FILE} && \
 	old ${TEMP_SYSCONFIG_FILE}
 echo "NAMED_RUN_CHROOTED=\"${NAMED_RUN_CHROOTED}\"" >${TEMP_SYSCONFIG_FILE}
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230
-%service_add_pre named
+%service_add_pre named.service
 %endif
 
 %preun
 %stop_on_removal named
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230
-%service_del_preun named
+%service_del_preun named.service
 %endif
 
 %post
@@ -717,14 +717,14 @@ if [ -f ${NAMED_ACTIVE_FILE} ]; then
 	test ! -s ${NAMED_ACTIVE_FILE} && rm -f ${NAMED_ACTIVE_FILE}
 fi
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230
-%service_add_post named
+%service_add_post named.service
 %endif
 
 %postun
 %restart_on_update named
 %insserv_cleanup
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230
-%service_del_postun named
+%service_del_postun named.service
 %endif
 
 %post   -n libbind9-140 -p /sbin/ldconfig
@@ -760,7 +760,7 @@ fi
 %{GROUPADD_NAMED}
 %{USERADD_NAMED}
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230
-%service_add_pre lwresd
+%service_add_pre lwresd.service
 %endif
 
 %post lwresd
@@ -778,20 +778,20 @@ if [ $1 -le 1 ]; then
     %{fillup_and_insserv -fy lwresd}
 fi;
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230
-%service_add_post lwresd
+%service_add_post lwresd.service
 %endif
 
 %preun lwresd
 %stop_on_removal lwresd
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230
-%service_del_preun lwresd
+%service_del_preun lwresd.service
 %endif
 
 %postun lwresd
 %restart_on_update lwresd
 %insserv_cleanup
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1230
-%service_del_postun lwresd
+%service_del_postun lwresd.service
 %endif
 
 %post utils
@@ -910,7 +910,7 @@ fi
 
 %files chrootenv
 %defattr(-,root,root)
-%dir %{_var}/lib/named
+%attr(-,named,named) %dir %{_var}/lib/named
 %dir %{_var}/lib/named/etc
 %dir %{_var}/lib/named/etc/named.d
 %dir %{_var}/lib/named/dev
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 5e259cb..510447a 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4f97ac0bc0800e12c6f870d651d15d507f00a35968deb16f1197f4b24b27b98
-size 22288
+oid sha256:9bd557bc9cbee350d74ab1a94b7a10aa0a627ff9463f8d7a3a20118d8a3f9024
+size 22275