- x32 buildfix patch from debian

diff --git a/systemd-timesync-changes-type-of-drift_freq-to-int64_t.patch b/systemd-timesync-changes-type-of-drift_freq-to-int64_t.patch
new file mode 100644 (file)
index 0000000..a45c57b
--- /dev/null
+++ b/systemd-timesync-changes-type-of-drift_freq-to-int64_t.patch
@@ -0,0 +1,41 @@
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sat, 23 Jun 2018 09:41:55 +0900
+Subject: timesync: changes type of drift_freq to int64_t
+
+drift_freq is used for storing timex.freq, and is a 64bit integer.
+To support x32 ABI, this changes the type of drift_freq to int64_t.
+
+Fixes #9387.
+
+(cherry picked from commit 75ca1621db4647a4d62d7873cd6715e28fe0f9fa)
+---
+ src/timesync/timesyncd-manager.c | 2 +-
+ src/timesync/timesyncd-manager.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
+index 2b731af..404a2b1 100644
+--- a/src/timesync/timesyncd-manager.c
++++ b/src/timesync/timesyncd-manager.c
+@@ -604,7 +604,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
+         m->dest_time = *recv_time;
+         m->spike = spike;
+ 
+-        log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRI_TIMEX"ppm%s",
++        log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRIi64"ppm%s",
+                   m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, m->drift_freq / 65536,
+                   spike ? " (ignored)" : "");
+ 
+diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
+index d8d97cc..1834741 100644
+--- a/src/timesync/timesyncd-manager.h
++++ b/src/timesync/timesyncd-manager.h
+@@ -79,7 +79,7 @@ struct Manager {
+         /* last change */
+         bool jumped;
+         bool sync;
+-        long drift_freq;
++        int64_t drift_freq;
+ 
+         /* watch for time changes */
+         sd_event_source *event_clock_watch;

diff --git a/systemd.spec b/systemd.spec
index bf1a0c1985e7a9471c4274f2908ba9949f68efaa..2dc50e24da30cd23526c927b411e9a63d000e185 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -94,6 +94,7 @@ Patch13:      sysctl.patch
 Patch14:       pld-pam-%{name}-user.patch
 Patch15:       %{name}-seccomp_disable_on_i386.patch
 Patch16:       meson-debug.patch
+Patch17:       %{name}-timesync-changes-type-of-drift_freq-to-int64_t.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -674,6 +675,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 cp -p %{SOURCE2} src/systemd_booted.c