diff --git a/SOURCES/0001-Synchronize-time-via-Russian-NTP-servers.patch b/SOURCES/0001-Synchronize-time-via-Russian-NTP-servers.patch index 6aca686..95751e7 100644 --- a/SOURCES/0001-Synchronize-time-via-Russian-NTP-servers.patch +++ b/SOURCES/0001-Synchronize-time-via-Russian-NTP-servers.patch @@ -1,4 +1,4 @@ -From 08cf035923b4eff6698d37948bb25b1414432b7a Mon Sep 17 00:00:00 2001 +From 0e89d48f500c29f4370f77c438fa2ebeb80261bf Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Wed, 30 Aug 2023 17:02:52 +0300 Subject: [PATCH] Synchronize time via Russian NTP servers @@ -10,16 +10,16 @@ Subject: [PATCH] Synchronize time via Russian NTP servers doc/chrony.conf.man.in | 12 +++++------- doc/faq.adoc | 10 +++++----- doc/installation.adoc | 4 ++-- - examples/chrony.conf.example1 | 4 ++-- - examples/chrony.conf.example2 | 6 +++--- + examples/chrony.conf.example1 | 11 +++++++++-- + examples/chrony.conf.example2 | 12 +++++++++--- examples/chrony.conf.example3 | 4 ++-- - 9 files changed, 30 insertions(+), 33 deletions(-) + 9 files changed, 43 insertions(+), 33 deletions(-) diff --git a/FAQ b/FAQ -index d68f885..5672baa 100644 +index 2bbb24e..92b71d2 100644 --- a/FAQ +++ b/FAQ -@@ -105,10 +105,10 @@ next boot from the RTC, the rtcsync directive enables a mode in which the +@@ -110,10 +110,10 @@ next boot from the RTC, the rtcsync directive enables a mode in which the system time is periodically copied to the RTC. It is supported on Linux and macOS. @@ -32,7 +32,7 @@ index d68f885..5672baa 100644 driftfile /var/lib/chrony/drift makestep 1 3 rtcsync -@@ -380,7 +380,7 @@ the -Q option it will print the measured offset without setting the clock. If +@@ -392,7 +392,7 @@ the -Q option it will print the measured offset without setting the clock. If you do not want to use a configuration file, NTP servers can be specified on the command line. For example: @@ -41,7 +41,7 @@ index d68f885..5672baa 100644 The command above would normally take about 5 seconds if the servers were well synchronised and responding to all requests. If not synchronised or responding, -@@ -391,7 +391,7 @@ option to one (supported since chrony version 4.0), and a timeout can be +@@ -403,7 +403,7 @@ option to one (supported since chrony version 4.0), and a timeout can be specified with the -t option. The following command would take only up to about one second. @@ -50,7 +50,7 @@ index d68f885..5672baa 100644 It is not recommended to run chronyd with the -q option periodically (e.g. from a cron job) as a replacement for the daemon mode, because it performs -@@ -454,7 +454,7 @@ same server instance. +@@ -466,7 +466,7 @@ same server instance. An example configuration of the client instance could be @@ -60,7 +60,7 @@ index d68f885..5672baa 100644 port 11123 driftfile /var/lib/chrony/drift diff --git a/INSTALL b/INSTALL -index 656537a..1dcbce2 100644 +index e73dcd2..8633948 100644 --- a/INSTALL +++ b/INSTALL @@ -116,10 +116,10 @@ make install-docs @@ -77,10 +77,10 @@ index 656537a..1dcbce2 100644 rtcsync diff --git a/doc/chrony.conf.adoc b/doc/chrony.conf.adoc -index 21d2ce6..d41cfbd 100644 +index 2cf5326..f9db123 100644 --- a/doc/chrony.conf.adoc +++ b/doc/chrony.conf.adoc -@@ -334,7 +334,7 @@ source with a newly resolved address of the name. +@@ -356,7 +356,7 @@ sources responding to requests. The default value is 4 and the maximum value is An example of the *pool* directive is + ---- @@ -89,7 +89,7 @@ index 21d2ce6..d41cfbd 100644 ---- [[peer]]*peer* _hostname_ [_option_]...:: -@@ -2621,7 +2621,7 @@ the following methods: +@@ -2731,7 +2731,7 @@ the following methods: stratum 1 and stratum 2 servers. You should find one or more servers that are near to you. Check that their access policy allows you to use their facilities. @@ -98,7 +98,7 @@ index 21d2ce6..d41cfbd 100644 Assuming that your NTP servers are called _foo.example.net_, _bar.example.net_ and _baz.example.net_, your _chrony.conf_ file could contain as a minimum: -@@ -2654,7 +2654,7 @@ directive instead of multiple *server* directives. The configuration file could +@@ -2764,7 +2764,7 @@ directive instead of multiple *server* directives. The configuration file could in this case look like: ---- @@ -107,7 +107,7 @@ index 21d2ce6..d41cfbd 100644 driftfile @CHRONYVARDIR@/drift makestep 1.0 3 rtcsync -@@ -2912,8 +2912,7 @@ information to be saved. +@@ -3022,8 +3022,7 @@ information to be saved. === Public NTP server @@ -118,10 +118,10 @@ index 21d2ce6..d41cfbd 100644 allow client access from all addresses. It is recommended to find at least four good servers (e.g. from the pool, or on the NTP homepage). If the server has a diff --git a/doc/chrony.conf.man.in b/doc/chrony.conf.man.in -index 8713321..795f4b3 100644 +index 1a51b24..5c34507 100644 --- a/doc/chrony.conf.man.in +++ b/doc/chrony.conf.man.in -@@ -445,7 +445,7 @@ An example of the \fBpool\fP directive is +@@ -467,7 +467,7 @@ An example of the \fBpool\fP directive is .if n .RS 4 .nf .fam C @@ -130,7 +130,7 @@ index 8713321..795f4b3 100644 .fam .fi .if n .RE -@@ -4124,7 +4124,7 @@ facilities. +@@ -4502,7 +4502,7 @@ facilities. . IP \(bu 2.3 .\} Use public servers from the \c @@ -139,7 +139,7 @@ index 8713321..795f4b3 100644 project. .RE .sp -@@ -4169,7 +4169,7 @@ in this case look like: +@@ -4547,7 +4547,7 @@ in this case look like: .if n .RS 4 .nf .fam C @@ -148,7 +148,7 @@ index 8713321..795f4b3 100644 driftfile @CHRONYVARDIR@/drift makestep 1.0 3 rtcsync -@@ -4465,9 +4465,7 @@ before the final SIGKILL; the SIGTERM causes the measurement histories and RTC +@@ -4843,9 +4843,7 @@ before the final SIGKILL; the SIGTERM causes the measurement histories and RTC information to be saved. .SS "Public NTP server" .sp @@ -159,7 +159,7 @@ index 8713321..795f4b3 100644 is similar to the NTP client with permanent connection, except it needs to allow client access from all addresses. It is recommended to find at least four good servers (e.g. from the pool, or on the NTP homepage). If the server has a -@@ -4513,4 +4511,4 @@ For instructions on how to report bugs, please visit +@@ -4891,4 +4889,4 @@ For instructions on how to report bugs, please visit .URL "https://chrony.tuxfamily.org/" "" "." .SH "AUTHORS" .sp @@ -167,7 +167,7 @@ index 8713321..795f4b3 100644 \ No newline at end of file +chrony was written by Richard Curnow, Miroslav Lichvar, and others. diff --git a/doc/faq.adoc b/doc/faq.adoc -index d1b4cf3..7125a7b 100644 +index 1b299d2..470c451 100644 --- a/doc/faq.adoc +++ b/doc/faq.adoc @@ -70,11 +70,11 @@ system time is periodically copied to the RTC. It is supported on Linux and @@ -184,7 +184,7 @@ index d1b4cf3..7125a7b 100644 driftfile /var/lib/chrony/drift makestep 1 3 rtcsync -@@ -362,7 +362,7 @@ clock. If you do not want to use a configuration file, NTP servers can be +@@ -371,7 +371,7 @@ clock. If you do not want to use a configuration file, NTP servers can be specified on the command line. For example: ---- @@ -193,7 +193,7 @@ index d1b4cf3..7125a7b 100644 ---- The command above would normally take about 5 seconds if the servers were -@@ -375,7 +375,7 @@ timeout can be specified with the `-t` option. The following command would take +@@ -384,7 +384,7 @@ timeout can be specified with the `-t` option. The following command would take only up to about one second. ---- @@ -202,7 +202,7 @@ index d1b4cf3..7125a7b 100644 ---- It is not recommended to run `chronyd` with the `-q` option periodically (e.g. -@@ -442,7 +442,7 @@ the same server instance. +@@ -451,7 +451,7 @@ the same server instance. An example configuration of the client instance could be ---- @@ -212,7 +212,7 @@ index d1b4cf3..7125a7b 100644 port 11123 driftfile /var/lib/chrony/drift diff --git a/doc/installation.adoc b/doc/installation.adoc -index 35ce9bf..d8f15ae 100644 +index b683911..3750f85 100644 --- a/doc/installation.adoc +++ b/doc/installation.adoc @@ -146,11 +146,11 @@ make install-docs @@ -230,28 +230,41 @@ index 35ce9bf..d8f15ae 100644 rtcsync ---- diff --git a/examples/chrony.conf.example1 b/examples/chrony.conf.example1 -index 5e93ea7..6442078 100644 +index 5e93ea7..dd960ad 100644 --- a/examples/chrony.conf.example1 +++ b/examples/chrony.conf.example1 -@@ -1,5 +1,5 @@ +@@ -1,5 +1,12 @@ -# Use public NTP servers from the pool.ntp.org project. -pool pool.ntp.org iburst -+# Use public NTP servers from the https://www.vniiftri.ru/ project. -+pool ntp1.vniiftri.ru iburst ++# Use Russian public NTP servers (vniiftri and msk-ix) ++server ntp.msk-ix.ru iburst ++server ntp1.vniiftri.ru iburst ++server vniiftri2.khv.ru iburst ++server ntp1.niiftri.irkutsk.ru iburst ++server ntp.sstf.nsk.ru iburst ++server ntp2.vniiftri.ru iburst ++server ntp3.vniiftri.ru iburst ++server ntp4.vniiftri.ru iburst # Record the rate at which the system clock gains/losses time. driftfile /var/lib/chrony/drift diff --git a/examples/chrony.conf.example2 b/examples/chrony.conf.example2 -index bf2bbdd..6e5a993 100644 +index bf2bbdd..61b4576 100644 --- a/examples/chrony.conf.example2 +++ b/examples/chrony.conf.example2 -@@ -1,6 +1,6 @@ +@@ -1,6 +1,12 @@ -# Use public servers from the pool.ntp.org project. -# Please consider joining the pool (https://www.pool.ntp.org/join.html). -pool pool.ntp.org iburst -+# Use public servers from the https://www.vniiftri.ru/ project. -+# Synchronize time via NTP servers (https://www.vniiftri.ru/catalog/services/sinkhronizatsiya-vremeni-cherez-ntp-servera/). -+pool ntp1.vniiftri.ru iburst ++# Use Russian public NTP servers (vniiftri and msk-ix) ++server ntp.msk-ix.ru iburst ++server ntp1.vniiftri.ru iburst ++server vniiftri2.khv.ru iburst ++server ntp1.niiftri.irkutsk.ru iburst ++server ntp.sstf.nsk.ru iburst ++server ntp2.vniiftri.ru iburst ++server ntp3.vniiftri.ru iburst ++server ntp4.vniiftri.ru iburst # Record the rate at which the system clock gains/losses time. driftfile /var/lib/chrony/drift @@ -276,5 +289,5 @@ index 4e3e3a8..db9d395 100644 ####################################################################### ### AVOIDING POTENTIALLY BOGUS CHANGES TO YOUR CLOCK -- -2.39.2 +2.41.0 diff --git a/SPECS/chrony.spec b/SPECS/chrony.spec index a4d63a9..acd4404 100644 --- a/SPECS/chrony.spec +++ b/SPECS/chrony.spec @@ -9,7 +9,7 @@ Name: chrony Version: 4.3 -Release: 1%{?dist}.inferit.2 +Release: 1%{?dist}.inferit.3 Summary: An NTP client/server License: GPLv2 @@ -69,7 +69,7 @@ service to other computers in the network. # review changes in packaged configuration files and scripts md5sum -c <<-EOF | (! grep -v 'OK$') 222e652b95027289877fa77146d3b9b1 examples/chrony-wait.service - 2ef99491609640c66c4084ffe8d3894f examples/chrony.conf.example2 + dc373a30c229f7477e913bee76d03eb7 examples/chrony.conf.example2 96999221eeef476bd49fe97b97503126 examples/chrony.keys.example 6a3178c4670de7de393d9365e2793740 examples/chrony.logrotate c3992e2f985550739cd1cd95f98c9548 examples/chrony.nm-dispatcher.dhcp @@ -210,6 +210,9 @@ fi %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony %changelog +* Wed Nov 16 2023 Arkady L. Shane - 4.3-1.inferit.3 +- Use more servers instead of pool + * Wed Aug 30 2023 Sergey Cherevko - 4.3-1.inferit.2 - fixup! Synchronize time via Russian NTP servers - Rebuilt for MSVSphere 9.2