From 973a6028ca525b381435fce658834a1a35d0cca99ff685ea72b63abe0e1e72a5 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 1 Sep 2022 12:16:41 +0000 Subject: [PATCH 1/2] Accepting request 1000645 from home:schubi2 - Moved logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d. OBS-URL: https://build.opensuse.org/request/show/1000645 OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=110 --- chrony.changes | 6 ++++++ chrony.spec | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/chrony.changes b/chrony.changes index aa476b8..10f4aea 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 15 14:41:05 UTC 2022 - Stefan Schubert + +- Moved logrotate files from user specific directory /etc/logrotate.d + to vendor specific directory /usr/etc/logrotate.d. + ------------------------------------------------------------------- Thu May 12 14:33:50 UTC 2022 - Stefan Schubert diff --git a/chrony.spec b/chrony.spec index 456394b..879b063 100644 --- a/chrony.spec +++ b/chrony.spec @@ -231,8 +231,14 @@ install -Dpm 0755 examples/chrony.nm-dispatcher.onoffline \ %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony install -Dpm 0755 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/dhcp/dhclient.d/chrony.sh +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_distconfdir}/logrotate.d +install -Dpm 0644 examples/chrony.logrotate \ + %{buildroot}%{_distconfdir}/logrotate.d/chrony +%else install -Dpm 0644 examples/chrony.logrotate \ %{buildroot}%{_sysconfdir}/logrotate.d/chrony +%endif install -Dpm 0644 examples/chronyd.service \ %{buildroot}%{_unitdir}/chronyd.service install -Dpm 0644 examples/chrony-wait.service \ @@ -286,6 +292,20 @@ make %{?_smp_mflags} check %pre -f chrony.pre %service_add_pre chronyd.service chrony-wait.service +%if 0%{?suse_version} > 1500 +# Prepare for migration to /usr/etc; save any old .rpmsave +for i in logrotate.d/chrony ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: +done +%endif + +%if 0%{?suse_version} > 1500 +%posttrans +# Migration to /usr/etc, restore just created .rpmsave +for i in logrotate.d/chrony ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||: +done +%endif %preun %service_del_preun chronyd.service chrony-wait.service @@ -309,7 +329,11 @@ make %{?_smp_mflags} check %doc examples %config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/chrony.conf %config(noreplace) %attr(0640,root,%{name}) %verify(not md5 size mtime) %{_sysconfdir}/chrony.keys +%if 0%{?suse_version} > 1500 +%{_distconfdir}/logrotate.d/chrony +%else %config(noreplace) %{_sysconfdir}/logrotate.d/chrony +%endif %attr(0755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony %dir %{_sysconfdir}/chrony.d/ %dir %{_sysconfdir}/dhcp/ From 644bee6b7117499fab34551d0b88b564f9e754da72e0b47b40e618b868f99fb4 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 1 Sep 2022 15:47:14 +0000 Subject: [PATCH 2/2] - Update to 4.3: * Add local option to refclock directive to stabilise system clock with more stable free-running clock (e.g. TCXO, OCXO). * Add maxdelayquant option to server/pool/peer directive to replace maxdelaydevratio filter with long-term quantile-based filtering. * Add selection option to log directive. * Allow external PPS in PHC refclock without configurable pin. * Don't accept first interleaved response to minimise error in delay. * Don't use arc4random on Linux to avoid server performance loss. * Improve filter option to better handle missing NTP samples. * Improve stability with hardware timestamping and PHC refclock. * Update seccomp filter - Update clknetsim to snapshot f00531b. - Use a more specific conditional for the /usr/etc stuff. OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=111 --- chrony-4.2.tar.gz | 3 --- chrony-4.2.tar.gz.sig | 16 ---------------- chrony-4.3.tar.gz | 3 +++ chrony-4.3.tar.gz.sig | 16 ++++++++++++++++ chrony.changes | 20 ++++++++++++++++++++ chrony.spec | 13 ++++++++----- clknetsim-470b5e9.tar.gz | 3 --- clknetsim-f00531b.tar.gz | 3 +++ 8 files changed, 50 insertions(+), 27 deletions(-) delete mode 100644 chrony-4.2.tar.gz delete mode 100644 chrony-4.2.tar.gz.sig create mode 100644 chrony-4.3.tar.gz create mode 100644 chrony-4.3.tar.gz.sig delete mode 100644 clknetsim-470b5e9.tar.gz create mode 100644 clknetsim-f00531b.tar.gz diff --git a/chrony-4.2.tar.gz b/chrony-4.2.tar.gz deleted file mode 100644 index 2bc8596..0000000 --- a/chrony-4.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a -size 578411 diff --git a/chrony-4.2.tar.gz.sig b/chrony-4.2.tar.gz.sig deleted file mode 100644 index b63b0bd..0000000 --- a/chrony-4.2.tar.gz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEjzdcfo0O4SWj071RU34rdvdoDawFAmG7LoQACgkQU34rdvdo -Daw47w//fpF3YlqSJWQObHv/hMC6EGQSX6hRVzckXgzq7PFN2HaTX1iZV2UsP1KN -NtXfH3V7PxTdT4jT41bHUw++vN0HXkaAw3ccbm31MVTc353JFv5VUKT/OtK+I8dZ -CKGDy7X4REET7rCYTEfhgvAwjisIlc81xFq9fMYiGasj2LXZD9GUFHqu0JzvvyMz -R0PNGDSYaJX5Ex1GtbgULjDJNF0FRDE+T6SBjs8Xlej020DbNRb4MNZitzygMNum -ChN2MltzEccw/UegrsaN1UYQG2C4/Xgdjeqfa4ioiewBL0/79oPkNyJT0GCtOIUM -TCAdDRrwLuh7d3+Hl6szy8FxKRFN4s/TTjSTinwDCaexqqNgKeSRkJPFWPWhq4l1 -2W+hh5cYtToP4wYNpFdadz+LJYrRzYEtAKdFMegYt2Q/MMVtsNji4qeJ/VOnyrUI -cJD6sWqDtrUQnegVky1QDwKIYLzO+h6kDaTEm7ZhaT3pR4gGC47umPR9HAcgch0/ -QdmHd1dP1rutDdpiGmXRicvSV48M1Ol6AAs7rUERuQGJ4Tl/zoMGWmN93UQEpisS -9L1PBNdAjdutJaZKA3Bgq49BOPzcRGvhamH63fO5Q+h6uXCzxd9s8MDeY8wh3Idn -2aHcGnx32z3DNbpG/nXtKE3GeiSDbw6FmN4KUmKKBR552lCcgpA= -=F4BS ------END PGP SIGNATURE----- diff --git a/chrony-4.3.tar.gz b/chrony-4.3.tar.gz new file mode 100644 index 0000000..3879092 --- /dev/null +++ b/chrony-4.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d0da889a865f089a5a21610ffb6713e3c9438ce303a63b49c2fb6eaff5b8804 +size 593560 diff --git a/chrony-4.3.tar.gz.sig b/chrony-4.3.tar.gz.sig new file mode 100644 index 0000000..8badf59 --- /dev/null +++ b/chrony-4.3.tar.gz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEjzdcfo0O4SWj071RU34rdvdoDawFAmMPLJAACgkQU34rdvdo +DaxDKRAAh5wfl990Q6sTPxXI92GegZYIGUxJDlCkJtemoI98g+DQbuCJ46AXsAn/ +CIBTbPU3Brvq2KR1nDze/G/YOXkaqoFyaJD00H73qBI7MOMiSS4KbMQ26xLNrnHL +MCHrgZs+MHhyo6IEpesvr7F/+qyGHZifFlHT+HtCM+SBU1qooYUyQAdnhyK0rb16 +j7/Jc5A28jROZB4lcRQyvB085whPj299FsB/0wJW5RjwA5tcpPH0sTozain3vvlo +64BAJXcQsyRsilcaPFlkY5zPgFiAuaEJnfTe/uMdfDO/V/g6wADt64+HhaxNPO+z +p3vzEGpio4Oi1HyYiXpDx9bMM1RLTpmKt9p1V5Y98Fn5Ymx6I7yAe1qwvA7T8eoC +hK8C27jPytiOgaWSYqPYb0WaHY3JZZpFzdtr0bAPSkEzL4EwrxVmbgTnkuzk2hxk +6MiIuDLUd9Zl1oroqv+rTd0XA8lXUcoyFhqtsMXHWdAC3yzteaPcJKzv7l9DT6xV +YadKrSBkzob9jRWRngY3FMKjTvcwnxLE8dfsNlsDNGyLNtTEOJ/QYgh6muOHh80L +MAayI8hSWPTR/3IXKlathjLIeilsrFthIZcrPq520FoS4A7E3A80vR3uKOqAIDwh +Y+6ASvEkCHAUneJqlLihqglYTNJlFnVhGw9/LV85JsmRsCZ0+j8= +=2xMP +-----END PGP SIGNATURE----- diff --git a/chrony.changes b/chrony.changes index 10f4aea..4470007 100644 --- a/chrony.changes +++ b/chrony.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Sep 1 14:40:46 UTC 2022 - Reinhard Max + +- Update to 4.3: + * Add local option to refclock directive to stabilise system + clock with more stable free-running clock (e.g. TCXO, OCXO). + * Add maxdelayquant option to server/pool/peer directive to + replace maxdelaydevratio filter with long-term quantile-based + filtering. + * Add selection option to log directive. + * Allow external PPS in PHC refclock without configurable pin. + * Don't accept first interleaved response to minimise error in + delay. + * Don't use arc4random on Linux to avoid server performance loss. + * Improve filter option to better handle missing NTP samples. + * Improve stability with hardware timestamping and PHC refclock. + * Update seccomp filter +- Update clknetsim to snapshot f00531b. +- Use a more specific conditional for the /usr/etc stuff. + ------------------------------------------------------------------- Wed Jun 15 14:41:05 UTC 2022 - Stefan Schubert diff --git a/chrony.spec b/chrony.spec index 879b063..9ba42b7 100644 --- a/chrony.spec +++ b/chrony.spec @@ -26,11 +26,14 @@ %bcond_without sysusers %bcond_without pps %endif +%if 0%{?suse_version} > 1500 +%bcond_without usr_etc +%endif %bcond_without testsuite %define _systemdutildir %(pkg-config --variable systemdutildir systemd) -%global clknetsim_ver 470b5e9 +%global clknetsim_ver f00531b #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates @@ -38,7 +41,7 @@ %define chrony_helper %{_libexecdir}/chrony/helper %define chrony_rundir %{_rundir}/%{name} Name: chrony -Version: 4.2 +Version: 4.3 Release: 0 Summary: System Clock Synchronization Client and Server License: GPL-2.0-only @@ -231,7 +234,7 @@ install -Dpm 0755 examples/chrony.nm-dispatcher.onoffline \ %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony install -Dpm 0755 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/dhcp/dhclient.d/chrony.sh -%if 0%{?suse_version} > 1500 +%if %{with usr_etc} mkdir -p %{buildroot}%{_distconfdir}/logrotate.d install -Dpm 0644 examples/chrony.logrotate \ %{buildroot}%{_distconfdir}/logrotate.d/chrony @@ -292,14 +295,14 @@ make %{?_smp_mflags} check %pre -f chrony.pre %service_add_pre chronyd.service chrony-wait.service -%if 0%{?suse_version} > 1500 +%if %{with usr_etc} # Prepare for migration to /usr/etc; save any old .rpmsave for i in logrotate.d/chrony ; do test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: done %endif -%if 0%{?suse_version} > 1500 +%if %{with usr_etc} %posttrans # Migration to /usr/etc, restore just created .rpmsave for i in logrotate.d/chrony ; do diff --git a/clknetsim-470b5e9.tar.gz b/clknetsim-470b5e9.tar.gz deleted file mode 100644 index d1a722a..0000000 --- a/clknetsim-470b5e9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92fe0052f9e2369f9a2a2565fe1d681d18ef27ad1e85ce542cc089b833977750 -size 48016 diff --git a/clknetsim-f00531b.tar.gz b/clknetsim-f00531b.tar.gz new file mode 100644 index 0000000..82f35d1 --- /dev/null +++ b/clknetsim-f00531b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da4c0e4277bd8da4f1a31d9e3c3ea5985a53861e30d8e87f11f6648ea13eb5e9 +size 49266