Re: [PATCH] linux: fix ntp_gettime abi break

["Kacper Piwiński" <vfjpl1@gmail.com>]

From 64bbb7cc698c8e2c8d8c94247e0bc47ac3b18f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Piwi=C5=84ski?= <vfjpl1@gmail.com>
Date: Wed, 22 Feb 2023 18:58:38 +0100
Subject: [PATCH] linux: fix ntp_gettime abi break

---
 sysdeps/unix/sysv/linux/ntp_gettime.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/ntp_gettime.c
b/sysdeps/unix/sysv/linux/ntp_gettime.c
index 4879573530..a577314636 100644
--- a/sysdeps/unix/sysv/linux/ntp_gettime.c
+++ b/sysdeps/unix/sysv/linux/ntp_gettime.c
@@ -40,7 +40,6 @@ __ntp_gettime64 (struct __ntptimeval64 *ntv)
   ntv->time = tntx.time;
   ntv->maxerror = tntx.maxerror;
   ntv->esterror = tntx.esterror;
-  ntv->tai = tntx.tai;
   return result;
 }

@@ -54,7 +53,10 @@ __ntp_gettime (struct ntptimeval *ntv)
   int result;

   result = __ntp_gettime64 (&ntv64);
-  *ntv = valid_ntptimeval64_to_ntptimeval (ntv64);
+  //manually update fields to maintain abi with v2.11 struct definition
+  ntv->time = valid_timeval64_to_timeval (ntv64.time);
+  ntv->maxerror = ntv64.maxerror;
+  ntv->esterror = ntv64.esterror;

   return result;
 }
-- 
2.34.1