rpm/chrony
SHA256
1
0
Fork 0
forked from pool/chrony
Code Pull Requests Activity

Accepting request 896714 from network:time

Browse Source 
- Update to 4.1
  * Add support for NTS servers specified by IP address (matching
    Subject Alternative Name in server certificate)
  * Add source-specific configuration of trusted certificates
  * Allow multiple files and directories with trusted certificates
  * Allow multiple pairs of server keys and certificates
  * Add copy option to server/pool directive
  * Increase PPS lock limit to 40% of pulse interval
  * Perform source selection immediately after loading dump files
  * Reload dump files for addresses negotiated by NTS-KE server
  * Update seccomp filter and add less restrictive level
  * Restart ongoing name resolution on online command
  * Fix dump files to not include uncorrected offset
  * Fix initstepslew to accept time from own NTP clients
  * Reset NTP address and port when no longer negotiated by NTS-KE
    server
- Update clknetsim to snapshot f89702d.
- Refresh chrony.keyring from
  https://chrony.tuxfamily.org/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc
- Ensure the correct pool packages are installed for openSUSE
  and SLE (bsc#1180689).

- Enable syscallfilter unconditionally [boo#1181826].

- drop buildrequires on NSS. We need gnutls for NTS anyway and we
  can do all the other required crypto via nettle+gnutls. no need
  for another crypto library.

- Update to 4.0
  - Enhancements

OBS-URL: https://build.opensuse.org/request/show/896714
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chrony?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger 2021-06-05 21:31:06 +00:00 committed by Git OBS Bridge
commit f9879981c1
13 changed files with 202 additions and 212 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.1.tar.gz Normal file
View File

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

16
chrony-4.1.tar.gz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEjzdcfo0O4SWj071RU34rdvdoDawFAmCdA+8ACgkQU34rdvdo
DayU8Q/9FCKZSecv//ZdhH89eVYyQZsb7AREqhiJqaWHekd08Hj8UZx9SA+0JtSl
QwnGJNOrF76gbvyvjCzVmUSnIuHWADK6tAWxm8RBXqjoIS9Qv15sIpVVvTGDWxJQ
shN2Tag5gplI6ZRp2rJAggxxtqVR2ZC3sZ+ay5LHQUhN2buxqy/v3XZXaTtfqRtI
QLq8IVXH7f08D+F0mlH+okJ0qyemP1KYMrD9XqZjmwUupAVhrVj0UCtn+wDszbbr
hWcs12brtSq13YUu2hbU5tXS++BEVJ1QM9+7OvG2V2idV6NRIsDhLjNPJwdYC4Dw
kJjN2dA1/tH9YaSUUV1vcSSSmkwYki2WJijIWMluoOlbO6aIR1+ohwkror4GztQL
0hOnVgXgTTPCS1hb5qi2nG+n6p1iKDOHudGQoyqV+qbAZYAGPGaC5jd3vDKLlI1F
TCmXL68VtTxamjI7hAUCvt1uMWtVhkogw1Y9pHU1D8PeB5iqPK6slLU0hAn1lhB9
AUlJ/AFSTXXqpWOuUnMx8mC9xLbekeE+KnM/IfO3BUm7CgUO8pOBCteCisHl/IFU
7Y7AmsB+15DjJasqLhhKiVeMTbMJBlA5a9y3kvbUJv0uhS1fl0XrYK6Ht09/6t3C
CGy+YB7OfBp1w1kKix6kmsNVjGSL9s+pODRsj/vHAxTbzzbX80Y=
=rNMW
-----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

107
chrony.changes
View File

@ -1,3 +1,110 @@
-------------------------------------------------------------------
Tue Jun 1 12:53:23 UTC 2021 - Reinhard Max <max@suse.com>
- Update to 4.1
* Add support for NTS servers specified by IP address (matching
Subject Alternative Name in server certificate)
* Add source-specific configuration of trusted certificates
* Allow multiple files and directories with trusted certificates
* Allow multiple pairs of server keys and certificates
* Add copy option to server/pool directive
* Increase PPS lock limit to 40% of pulse interval
* Perform source selection immediately after loading dump files
* Reload dump files for addresses negotiated by NTS-KE server
* Update seccomp filter and add less restrictive level
* Restart ongoing name resolution on online command
* Fix dump files to not include uncorrected offset
* Fix initstepslew to accept time from own NTP clients
* Reset NTP address and port when no longer negotiated by NTS-KE
server
- Update clknetsim to snapshot f89702d.
- Refresh chrony.keyring from
https://chrony.tuxfamily.org/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc
- Ensure the correct pool packages are installed for openSUSE
and SLE (bsc#1180689).
-------------------------------------------------------------------
Fri Feb 5 09:38:02 UTC 2021 - Reinhard Max <max@suse.com>
- Enable syscallfilter unconditionally [boo#1181826].
-------------------------------------------------------------------
Mon Dec 7 09:53:22 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
- drop buildrequires on NSS. We need gnutls for NTS anyway and we
can do all the other required crypto via nettle+gnutls. no need
for another crypto library.
-------------------------------------------------------------------
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>

164
chrony.keyring
View File

@ -1,116 +1,54 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
y2z7tjnVpw==
=EQrk
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
bcAu2uXfRrQxpaqcOg==
=/wbD
-----END PGP PUBLIC KEY BLOCK-----

24
chrony.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package chrony
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,14 +16,17 @@
#
%bcond_without testsuite
%define _systemdutildir %(pkg-config --variable systemdutildir systemd)
%global clknetsim_ver 79ffe44
#global clknetsim_ver 79ffe44
%global clknetsim_ver f89702d
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: chrony
Version: 3.5.1
Version: 4.1
Release: 0
Summary: System Clock Synchronization Client and Server
License: GPL-2.0-only
@ -42,20 +45,19 @@ 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
BuildRequires: pkgconfig
BuildRequires: pps-tools-devel
# The timezone package is needed for the "make check" tests. It can be
@ -120,6 +122,7 @@ Provides: %name-pool-nonempty
Conflicts: otherproviders(%name-pool)
Requires: %name = %version
BuildArch: noarch
Supplements: (chrony and branding-openSUSE)
RemovePathPostfixes: .opensuse
%description pool-openSUSE
@ -133,6 +136,7 @@ Provides: %name-pool = %version
Conflicts: otherproviders(%name-pool)
Requires: %name = %version
BuildArch: noarch
Supplements: (chrony and branding-SLE)
RemovePathPostfixes: .empty
%description pool-empty
@ -147,8 +151,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 .
@ -175,9 +177,7 @@ export CFLAGS="%{optflags} -Wall -fpic -DPIC $(pkg-config --cflags libseccomp)"
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
%configure \
--docdir="%{_docdir}/%{name}" \
%if %{with syscallfilter}
--enable-scfilter \
%endif
--with-user=chrony \
--with-hwclockfile=%{_sysconfdir}/adjtime \
--with-sendmail=%{_sbindir}/sendmail \
@ -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}

3
clknetsim-79ffe44.tar.gz
View File

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

3
clknetsim-f89702d.tar.gz Normal file
View File

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

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