Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chrony for openSUSE:Factory checked
in at 2024-06-06 12:30:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chrony (Old)
and /work/SRC/openSUSE:Factory/.chrony.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chrony"
Thu Jun 6 12:30:32 2024 rev:42 rq:1178691 version:4.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/chrony/chrony.changes 2024-02-27
22:44:29.446145723 +0100
+++ /work/SRC/openSUSE:Factory/.chrony.new.24587/chrony.changes 2024-06-06
12:30:40.856233142 +0200
@@ -1,0 +2,10 @@
+Tue Jun 4 14:57:09 UTC 2024 - Reinhard Max <m...@suse.com>
+
+- bsc#1225362, chrony-124-tai.patch: make 124-tai more reliable
+
+-------------------------------------------------------------------
+Mon May 27 15:34:40 UTC 2024 - Reinhard Max <m...@suse.com>
+
+- Update clknetsim to snapshot 0a11a35.
+
+-------------------------------------------------------------------
Old:
----
clknetsim-5d1dc05.tar.gz
New:
----
chrony-124-tai.patch
clknetsim-0a11a35.tar.gz
BETA DEBUG BEGIN:
New:
- bsc#1225362, chrony-124-tai.patch: make 124-tai more reliable
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chrony.spec ++++++
--- /var/tmp/diff_new_pack.Hyhsm7/_old 2024-06-06 12:30:41.636261631 +0200
+++ /var/tmp/diff_new_pack.Hyhsm7/_new 2024-06-06 12:30:41.636261631 +0200
@@ -33,7 +33,7 @@
%bcond_without testsuite
%define _systemdutildir %(pkg-config --variable systemdutildir systemd)
-%global clknetsim_ver 5d1dc05
+%global clknetsim_ver 0a11a35
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
@@ -70,6 +70,7 @@
Patch3: chrony-service-ordering.patch
Patch7: chrony-htonl.patch
Patch8: chrony.nm-dispatcher.dhcp.patch
+Patch9: chrony-124-tai.patch
BuildRequires: NetworkManager-devel
BuildRequires: bison
BuildRequires: findutils
@@ -181,6 +182,7 @@
%patch -P 3
%patch -P 7
%patch -P 8
+%patch -P 9
# Remove pool statements from the default /etc/chrony.conf. They will
# be provided by branding packages in /etc/chrony.d/pool.conf .
++++++ chrony-124-tai.patch ++++++
>From 8f5b3084144967b313cfb51285bf6517e06e1b9e Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlich...@redhat.com>
Date: Tue, 4 Jun 2024 16:23:41 +0200
Subject: [PATCH] test: make 124-tai more reliable
Reported-by: Reinhard Max <m...@suse.de>
---
test/simulation/124-tai | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- test/simulation/124-tai.orig
+++ test/simulation/124-tai
@@ -20,7 +20,7 @@ client_conf="
refclock SHM 0 dpoll 0 poll 0 tai
leapsectz right/UTC
leapsecmode ignore
-maxchange 1e-3 1 0"
+maxchange 1e-3 10 0"
run_test || test_fail
check_chronyd_exit || test_fail
@@ -35,7 +35,7 @@ client_conf="
refclock SHM 0 dpoll 0 poll 0 tai
leapsectz right/UTC
makestep 1 1
-maxchange 1e-3 1 0"
+maxchange 1e-3 10 0"
run_test || test_fail
check_chronyd_exit || test_fail
++++++ clknetsim-5d1dc05.tar.gz -> clknetsim-0a11a35.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/clknetsim-5d1dc05806155924d7f0a004f7e0643b866c7807/client.c
new/clknetsim-0a11a356186bcbef412ea0282ed9d5e96e716a73/client.c
--- old/clknetsim-5d1dc05806155924d7f0a004f7e0643b866c7807/client.c
2023-10-05 10:42:12.000000000 +0200
+++ new/clknetsim-0a11a356186bcbef412ea0282ed9d5e96e716a73/client.c
2024-04-24 11:58:38.000000000 +0200
@@ -255,8 +255,13 @@
_fclose = (int (*)(FILE *fp))dlsym(RTLD_NEXT, "fclose");
_fcntl = (int (*)(int fd, int cmd, ...))dlsym(RTLD_NEXT, "fcntl");
#ifdef HAVE_STAT
+#if defined(__USE_TIME_BITS64) && __USE_TIME_BITS64
+ _fstat = (int (*)(int fd, struct stat *statbuf))dlsym(RTLD_NEXT,
"__fstat64_time64");
+ _stat = (int (*)(const char *pathname, struct stat
*statbuf))dlsym(RTLD_NEXT, "__stat64_time64");
+#else
_fstat = (int (*)(int fd, struct stat *statbuf))dlsym(RTLD_NEXT,
"fstat");
_stat = (int (*)(const char *pathname, struct stat
*statbuf))dlsym(RTLD_NEXT, "stat");
+#endif
#else
_fxstat = (int (*)(int ver, int fd, struct stat
*statbuf))dlsym(RTLD_NEXT, "__fxstat");
_xstat = (int (*)(int ver, const char *pathname, struct stat
*statbuf))dlsym(RTLD_NEXT, "__xstat");
@@ -296,7 +301,7 @@
env = getenv("CLKNETSIM_START_DATE");
if (env)
- system_time_offset = atol(env);
+ system_time_offset = atoll(env);
env = getenv("CLKNETSIM_RANDOM_SEED");
if (env)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/clknetsim-5d1dc05806155924d7f0a004f7e0643b866c7807/clknetsim.bash
new/clknetsim-0a11a356186bcbef412ea0282ed9d5e96e716a73/clknetsim.bash
--- old/clknetsim-5d1dc05806155924d7f0a004f7e0643b866c7807/clknetsim.bash
2023-10-05 10:42:12.000000000 +0200
+++ new/clknetsim-0a11a356186bcbef412ea0282ed9d5e96e716a73/clknetsim.bash
2024-04-24 11:58:38.000000000 +0200
@@ -135,6 +135,7 @@
echo " valgrind error" 1>&2
ret=1
fi
+ sed -i '/^ERROR: ld.so: object.*from LD_PRELOAD cannot/d' tmp/log.[0-9]*
fi
return $ret
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/clknetsim-5d1dc05806155924d7f0a004f7e0643b866c7807/network.cc
new/clknetsim-0a11a356186bcbef412ea0282ed9d5e96e716a73/network.cc
--- old/clknetsim-5d1dc05806155924d7f0a004f7e0643b866c7807/network.cc
2023-10-05 10:42:12.000000000 +0200
+++ new/clknetsim-0a11a356186bcbef412ea0282ed9d5e96e716a73/network.cc
2024-04-24 11:58:38.000000000 +0200
@@ -309,10 +309,11 @@
void Network::write_correction(struct Packet *packet, double correction) {
uint64_t c;
- /* one-step transparent edge-to-edge PTP clock */
+ /* one-step transparent end-to-end PTP clock */
if (packet->src_port != 319 || packet->dst_port != 319 || packet->len <
34 ||
- (packet->data[0] != 0 && packet->data[0] != 1) || (packet->data[1]
& 0xf) != 2)
+ ((packet->data[0] & 0xf) != 0 && (packet->data[0] & 0xf) != 1) ||
+ (packet->data[1] & 0xf) != 2)
return;
c = ((uint64_t)ntohl(*(uint32_t *)(packet->data + 8)) << 32) |
