diff --git a/chrony-3.3.tar.gz b/chrony-3.3.tar.gz deleted file mode 100644 index 5ca4bea..0000000 --- a/chrony-3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d1fb2d5875032f2d5a86f3770374c87ee4c941916f64171e81f7684f2a73128 -size 443571 diff --git a/chrony-3.3.tar.gz.sig b/chrony-3.3.tar.gz.sig deleted file mode 100644 index 200e8ab..0000000 --- a/chrony-3.3.tar.gz.sig +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iEYEABECAAYFAlrEnuoACgkQX/BvKboeATuMFQCfdu4xtf+APWbPOs3xGi0hSiaH -okQAnA/in5HE5qsRQoZQ8yi4MhOX4++X -=OZtM ------END PGP SIGNATURE----- diff --git a/chrony-3.4.tar.gz b/chrony-3.4.tar.gz new file mode 100644 index 0000000..7035212 --- /dev/null +++ b/chrony-3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af77e47c2610a7e55c8af5b89a8aeff52d9a867dd5983d848b52d374bc0e6b9f +size 453056 diff --git a/chrony-3.4.tar.gz.sig b/chrony-3.4.tar.gz.sig new file mode 100644 index 0000000..0b624ec --- /dev/null +++ b/chrony-3.4.tar.gz.sig @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iEYEABECAAYFAluiX4wACgkQX/BvKboeATukKwCgiOP+vit+FJmLF35yA1Fv+/ZG +2TIAnRKuUmsMZN7lz/95pl1ex+hWMPqd +=/3Fe +-----END PGP SIGNATURE----- diff --git a/chrony-service-helper.patch b/chrony-service-helper.patch index 618d0a2..50d7964 100644 --- a/chrony-service-helper.patch +++ b/chrony-service-helper.patch @@ -1,7 +1,7 @@ ---- chrony-3.1/examples/chronyd.service 2017-01-31 05:22:11.000000000 -0500 -+++ chrony-3.1/examples/chronyd.service 2017-01-31 12:00:01.000000000 -0500 +--- chrony-3.4/examples/chronyd.service 2018-09-19 16:38:15.000000000 +0200 ++++ chrony-3.4/examples/chronyd.service 2018-09-19 20:49:29.444128690 +0200 @@ -10,6 +10,7 @@ - PIDFile=/var/run/chronyd.pid + PIDFile=/var/run/chrony/chronyd.pid EnvironmentFile=-/etc/sysconfig/chronyd ExecStart=/usr/sbin/chronyd $OPTIONS +ExecStartPost=/usr/share/chrony-helper update-daemon diff --git a/chrony-tmpfiles b/chrony-tmpfiles new file mode 100644 index 0000000..4db3879 --- /dev/null +++ b/chrony-tmpfiles @@ -0,0 +1 @@ +d /run/chrony 0755 chrony chrony \ No newline at end of file diff --git a/chrony.changes b/chrony.changes index 639e276..d9e3881 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Sep 19 18:21:19 UTC 2018 - Michael Ströder + +- Added %{_tmpfilesdir}/%{name}.conf +- Updated clknetsim +- Update to version 3.4 + * Enhancements + + Add filter option to server/pool/peer directive + + Add minsamples and maxsamples options to hwtimestamp directive + + Add support for faster frequency adjustments in Linux 4.19 + + Change default pidfile to /var/run/chrony/chronyd.pid to allow chronyd + without root privileges to remove it on exit + + Disable sub-second polling intervals for distant NTP sources + + Extend range of supported sub-second polling intervals + + Get/set IPv4 destination/source address of NTP packets on FreeBSD + + Make burst options and command useful with short polling intervals + + Modify auto_offline option to activate when sending request failed + + Respond from interface that received NTP request if possible + + Add onoffline command to switch between online and offline state + according to current system network configuration + + Improve example NetworkManager dispatcher script + * Bug fixes + + Avoid waiting in Linux getrandom system call + + Fix PPS support on FreeBSD and NetBSD + + ------------------------------------------------------------------- Fri Aug 3 07:56:06 UTC 2018 - mpluskal@suse.com diff --git a/chrony.spec b/chrony.spec index 532da65..eae5321 100644 --- a/chrony.spec +++ b/chrony.spec @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define vendorzone opensuse. -%global clknetsim_ver 42b693b +%global clknetsim_ver cdf5e85 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: chrony -Version: 3.3 +Version: 3.4 Release: 0 Summary: System Clock Synchronization Client and Server License: GPL-2.0-only @@ -39,6 +39,7 @@ Source7: https://download.tuxfamily.org/chrony/chrony-3.3-tar-gz-asc.txt# Source8: chrony.keyring # Simulator for test suite Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz +Source11: chrony-tmpfiles # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: chrony-config.patch # Add NTP servers from DHCP when starting service @@ -155,6 +156,8 @@ install -Dpm 0644 %{SOURCE5} \ %{buildroot}%{_unitdir}/chrony-dnssrv@.service install -Dpm 0644 %{SOURCE6} \ %{buildroot}%{_unitdir}/chrony-dnssrv@.timer +install -Dpm 0644 %{SOURCE11} \ + %{buildroot}%{_tmpfilesdir}/%{name}.conf install -d %{buildroot}%{sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchronyd @@ -191,6 +194,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/ %post %fillup_only %{name} +%tmpfiles_create %{name}.conf %service_add_post chronyd.service chrony-wait.service %postun @@ -218,10 +222,12 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/ %{_unitdir}/chrony*.service %{_unitdir}/chrony*.timer %{_sbindir}/rcchrony* +%{_tmpfilesdir}/%{name}.conf %{_fillupdir}/sysconfig.chrony %dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/drift %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony +%ghost %attr(0750, %{name}, %{name}) %{_rundir}/%{name} %changelog diff --git a/clknetsim-42b693b.tar.gz b/clknetsim-42b693b.tar.gz deleted file mode 100644 index bc881fe..0000000 --- a/clknetsim-42b693b.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cc12343114ebb9fc96e62404fac4be7fca5d5cb2a8bdc65fdc41948ea0ee449 -size 41933 diff --git a/clknetsim-cdf5e85.tar.gz b/clknetsim-cdf5e85.tar.gz new file mode 100644 index 0000000..0710701 --- /dev/null +++ b/clknetsim-cdf5e85.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:780aff25c66537ee30e2b3c5a3fa10afeda5b8b55dc6c326bcd193e0a210bccc +size 42027