pool/chrony
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 845302 from home:darix:playground

Browse Source 
- Update to 4.0

OBS-URL: https://build.opensuse.org/request/show/845302
OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=94
This commit is contained in:
Reinhard Max 2020-11-02 10:16:11 +00:00 committed by Git OBS Bridge
parent 47cdc20a05
commit bf5e551c5d
10 changed files with 96 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrony-3.5.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1ba82f70db85d414cd7420c39858e3ceca4b9eb8b028cbe869512c3a14a2dca7
size 459902

6
chrony-3.5.1.tar.gz.sig
View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQSLH0qa2nPUAeMIWgtf8G8puh4BOwUCXz083QAKCRBf8G8puh4B
O3kZAJ9ZKwXDF0Qod8SfUuRgWAv/sECWrACghttWUPbzpfncbMVwwMnZVibXKLM=
=4in4
-----END PGP SIGNATURE-----

3
chrony-4.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be27ea14c55e7a4434b2fa51d53018c7051c42fa6a3198c9aa6a1658bae0c625
size 546939

6
chrony-4.0.tar.gz.sig Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQSLH0qa2nPUAeMIWgtf8G8puh4BOwUCX33e1QAKCRBf8G8puh4B
O//PAKCOfRduMpH1Jm7sGLDYQuv244xwDgCfQVB9507gmpmXi9EvJoncKX4p1dY=
=FpQW
-----END PGP SIGNATURE-----

10
chrony-config.patch
View File

@ -1,7 +1,7 @@
Index: chrony-3.2/examples/chrony.conf.example3
Index: chrony-4.0/examples/chrony.conf.example3
===================================================================
--- chrony-3.2.orig/examples/chrony.conf.example3
+++ chrony-3.2/examples/chrony.conf.example3
--- chrony-4.0.orig/examples/chrony.conf.example3
+++ chrony-4.0/examples/chrony.conf.example3
@@ -27,12 +27,38 @@
# you can access at http://support.ntp.org/bin/view/Servers/WebHome or
# you can use servers from the pool.ntp.org project.
@ -45,7 +45,7 @@ Index: chrony-3.2/examples/chrony.conf.example3
#######################################################################
### AVOIDING POTENTIALLY BOGUS CHANGES TO YOUR CLOCK
#
@@ -65,7 +91,7 @@
@@ -79,7 +105,7 @@
# immediately so that it doesn't gain or lose any more time. You
# generally want this, so it is uncommented.
@ -54,7 +54,7 @@ Index: chrony-3.2/examples/chrony.conf.example3
# If you want to enable NTP authentication with symmetric keys, you will need
# to uncomment the following line and edit the file to set up the keys.
@@ -124,8 +150,8 @@ driftfile /var/lib/chrony/drift
@@ -165,8 +191,8 @@ ntsdumpdir /var/lib/chrony
# produce some graphs of your system's timekeeping performance, or you
# need help in debugging a problem.

41
chrony-test-fix-util-unit-test-for-NTP-era-split.patch
View File

