Accepting request 453813 from network:time
- Upgraded to version 3.1: OBS-URL: https://build.opensuse.org/request/show/453813 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chrony?expand=0&rev=5
This commit is contained in:
commit
e8a8afff7b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a0387b91a20f047856a56d6541a1cf920c91b53b32f74c123bcb70f1a5d2cd6d
|
||||
size 421433
|
3
chrony-3.1.tar.gz
Normal file
3
chrony-3.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9d9107dcdb7768a03dc129d33b2a7a25f1eea2f5620bc85eb00cfea07c1b6075
|
||||
size 424109
|
@ -1,7 +1,5 @@
|
||||
Index: chrony-2.3/examples/chrony.conf.example3
|
||||
===================================================================
|
||||
--- chrony-2.3.orig/examples/chrony.conf.example3
|
||||
+++ chrony-2.3/examples/chrony.conf.example3
|
||||
--- chrony-3.1/examples/chrony.conf.example3 2017-01-31 05:22:11.000000000 -0500
|
||||
+++ chrony-3.1/examples/chrony.conf.example3 2017-01-31 11:53:04.000000000 -0500
|
||||
@@ -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.
|
||||
@ -11,8 +9,7 @@ Index: chrony-2.3/examples/chrony.conf.example3
|
||||
-! server baz.example.net iburst
|
||||
-
|
||||
! pool pool.ntp.org iburst
|
||||
-
|
||||
+
|
||||
|
||||
+# for Europe:
|
||||
+! server 0.europe.pool.ntp.org
|
||||
+! server 1.europe.pool.ntp.org
|
||||
@ -43,10 +40,10 @@ Index: chrony-2.3/examples/chrony.conf.example3
|
||||
+! server 2.oceania.pool.ntp.org
|
||||
+! server 3.oceania.pool.ntp.org
|
||||
+
|
||||
# However, for dial-up use you probably want these instead. The word
|
||||
# 'offline' means that the server is not visible at boot time. Use
|
||||
# chronyc's 'online' command to tell chronyd that these servers have
|
||||
@@ -77,7 +103,7 @@
|
||||
#######################################################################
|
||||
### AVOIDING POTENTIALLY BOGUS CHANGES TO YOUR CLOCK
|
||||
#
|
||||
@@ -65,7 +91,7 @@
|
||||
# immediately so that it doesn't gain or lose any more time. You
|
||||
# generally want this, so it is uncommented.
|
||||
|
||||
@ -55,7 +52,7 @@ Index: chrony-2.3/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.
|
||||
@@ -130,8 +156,8 @@ driftfile /var/lib/chrony/drift
|
||||
@@ -118,8 +144,8 @@
|
||||
# produce some graphs of your system's timekeeping performance, or you
|
||||
# need help in debugging a problem.
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: chrony-3.0/clknetsim-6bb6519590ebf43a61f2c11442da525a1950b7df/client.c
|
||||
Index: chrony-3.1/clknetsim-ce89a1b4e361c432ba3541548008ef0a87bd7fdb/client.c
|
||||
===================================================================
|
||||
--- chrony-3.0/clknetsim-6bb6519590ebf43a61f2c11442da525a1950b7df/client.c
|
||||
+++ chrony-3.0/clknetsim-6bb6519590ebf43a61f2c11442da525a1950b7df/client.c
|
||||
@@ -954,6 +954,8 @@ int open(const char *pathname, int flags
|
||||
--- chrony-3.1/clknetsim-ce89a1b4e361c432ba3541548008ef0a87bd7fdb/client.c
|
||||
+++ chrony-3.1/clknetsim-ce89a1b4e361c432ba3541548008ef0a87bd7fdb/client.c
|
||||
@@ -1000,6 +1000,8 @@ int open(const char *pathname, int flags
|
||||
else if (!strcmp(pathname, "/dev/ptp1"))
|
||||
return SYSCLK_FD;
|
||||
|
||||
@ -11,7 +11,7 @@ Index: chrony-3.0/clknetsim-6bb6519590ebf43a61f2c11442da525a1950b7df/client.c
|
||||
r = _open(pathname, flags);
|
||||
assert(r < 0 || (r < BASE_SOCKET_FD && r < BASE_TIMER_FD));
|
||||
|
||||
@@ -972,6 +974,8 @@ int close(int fd) {
|
||||
@@ -1018,6 +1020,8 @@ int close(int fd) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1,12 +1,10 @@
|
||||
Index: chrony-2.3/examples/chronyd.service
|
||||
===================================================================
|
||||
--- chrony-2.3.orig/examples/chronyd.service
|
||||
+++ chrony-2.3/examples/chronyd.service
|
||||
@@ -8,6 +8,7 @@ Type=forking
|
||||
--- 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
|
||||
@@ -10,6 +10,7 @@
|
||||
PIDFile=/var/run/chronyd.pid
|
||||
EnvironmentFile=-/etc/sysconfig/chronyd
|
||||
ExecStart=/usr/sbin/chronyd $OPTIONS
|
||||
+ExecStartPost=/usr/share/chrony-helper update-daemon
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
PrivateTmp=yes
|
||||
ProtectHome=yes
|
||||
ProtectSystem=full
|
||||
|
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 31 16:38:05 UTC 2017 - mpost@suse.com
|
||||
|
||||
- Upgraded to version 3.1:
|
||||
- Enhancements
|
||||
- Add support for precise cross timestamping of PHC on Linux
|
||||
- Add minpoll, precision, nocrossts options to hwtimestamp directive
|
||||
- Add rawmeasurements option to log directive and modify measurements
|
||||
option to log only valid measurements from synchronised sources
|
||||
- Allow sub-second polling interval with NTP sources
|
||||
- Bug fixes
|
||||
- Fix time smoothing in interleaved mode
|
||||
- Upgraded clknetsim to version ce89a1b.
|
||||
- Reworked the following patches to fit the new versions
|
||||
- chrony-config.patch
|
||||
- chrony-service-helper.patch
|
||||
- chrony-fix-open.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 16 22:36:09 UTC 2017 - mpost@suse.com
|
||||
|
||||
|
25
chrony.spec
25
chrony.spec
@ -17,6 +17,7 @@
|
||||
|
||||
|
||||
%define vendorzone opensuse.
|
||||
%global clknetsim_ver ce89a1b
|
||||
%if 0%{?suse_version} > 1230
|
||||
%bcond_without systemd
|
||||
%bcond_without syscallfilter
|
||||
@ -24,10 +25,8 @@
|
||||
%bcond_with systemd
|
||||
%bcond_with syscallfilter
|
||||
%endif
|
||||
%global clknetsim_ver 6bb6519
|
||||
|
||||
Name: chrony
|
||||
Version: 3.0
|
||||
Version: 3.1
|
||||
Release: 0
|
||||
Summary: System Clock Synchronization Client and Server
|
||||
License: GPL-2.0
|
||||
@ -42,7 +41,6 @@ Source5: chrony-dnssrv@.service
|
||||
Source6: chrony-dnssrv@.timer
|
||||
# Simulator for test suite
|
||||
Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
|
||||
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch0: chrony-config.patch
|
||||
# Add NTP servers from DHCP when starting service
|
||||
@ -56,11 +54,16 @@ BuildRequires: gcc-c++
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libedit-devel
|
||||
BuildRequires: mozilla-nss-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig
|
||||
# The timezone package is needed for the "make check" tests. It can be
|
||||
# removed if the call to make check is ever deleted.
|
||||
BuildRequires: timezone
|
||||
|
||||
Requires: logrotate
|
||||
Requires(pre): %fillup_prereq
|
||||
Requires(pre): %{_sbindir}/groupadd
|
||||
Requires(pre): %{_sbindir}/useradd
|
||||
Provides: ntp-daemon
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if %{with syscallfilter}
|
||||
%ifarch s390 s390x ppc64le
|
||||
BuildRequires: libseccomp-devel >= 2.2.0
|
||||
@ -74,12 +77,6 @@ BuildRequires: pkgconfig(systemd)
|
||||
%else
|
||||
Requires(pre): %insserv_prereq
|
||||
%endif
|
||||
Requires: logrotate
|
||||
Requires(pre): %fillup_prereq
|
||||
Requires(pre): %{_sbindir}/groupadd
|
||||
Requires(pre): %{_sbindir}/useradd
|
||||
Provides: ntp-daemon
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
Chrony is an implementation of the Network Time Protocol (NTP). It can
|
||||
@ -164,8 +161,8 @@ install -m 644 -p examples/chrony-wait.service \
|
||||
%{buildroot}%{_unitdir}/chrony-wait.service
|
||||
install -m 644 -p %{SOURCE5} %{buildroot}%{_unitdir}/chrony-dnssrv@.service
|
||||
install -m 644 -p %{SOURCE6} %{buildroot}%{_unitdir}/chrony-dnssrv@.timer
|
||||
ln -s /usr/sbin/service "%{buildroot}%{_sbindir}/rcchronyd"
|
||||
ln -s /usr/sbin/service "%{buildroot}%{_sbindir}/rcchrony-wait"
|
||||
ln -s %{_sbindir}/service "%{buildroot}%{_sbindir}/rcchronyd"
|
||||
ln -s %{_sbindir}/service "%{buildroot}%{_sbindir}/rcchrony-wait"
|
||||
|
||||
echo 'chronyd.service' > \
|
||||
%{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:41ff25fadcc79bfb0898711662df367c1ec6e3f02aa135c53169837b656875f6
|
||||
size 41044
|
3
clknetsim-ce89a1b.tar.gz
Normal file
3
clknetsim-ce89a1b.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b0896e582bfd6a4b09e6ac24188072d136889e8a0d5d155d0834212284917ec8
|
||||
size 41404
|
Loading…
x
Reference in New Issue
Block a user