- 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
This commit is contained in:
2016-06-16 12:00:45 +00:00
committed by Git OBS Bridge
parent 2e4b7daa78
commit 8b99b04f2a
3 changed files with 21 additions and 12 deletions

View File

@@ -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