From 7da09593f3aebde022771d725bd0ec5426fe12f0cd1665e09d80249e132b06c8 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 14 Dec 2018 10:02:44 +0000 Subject: [PATCH 1/3] - Make sure to generate correct sysconfig file (boo#1117147) - Update clknetsim to revision 8b48422 OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=61 --- chrony.changes | 6 ++++++ chrony.spec | 4 ++-- clknetsim-8b48422.tar.gz | 3 +++ clknetsim-cdf5e85.tar.gz | 3 --- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 clknetsim-8b48422.tar.gz delete mode 100644 clknetsim-cdf5e85.tar.gz diff --git a/chrony.changes b/chrony.changes index ea1d4eb..4c26dfa 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 14 08:05:35 UTC 2018 - Martin Pluskal + +- Make sure to generate correct sysconfig file (boo#1117147) +- Update clknetsim to revision 8b48422 + ------------------------------------------------------------------- Thu Nov 22 09:27:58 UTC 2018 - Martin Pluskal diff --git a/chrony.spec b/chrony.spec index a2fe0ee..94fdb98 100644 --- a/chrony.spec +++ b/chrony.spec @@ -17,7 +17,7 @@ %define vendorzone opensuse. -%global clknetsim_ver cdf5e85 +%global clknetsim_ver 8b48422 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates @@ -193,7 +193,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/ %service_del_preun chronyd.service chrony-wait.service %post -%fillup_only %{name} +%fillup_only -n chronyd %tmpfiles_create %{name}.conf %service_add_post chronyd.service chrony-wait.service diff --git a/clknetsim-8b48422.tar.gz b/clknetsim-8b48422.tar.gz new file mode 100644 index 0000000..502f3dd --- /dev/null +++ b/clknetsim-8b48422.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d12ea5345b68c3e18da4a4e18af5ccbe138f1832cb20d807a1ed0aaea7b8055e +size 42144 diff --git a/clknetsim-cdf5e85.tar.gz b/clknetsim-cdf5e85.tar.gz deleted file mode 100644 index 0710701..0000000 --- a/clknetsim-cdf5e85.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:780aff25c66537ee30e2b3c5a3fa10afeda5b8b55dc6c326bcd193e0a210bccc -size 42027 From ab0c0bf492cfc31f26c0ce3973f32d83d292dadcdb025514c82c9ae3a83e2f8a Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 20 Dec 2018 17:43:50 +0000 Subject: [PATCH 2/3] - Read runtime servers from /var/run/netconfig/chrony.servers to fix bsc#1099272. - Move chrony-helper to /usr/lib/chrony/helper, because there should be no executables in /usr/share. OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=62 --- chrony-service-helper.patch | 2 +- chrony.changes | 8 ++++++++ chrony.helper | 2 +- chrony.spec | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/chrony-service-helper.patch b/chrony-service-helper.patch index 50d7964..0b1af69 100644 --- a/chrony-service-helper.patch +++ b/chrony-service-helper.patch @@ -4,7 +4,7 @@ PIDFile=/var/run/chrony/chronyd.pid EnvironmentFile=-/etc/sysconfig/chronyd ExecStart=/usr/sbin/chronyd $OPTIONS -+ExecStartPost=/usr/share/chrony-helper update-daemon ++ExecStartPost=/usr/lib/chrony/chrony-helper update-daemon PrivateTmp=yes ProtectHome=yes ProtectSystem=full diff --git a/chrony.changes b/chrony.changes index 4c26dfa..e0ecc95 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 20 16:48:14 UTC 2018 - Reinhard Max + +- Read runtime servers from /var/run/netconfig/chrony.servers to + fix bsc#1099272. +- Move chrony-helper to /usr/lib/chrony/helper, because there + should be no executables in /usr/share. + ------------------------------------------------------------------- Fri Dec 14 08:05:35 UTC 2018 - Martin Pluskal diff --git a/chrony.helper b/chrony.helper index a9c802b..d73bddb 100644 --- a/chrony.helper +++ b/chrony.helper @@ -9,7 +9,7 @@ helper_dir=/var/run/chrony-helper added_servers_file=$helper_dir/added_servers network_sysconfig_file=/etc/sysconfig/network -dhclient_servers_files=/var/lib/dhclient/chrony.servers.* +dhclient_servers_files=/var/run/netconfig/chrony.servers dnssrv_servers_files=$helper_dir/dnssrv@* dnssrv_timer_prefix=chrony-dnssrv@ diff --git a/chrony.spec b/chrony.spec index 94fdb98..637af21 100644 --- a/chrony.spec +++ b/chrony.spec @@ -170,7 +170,7 @@ echo 'chronyd.service' > \ install -Dpm 0644 %{SOURCE2} \ %{buildroot}%{_fillupdir}/sysconfig.chrony install -Dpm 755 %{SOURCE4} \ - %{buildroot}%{_datadir}/chrony-helper + %{buildroot}%{_libexecdir}/%name/helper install -d %{buildroot}%{_localstatedir}/log/chrony touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc} @@ -214,7 +214,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/ %{_sysconfdir}/dhcp/dhclient.d/chrony.sh %{_bindir}/chronyc %{_sbindir}/chronyd -%{_datadir}/chrony-helper +%{_libexecdir}/%name %{_mandir}/man1/chronyc.1%{?ext_man} %{_mandir}/man5/chrony.conf.5%{?ext_man} %{_mandir}/man8/chronyd.8%{?ext_man} From f1d34b88859f64d50cb670beae1a25e23f19342840aedfac6e0f7623099fc447 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 20 Dec 2018 18:02:56 +0000 Subject: [PATCH 3/3] typo OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=63 --- chrony-service-helper.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrony-service-helper.patch b/chrony-service-helper.patch index 0b1af69..9e5a9b5 100644 --- a/chrony-service-helper.patch +++ b/chrony-service-helper.patch @@ -4,7 +4,7 @@ PIDFile=/var/run/chrony/chronyd.pid EnvironmentFile=-/etc/sysconfig/chronyd ExecStart=/usr/sbin/chronyd $OPTIONS -+ExecStartPost=/usr/lib/chrony/chrony-helper update-daemon ++ExecStartPost=/usr/lib/chrony/helper update-daemon PrivateTmp=yes ProtectHome=yes ProtectSystem=full