Hello community,
here is the log from the commit of package chrony for openSUSE:Factory checked
in at 2018-10-25 08:09:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chrony (Old)
and /work/SRC/openSUSE:Factory/.chrony.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chrony"
Thu Oct 25 08:09:24 2018 rev:15 rq:642837 version:3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/chrony/chrony.changes 2018-08-07
10:50:10.608592995 +0200
+++ /work/SRC/openSUSE:Factory/.chrony.new/chrony.changes 2018-10-25
08:09:28.524300719 +0200
@@ -1,0 +2,35 @@
+Thu Oct 18 10:14:08 UTC 2018 - Ismail Dönmez <idon...@suse.com>
+
+- Update the keyring and uncomment it in the spec file
+
+-------------------------------------------------------------------
+Thu Oct 18 07:43:44 UTC 2018 - Martin Pluskal <mplus...@suse.com>
+
+- Comment out bad signature
+
+-------------------------------------------------------------------
+Wed Sep 19 18:21:19 UTC 2018 - Michael Ströder <mich...@stroeder.com>
+
+- Added %{_tmpfilesdir}/%{name}.conf
+- Updated clknetsim
+- Update to version 3.4
+ * Enhancements
+ + Add filter option to server/pool/peer directive
+ + Add minsamples and maxsamples options to hwtimestamp directive
+ + Add support for faster frequency adjustments in Linux 4.19
+ + Change default pidfile to /var/run/chrony/chronyd.pid to allow chronyd
+ without root privileges to remove it on exit
+ + Disable sub-second polling intervals for distant NTP sources
+ + Extend range of supported sub-second polling intervals
+ + Get/set IPv4 destination/source address of NTP packets on FreeBSD
+ + Make burst options and command useful with short polling intervals
+ + Modify auto_offline option to activate when sending request failed
+ + Respond from interface that received NTP request if possible
+ + Add onoffline command to switch between online and offline state
+ according to current system network configuration
+ + Improve example NetworkManager dispatcher script
+ * Bug fixes
+ + Avoid waiting in Linux getrandom system call
+ + Fix PPS support on FreeBSD and NetBSD
+
+-------------------------------------------------------------------
Old:
----
chrony-3.3.tar.gz
chrony-3.3.tar.gz.sig
clknetsim-42b693b.tar.gz
New:
----
chrony-3.4.tar.gz
chrony-3.4.tar.gz.sig
chrony-tmpfiles
clknetsim-cdf5e85.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chrony.spec ++++++
--- /var/tmp/diff_new_pack.tJWrzU/_old 2018-10-25 08:09:29.532300058 +0200
+++ /var/tmp/diff_new_pack.tJWrzU/_new 2018-10-25 08:09:29.536300055 +0200
@@ -12,18 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define vendorzone opensuse.
-%global clknetsim_ver 42b693b
+%global clknetsim_ver cdf5e85
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: chrony
-Version: 3.3
+Version: 3.4
Release: 0
Summary: System Clock Synchronization Client and Server
License: GPL-2.0-only
@@ -35,10 +35,11 @@
Source4: chrony.helper
Source5: chrony-dnssrv@.service
Source6: chrony-dnssrv@.timer
-Source7:
https://download.tuxfamily.org/chrony/chrony-3.3-tar-gz-asc.txt#/chrony-%{version}.tar.gz.sig
+Source7:
https://download.tuxfamily.org/chrony/chrony-3.4-tar-gz-asc.txt#/chrony-%{version}.tar.gz.sig
Source8: chrony.keyring
# Simulator for test suite
Source10:
https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
+Source11: chrony-tmpfiles
# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch0: chrony-config.patch
# Add NTP servers from DHCP when starting service
@@ -155,6 +156,8 @@
%{buildroot}%{_unitdir}/chrony-dnssrv@.service
install -Dpm 0644 %{SOURCE6} \
%{buildroot}%{_unitdir}/chrony-dnssrv@.timer
+install -Dpm 0644 %{SOURCE11} \
+ %{buildroot}%{_tmpfilesdir}/%{name}.conf
install -d %{buildroot}%{sbindir}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchronyd
@@ -191,6 +194,7 @@
%post
%fillup_only %{name}
+%tmpfiles_create %{name}.conf
%service_add_post chronyd.service chrony-wait.service
%postun
@@ -218,10 +222,12 @@
%{_unitdir}/chrony*.service
%{_unitdir}/chrony*.timer
%{_sbindir}/rcchrony*
+%{_tmpfilesdir}/%{name}.conf
%{_fillupdir}/sysconfig.chrony
%dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony
%ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/drift
%ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc
%dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
+%ghost %attr(0750, %{name}, %{name}) %{_rundir}/%{name}
%changelog
++++++ chrony-3.3.tar.gz -> chrony-3.4.tar.gz ++++++
++++ 6749 lines of diff (skipped)
++++++ chrony-service-helper.patch ++++++
--- /var/tmp/diff_new_pack.tJWrzU/_old 2018-10-25 08:09:29.704299944 +0200
+++ /var/tmp/diff_new_pack.tJWrzU/_new 2018-10-25 08:09:29.704299944 +0200
@@ -1,7 +1,7 @@
---- 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
+--- chrony-3.4/examples/chronyd.service 2018-09-19 16:38:15.000000000
+0200
++++ chrony-3.4/examples/chronyd.service 2018-09-19 20:49:29.444128690
+0200
@@ -10,6 +10,7 @@
- PIDFile=/var/run/chronyd.pid
+ PIDFile=/var/run/chrony/chronyd.pid
EnvironmentFile=-/etc/sysconfig/chronyd
ExecStart=/usr/sbin/chronyd $OPTIONS
+ExecStartPost=/usr/share/chrony-helper update-daemon
++++++ chrony-tmpfiles ++++++
d /run/chrony 0755 chrony chrony++++++ chrony.keyring ++++++
--- /var/tmp/diff_new_pack.tJWrzU/_old 2018-10-25 08:09:29.736299923 +0200
+++ /var/tmp/diff_new_pack.tJWrzU/_new 2018-10-25 08:09:29.740299921 +0200
@@ -9,21 +9,108 @@
igOZBADQ9T6XYQBTfRmGUkl7hEeAeu+WfEGDVlHP+EpMtk/uANUqYef5xUG4RomE
EyjRlrEXwG7Ly2HhH3UADBuPjkP68AGN8WslbCNx5Na+nZr6r1sT1+Z3OdUDprpY
PQxCu5WWYsYgzroO/JEA2d3pYgaaHEAhyZxau1UtW4hpAn8svbQmTWlyb3NsYXYg
-TGljaHZhciA8bWxpY2h2YXJAcmVkaGF0LmNvbT6IZgQTEQIAJgIbAwYLCQgHAwIE
-FQIIAwQWAgMBAh4BAheABQJWlM11BQkWLJibAAoJEF/wbym6HgE7UTsAmwbZUuT0
-OVgRwWRvgpwzpRbdQBP5AKCXLqK/+vB/9d5pJUXch2v7lqyy87kCDQRGC89XEAgA
-medsNk8FIYdzJYyP2eaIYKMTpSCFgTKE1EHdiRaX5n3oo9o26+vfA1NfIwKM8G54
-3Ddr1yl2PRmQermHMQahMMsXcehQXjsJoZXTglJq6kw5Xb1V1K6SyXQv/sLmWGxw
-T91T+0I+9g+UqMeqR8B2hj950BbfWn6Pu5CRk2voTsYEU2ecejKOWOOrbUnD/5wy
-mkSD/1g+T7bgGOHMrSgYWH3Fk7dWNKpGBtQn3cL7fKy+cn4koDW1L3ebxg4zWpFo
-l51m3u8DXc9lqUjg9AoqJH1bc9eQPQvJKxd5syU2pkgtHhT2rlSqpRtsKsgRNfBC
-qBbK9gtEM3DRUD+EbbEZgwADBQf8CTSksVEUs5svpQlldZERwViUwwVb4TMszKKq
-nEti6zu6oMkIDreGzSISDsrWq1WxzUv9IYumwanzkgTpVVfFPxK7samtol8Lol5V
-r3Zbil3Q0IGJ9thhitMHRSU3ClhVRZF5QF/MhSzD1j0cXK4Ls0np5DePT3H4tItZ
-+OcEhZcDb8k2DMcJW/REuiisWOElwIDM0o0kZyQiy+5QRfE2xancu3n8+wGtwc0N
-2Yp/elmIigreu0xuK7HaFOiScUYv00BJa/ZEO2aOkRuiKkdp3oxtz3MIdDYyGbI6
-mL4h+X8079i95yu+L2tUJGHeN5u+X0Hsg9sE6TpVEggQEI30YYhPBBgRAgAPAhsM
-BQJWlM2TBQkWLJi3AAoJEF/wbym6HgE7G9sAnA3EsHwEZ+CcOmKFBJRbkj3Dxagp
-AJ962OOivxERsKPk/hXIN1oUXY54Aw==
-=Vbe3
+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
+y2z7tjnVpw==
+=EQrk
-----END PGP PUBLIC KEY BLOCK-----
++++++ clknetsim-42b693b.tar.gz -> clknetsim-cdf5e85.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/clknetsim-42b693b1a4d0126a10faf9ef564a41f55a138f29/client.c
new/clknetsim-cdf5e859d55fe22721429a11af7631e519a8570f/client.c
--- old/clknetsim-42b693b1a4d0126a10faf9ef564a41f55a138f29/client.c
2018-06-18 13:04:13.000000000 +0200
+++ new/clknetsim-cdf5e859d55fe22721429a11af7631e519a8570f/client.c
2018-09-25 17:05:10.000000000 +0200
@@ -22,6 +22,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/syscall.h>
+#include <sys/timerfd.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <netinet/in.h>
@@ -149,6 +150,7 @@
int used;
int armed;
int type;
+ clockid_t clock_id;
double timeout;
double interval;
};
@@ -864,7 +866,7 @@
return recv_fd ? 1 : 0;
}
-#if 1
+#ifndef CLKNETSIM_DISABLE_POLL
int poll(struct pollfd *fds, nfds_t nfds, int timeout) {
struct timeval tv, *ptv = NULL;
int r, maxfd = 0;
@@ -1008,7 +1010,7 @@
int open(const char *pathname, int flags) {
int r;
- assert(REFCLK_PHC_INDEX == 0 || SYSCLK_PHC_INDEX == 1);
+ assert(REFCLK_PHC_INDEX == 0 && SYSCLK_PHC_INDEX == 1);
if (!strcmp(pathname, "/dev/ptp0"))
return REFCLK_FD;
else if (!strcmp(pathname, "/dev/ptp1"))
@@ -1261,7 +1263,7 @@
info = (struct ethtool_ts_info *)req->ifr_data;
memset(info, 0, sizeof (*info));
if (get_network_from_iface(req->ifr_name) >= 0) {
- info->phc_index = SYSCLK_PHC_INDEX;
+ info->phc_index = timestamping > 1 ? REFCLK_PHC_INDEX :
SYSCLK_PHC_INDEX;
info->so_timestamping = SOF_TIMESTAMPING_SOFTWARE |
SOF_TIMESTAMPING_TX_SOFTWARE |
SOF_TIMESTAMPING_RX_SOFTWARE |
SOF_TIMESTAMPING_RAW_HARDWARE |
@@ -1583,13 +1585,14 @@
cmsg->cmsg_type = SO_TIMESTAMPING;
cmsg->cmsg_len = CMSG_LEN(3 * sizeof (ts));
- clock_gettime(CLOCK_REALTIME, &ts);
-
- /* copy as sw and hw time stamp */
- if (sockets[s].time_stamping & SOF_TIMESTAMPING_SOFTWARE)
+ if (sockets[s].time_stamping & SOF_TIMESTAMPING_SOFTWARE) {
+ clock_gettime(CLOCK_REALTIME, &ts);
memcpy((struct timespec *)CMSG_DATA(cmsg), &ts, sizeof
(ts));
- if (sockets[s].time_stamping & SOF_TIMESTAMPING_RAW_HARDWARE)
+ }
+ if (sockets[s].time_stamping & SOF_TIMESTAMPING_RAW_HARDWARE) {
+ clock_gettime(timestamping > 1 ? REFCLK_ID :
CLOCK_REALTIME, &ts);
memcpy((struct timespec *)CMSG_DATA(cmsg) + 2, &ts,
sizeof (ts));
+ }
}
#endif
msg->msg_controllen = cmsglen;
@@ -1644,6 +1647,7 @@
timers[t].used = 1;
timers[t].armed = 0;
timers[t].type = TIMER_TYPE_SIGNAL;
+ timers[t].clock_id = which_clock;
*created_timer_id = get_timerid(t);
return 0;
@@ -1665,16 +1669,19 @@
int timer_settime(timer_t timerid, int flags, const struct itimerspec *value,
struct itimerspec *ovalue) {
int t = get_timer_from_id(timerid);
- assert(flags == 0 && value && ovalue == NULL);
-
if (t < 0) {
errno = EINVAL;
return -1;
}
+ assert(value && ovalue == NULL &&
+ (flags == 0 || (flags == TIMER_ABSTIME && timers[t].clock_id ==
CLOCK_MONOTONIC)));
+
if (value->it_value.tv_sec || value->it_value.tv_nsec) {
timers[t].armed = 1;
- timers[t].timeout = get_monotonic_time() +
timespec_to_time(&value->it_value, 0);
+ timers[t].timeout = timespec_to_time(&value->it_value, 0);
+ if (!(flags & TIMER_ABSTIME))
+ timers[t].timeout += get_monotonic_time();
timers[t].interval = timespec_to_time(&value->it_interval, 0);
} else {
timers[t].armed = 0;
@@ -1704,7 +1711,7 @@
return 0;
}
-#if 1
+#ifndef CLKNETSIM_DISABLE_ITIMER
int setitimer(__itimer_which_t which, const struct itimerval *new_value,
struct itimerval *old_value) {
struct itimerspec timerspec;
@@ -1753,14 +1760,18 @@
timers[t].used = 1;
timers[t].armed = 0;
timers[t].type = TIMER_TYPE_FD;
+ timers[t].clock_id = clockid;
return get_timerfd(t);
}
int timerfd_settime(int fd, int flags, const struct itimerspec *new_value,
struct itimerspec *old_value) {
- assert(!flags);
+ if (flags == TFD_TIMER_ABSTIME)
+ flags = TIMER_ABSTIME;
+ else
+ assert(!flags);
- return timer_settime(get_timerid(get_timer_from_fd(fd)), 0, new_value,
old_value);
+ return timer_settime(get_timerid(get_timer_from_fd(fd)), flags,
new_value, old_value);
}
int timerfd_gettime(int fd, struct itimerspec *curr_value) {
@@ -1807,7 +1818,7 @@
int uname(struct utsname *buf) {
memset(buf, 0, sizeof (*buf));
sprintf(buf->sysname, "Linux (clknetsim)");
- sprintf(buf->release, "2.6.39");
+ sprintf(buf->release, "4.19");
return 0;
}
@@ -1840,7 +1851,7 @@
void closelog(void) {
}
-#if 1
+#ifndef CLKNETSIM_DISABLE_SYSCALL
long syscall(long number, ...) {
va_list ap;
long r;
