Hello community,
here is the log from the commit of package unbound for openSUSE:Factory checked
in at 2018-12-27 00:21:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/unbound (Old)
and /work/SRC/openSUSE:Factory/.unbound.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unbound"
Thu Dec 27 00:21:42 2018 rev:32 rq:660459 version:1.8.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/unbound/unbound.changes 2018-12-19
13:25:09.865254102 +0100
+++ /work/SRC/openSUSE:Factory/.unbound.new.28833/unbound.changes
2018-12-27 00:21:43.492038580 +0100
@@ -7,0 +8,5 @@
+Tue Dec 11 17:44:56 UTC 2018 - Rubén Torrero Marijnissen
<rtorreromarijnis...@suse.com>
+
+- Migrate from cron to systemd timers (bsc#1115417)
+
+-------------------------------------------------------------------
Old:
----
unbound.cron
New:
----
unbound-anchor.service
unbound-anchor.timer
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unbound.spec ++++++
--- /var/tmp/diff_new_pack.nzPlo7/_old 2018-12-27 00:21:44.380037858 +0100
+++ /var/tmp/diff_new_pack.nzPlo7/_new 2018-12-27 00:21:44.384037855 +0100
@@ -109,9 +109,10 @@
Source12: icannbundle.pem
Source13: root.anchor
Source14: unbound.sysconfig
-Source15: unbound.cron
+Source15: unbound-anchor.timer
Source16: unbound-munin.README
Source17: unbound.firewall
+Source18: unbound-anchor.service
Summary: Validating, recursive, and caching DNS(SEC) resolver
License: BSD-3-Clause
@@ -171,7 +172,6 @@
%package anchor
#
-Requires: cron
Summary: Unbound Anchor cert management tools
Group: Productivity/Networking/DNS/Servers
@@ -240,9 +240,9 @@
ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcunbound
ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcunbound-keygen
+install -p -m 0644 %{SOURCE15} %{buildroot}%{_unitdir}/unbound-anchor.timer
+install -p -m 0644 %{SOURCE18}
%{buildroot}%{_unitdir}/unbound-anchor.service
install -p -m 0644 %{SOURCE16} .
-install -d 0755 %{buildroot}%{_sysconfdir}/cron.d
-install -p -m 0644 %{SOURCE15}
%{buildroot}%{_sysconfdir}/cron.d/unbound-anchor
install -d 0755 %{buildroot}%{fwdir}
install -p -m 0644 %{SOURCE17} %{buildroot}%{fwdir}/%{name}
@@ -306,6 +306,7 @@
make check ||:
%pre anchor
+%service_add_pre unbound-anchor.service unbound-anchor.timer
getent group unbound >/dev/null || groupadd -r unbound
getent passwd unbound >/dev/null || \
useradd -g unbound -s /bin/false -r -c "unbound caching DNS server" \
@@ -316,6 +317,11 @@
%service_add_pre unbound-keygen.service unbound.service
%endif
+%post anchor
+%if %{with systemd}
+%service_add_post unbound-anchor.service unbound-anchor.timer
+%endif
+
%post
%fillup_only %{name}
%if %{with systemd}
@@ -323,6 +329,11 @@
%service_add_post unbound-keygen.service unbound.service
%endif
+%preun anchor
+%if %{with systemd}
+%service_del_preun unbound-anchor.service unbound-anchor.timer
+%endif
+
%preun
%if %{with systemd}
%service_del_preun unbound-keygen.service unbound.service
@@ -330,6 +341,11 @@
%stop_on_removal %{name}
%endif
+%postun anchor
+%if %{with systemd}
+%service_del_postun unbound-anchor.service unbound-anchor.timer
+%endif
+
%postun
%if %{with systemd}
%service_del_postun unbound-keygen.service unbound.service
@@ -418,7 +434,8 @@
%dir %{_sysconfdir}/%{name}/
%{_sbindir}/unbound-anchor
%config %{_sysconfdir}/%{name}/icannbundle.pem
-%config %{_sysconfdir}/cron.d/unbound-anchor
+%{_unitdir}/unbound-anchor.timer
+%{_unitdir}/unbound-anchor.service
%dir %attr(-,unbound,unbound) %{_sharedstatedir}/%{name}
%attr(0644,unbound,unbound) %config(noreplace)
%{_sharedstatedir}/%{name}/root.key
%attr(0644,root,unbound) %config(noreplace)
%{_sysconfdir}/%{name}/dlv.isc.org.key
++++++ unbound-anchor.service ++++++
[Unit]
Description=update of the root trust anchor for DNSSEC validation in unbound
Documentation=man:unbound-anchor(8)
[Service]
Type=oneshot
User=unbound
ExecStart=/usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c
/etc/unbound/icannbundle.pem
SuccessExitStatus=1
++++++ unbound-anchor.timer ++++++
[Unit]
Description=daily update of the root trust anchor for DNSSEC
Documentation=man:unbound-anchor(8)
[Timer]
# Current DNSKEY TTL in root zone is 172800 seconds, i.e. 172800/60/60/24 = 2
days.
# It means that unboud-anchor should be run at least once a day.
OnCalendar=daily
Persistent=true
AccuracySec=24h
[Install]
WantedBy=timers.target
++++++ unbound.service ++++++
--- /var/tmp/diff_new_pack.nzPlo7/_old 2018-12-27 00:21:44.556037715 +0100
+++ /var/tmp/diff_new_pack.nzPlo7/_new 2018-12-27 00:21:44.556037715 +0100
@@ -3,6 +3,7 @@
After=syslog.target network.target
After=unbound-keygen.service
Wants=unbound-keygen.service
+Wants=unbound-anchor.timer
Before=nss-lookup.target
Wants=nss-lookup.target