@ -1,41 +0,0 @@
From 2d9eb5b6fa5225a7300c8eed95712969249900fb Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Fri, 3 Jan 2020 11:25:55 +0100
Subject: [PATCH] test: fix util unit test for NTP era split
The current default NTP era split passed the Unix epoch (~50 years ago),
which means the epoch converted to an NTP timestamp and back ends up in
the next NTP era (year 2106).
Fix the test to take into account the era split.
---
test/unit/util.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/test/unit/util.c b/test/unit/util.c
index f4d9f33..af9e90c 100644
--- a/test/unit/util.c
+++ b/test/unit/util.c
@@ -100,11 +100,19 @@ void test_unit(void) {
ntp_ts.hi = htonl(JAN_1970);
ntp_ts.lo = 0xffffffff;
UTI_Ntp64ToTimespec(&ntp_ts, &ts);
+#if defined(HAVE_LONG_TIME_T) && NTP_ERA_SPLIT > 0
+ TEST_CHECK(ts.tv_sec == 0x100000000LL * (1 + (NTP_ERA_SPLIT - 1) / 0x100000000LL));
+#else
TEST_CHECK(ts.tv_sec == 0);
+#endif
TEST_CHECK(ts.tv_nsec == 999999999);
UTI_AddDoubleToTimespec(&ts, 1e-9, &ts);
+#if defined(HAVE_LONG_TIME_T) && NTP_ERA_SPLIT > 0
+ TEST_CHECK(ts.tv_sec == 1 + 0x100000000LL * (1 + (NTP_ERA_SPLIT - 1) / 0x100000000LL));
+#else
TEST_CHECK(ts.tv_sec == 1);
+#endif
TEST_CHECK(ts.tv_nsec == 0);
ntp_fuzz.hi = 0;
--
2.25.0

30
chrony-test-update-processing-of-packet-log.patch
View File

@ -1,30 +0,0 @@
From 62d6aed6a64b887c9e3b7f03d9e0db1deaa2696a Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 18 Jun 2019 15:41:50 +0200
Subject: [PATCH] test: update processing of packet log
Two new fields have been added to the packet log, which broke some
of the simulation tests.
---
test/simulation/test.common | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/simulation/test.common b/test/simulation/test.common
index 951a794..8ed6ad9 100644
--- a/test/simulation/test.common
+++ b/test/simulation/test.common
@@ -391,9 +391,9 @@ check_packet_port() {
for i in $(seq 1 $(get_chronyd_nodes)); do
test_message 3 0 "node $i:"
- grep -E -q " $port [0-9]+\$" tmp/log.packets && \
+ grep -E -q "^([0-9e.+-]+ ){5}$port " tmp/log.packets && \
! grep -E "^[0-9e.+-]+ $i " tmp/log.packets | \
- grep -E -q -v " $port [0-9]+\$" && \
+ grep -E -q -v "^([0-9e.+-]+ ){5}$port " && \
test_ok || test_bad
[ $? -eq 0 ] || ret=1
done
--
2.25.0

70
chrony.changes
View File

@ -1,3 +1,73 @@
-------------------------------------------------------------------
Sun Nov 1 22:26:48 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
- Update to 4.0
- Enhancements
- Add support for Network Time Security (NTS) authentication
- Add support for AES-CMAC keys (AES128, AES256) with Nettle
- Add authselectmode directive to control selection of
unauthenticated sources
- Add binddevice, bindacqdevice, bindcmddevice directives
- Add confdir directive to better support fragmented
configuration
- Add sourcedir directive and "reload sources" command to
support dynamic NTP sources specified in files
- Add clockprecision directive
- Add dscp directive to set Differentiated Services Code Point
(DSCP)
- Add -L option to limit log messages by severity
- Add -p option to print whole configuration with included
files
- Add -U option to allow start under non-root user
- Allow maxsamples to be set to 1 for faster update with -q/-Q
option
- Avoid replacing NTP sources with sources that have
unreachable address
- Improve pools to repeat name resolution to get "maxsources"
sources
- Improve source selection with trusted sources
- Improve NTP loop test to prevent synchronisation to itself
- Repeat iburst when NTP source is switched from offline state
to online
- Update clock synchronisation status and leap status more
frequently
- Update seccomp filter
- Add "add pool" command
- Add "reset sources" command to drop all measurements
- Add authdata command to print details about NTP
authentication
- Add selectdata command to print details about source
selection
- Add -N option and sourcename command to print original names
of sources
- Add -a option to some commands to print also unresolved
sources
- Add -k, -p, -r options to clients command to select, limit,
reset data
- Bug fixes
- Don’t set interface for NTP responses to allow asymmetric
routing
- Handle RTCs that don’t support interrupts
- Respond to command requests with correct address on
multihomed hosts
- Removed features
- Drop support for RIPEMD keys (RMD128, RMD160, RMD256, RMD320)
- Drop support for long (non-standard) MACs in NTPv4 packets
(chrony 2.x clients using non-MD5/SHA1 keys need to use
option "version 3")
- Drop support for line editing with GNU Readline
- add BuildRequires for gnutls-devel (which also pulls nettle to
enable the new features)
- drop patches which are included in the update:
chrony-test-update-processing-of-packet-log.patch
chrony-test-fix-util-unit-test-for-NTP-era-split.patch
- refreshed chrony-config.patch
- track series file for easier quilt setup
- added option to turn off testsuite with
osc build --without=testsuite
testsuite still runs by default
-------------------------------------------------------------------
Wed Oct 28 07:49:37 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>

14
chrony.spec
View File

@ -16,6 +16,8 @@
#
%bcond_without testsuite
%define _systemdutildir %(pkg-config --variable systemdutildir systemd)
%global clknetsim_ver 79ffe44
#Compat macro for new _fillupdir macro introduced in Nov 2017
@ -23,7 +25,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: chrony
Version: 3.5.1
Version: 4.0
Release: 0
Summary: System Clock Synchronization Client and Server
License: GPL-2.0-only
@ -42,17 +44,17 @@ Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/c
Source11: chrony-tmpfiles
Source12: pool.conf.suse
Source13: pool.conf.opensuse
Source99: series
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch0: chrony-config.patch
# Add NTP servers from DHCP when starting service
Patch1: chrony-service-helper.patch
Patch2: chrony-logrotate.patch
Patch3: chrony-service-ordering.patch
Patch4: chrony-test-fix-util-unit-test-for-NTP-era-split.patch
Patch5: chrony-test-update-processing-of-packet-log.patch
BuildRequires: NetworkManager-devel
BuildRequires: bison
BuildRequires: gcc-c++
BuildRequires: gnutls-devel
BuildRequires: libcap-devel
BuildRequires: libedit-devel
BuildRequires: mozilla-nss-devel
@ -147,8 +149,6 @@ sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{PATCH1}
%patch1 -p1
%patch2 -p1
%patch3
%patch4 -p1
%patch5 -p1
# Remove pool statements from the default /etc/chrony.conf. They will
# be provided by branding packages in /etc/chrony.d/pool.conf .
@ -191,7 +191,7 @@ install -Dpm 0644 chrony.conf \
mkdir %{buildroot}%{_sysconfdir}/chrony.d
install -Dpm 0640 examples/chrony.keys.example \
%{buildroot}%{_sysconfdir}/chrony.keys
install -Dpm 0755 examples/chrony.nm-dispatcher \
install -Dpm 0755 examples/chrony.nm-dispatcher.onoffline \
%{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/20-chrony
install -Dpm 0755 %{SOURCE3} \
%{buildroot}%{_sysconfdir}/dhcp/dhclient.d/chrony.sh
@ -229,6 +229,7 @@ touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc}
install -Dpm 644 %{SOURCE12} %{SOURCE13} %{buildroot}/etc/chrony.d
touch %{buildroot}/etc/chrony.d/pool.conf.empty
%if %{with testsuite}
%ifnarch %ix86
%check
# Set random seed to get deterministic results
@ -237,6 +238,7 @@ export CFLAGS="%{optflags}"
make %{?_smp_mflags} -C test/simulation/clknetsim
make %{?_smp_mflags} check
%endif
%endif
%pre
getent group %{name} >/dev/null || groupadd -r %{name}

4
series Normal file
View File

@ -0,0 +1,4 @@
chrony-config.patch -p1
chrony-service-helper.patch -p1
chrony-logrotate.patch -p1
chrony-service-ordering.patch -p0