[rpms/chrony] rawhide: update to 4.9-pre1

[rpms/chrony] rawhide: update to 4.9-pre1

[Miroslav Lichvar]

A new commit has been pushed.

Repo   : rpms/chrony
Branch : rawhide
Commit : 37cc9dadb1abb1b77105247bc9e15a39e2dac1e9
Author : Miroslav Lichvar <mlichvar@redhat.com>
Date   : 2026-08-12T16:22:54+02:00
Stats  : +9/-204 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/chrony/c/37cc9dadb1abb1b77105247bc9e15a39e2dac1e9?branch=rawhide

Log:
update to 4.9-pre1

---
diff --git a/.gitignore b/.gitignore
index 4d608e1..8aef133 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/chrony-4.8-tar-gz-asc.txt
-/chrony-4.8.tar.gz
-/clknetsim-6ee99f50dec8.tar.gz
+/chrony-4.9-pre1-tar-gz-asc.txt
+/chrony-4.9-pre1.tar.gz
+/clknetsim-93750cc17ebe.tar.gz

diff --git a/chrony-seccomp.patch b/chrony-seccomp.patch
deleted file mode 100644
index c8f79ae..0000000
--- a/chrony-seccomp.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-commit 03875f1ea5c4c0eeeb30a7d1fc5fdd53236f4ac2
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Tue Oct 21 14:06:38 2025 +0200
-
-    sys_linux: allow ioctl(TCGETS2) in seccomp filter
-    
-    Add TCGETS2 to the list of allowed ioctls. It seems to be called by the
-    latest glibc version from isatty(), which is called from libpcsclite
-    used by gnutls in an NTS-KE session.
-    
-    Include the linux termios header instead of glibc header to get a usable
-    definition of TCGETS2.
-
-diff --git a/sys_linux.c b/sys_linux.c
-index ca5540f2..e20e459d 100644
---- a/sys_linux.c
-+++ b/sys_linux.c
-@@ -48,7 +48,7 @@
- #ifdef FEAT_SCFILTER
- #include <sys/prctl.h>
- #include <seccomp.h>
--#include <termios.h>
-+#include <linux/termios.h>
- #ifdef FEAT_PPS
- #include <linux/pps.h>
- #endif
-@@ -615,7 +615,7 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
-   const static int fcntls[] = { F_GETFD, F_SETFD, F_GETFL, F_SETFL };
- 
-   const static unsigned long ioctls[] = {
--    FIONREAD, TCGETS, TIOCGWINSZ,
-+    FIONREAD, TCGETS, TCGETS2, TIOCGWINSZ,
- #if defined(FEAT_PHC) || defined(HAVE_LINUX_TIMESTAMPING)
-     PTP_EXTTS_REQUEST, PTP_SYS_OFFSET,
- #ifdef PTP_PIN_SETFUNC
-commit 3c39afa13c769452d4c340bfc987e229b7c9caeb
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Wed Oct 22 10:53:11 2025 +0200
-
-    sys_linux: fix building with older compilers and some archs
-    
-    The recent replacement of <termios.h> with <linux/termios.h> to get
-    TCGETS2 seems to work only with compilers (or C standards) that allow
-    the same structure to be defined multiple times. There is a conflict
-    between <sys/ioctl.h> and <linux/termios.h>.
-    
-    Another problem is that TCGETS2 is not used on some archs like ppc64.
-    
-    Switch back to <termios.h> and move TCGETS2 to a list in a separate
-    file where it can be compiled without <sys/ioctl.h>.
-    
-    Fixes: 03875f1ea5c4 ("sys_linux: allow ioctl(TCGETS2) in seccomp filter")
-
-diff --git a/configure b/configure
-index 195b1ed7..ca64475d 100755
---- a/configure
-+++ b/configure
-@@ -808,6 +808,7 @@ then
-   # a time and the async resolver would block the main thread
-   priv_ops="NAME2IPADDRESS RELOADDNS"
-   EXTRA_LIBS="$EXTRA_LIBS -lseccomp"
-+  EXTRA_OBJECTS="$EXTRA_OBJECTS sys_linux_scmp.o"
- fi
- 
- if [ "x$priv_ops" != "x" ]; then
-diff --git a/sys_linux.c b/sys_linux.c
-index e20e459d..89eec950 100644
---- a/sys_linux.c
-+++ b/sys_linux.c
-@@ -48,7 +48,7 @@
- #ifdef FEAT_SCFILTER
- #include <sys/prctl.h>
- #include <seccomp.h>
--#include <linux/termios.h>
-+#include <termios.h>
- #ifdef FEAT_PPS
- #include <linux/pps.h>
- #endif
-@@ -63,6 +63,7 @@
- #endif
- 
- #include "sys_linux.h"
-+#include "sys_linux_scmp.h"
- #include "sys_timex.h"
- #include "conf.h"
- #include "local.h"
-@@ -615,7 +616,7 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
-   const static int fcntls[] = { F_GETFD, F_SETFD, F_GETFL, F_SETFL };
- 
-   const static unsigned long ioctls[] = {
--    FIONREAD, TCGETS, TCGETS2, TIOCGWINSZ,
-+    FIONREAD, TCGETS, TIOCGWINSZ,
- #if defined(FEAT_PHC) || defined(HAVE_LINUX_TIMESTAMPING)
-     PTP_EXTTS_REQUEST, PTP_SYS_OFFSET,
- #ifdef PTP_PIN_SETFUNC
-@@ -728,6 +729,14 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
-                            SCMP_A1(SCMP_CMP_EQ, ioctls[i])) < 0)
-         goto add_failed;
-     }
-+
-+    /* Allow selected ioctls that need to be specified in a separate
-+       file to avoid conflicting headers (e.g. TCGETS2) */
-+    for (i = 0; SYS_Linux_GetExtraScmpIoctl(i) != 0; i++) {
-+      if (seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(ioctl), 1,
-+                           SCMP_A1(SCMP_CMP_EQ, SYS_Linux_GetExtraScmpIoctl(i))) < 0)
-+        goto add_failed;
-+    }
-   }
- 
-   if (seccomp_load(ctx) < 0)
-diff --git a/sys_linux_scmp.c b/sys_linux_scmp.c
-new file mode 100644
-index 00000000..a907a97d
---- /dev/null
-+++ b/sys_linux_scmp.c
-@@ -0,0 +1,44 @@
-+/*
-+  chronyd/chronyc - Programs for keeping computer clocks accurate.
-+
-+ **********************************************************************
-+ * Copyright (C) Miroslav Lichvar  2025
-+ * 
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of version 2 of the GNU General Public License as
-+ * published by the Free Software Foundation.
-+ * 
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ * 
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+ * 
-+ **********************************************************************
-+
-+  =======================================================================
-+
-+  Lists of values that are needed in seccomp filters but need to
-+  be compiled separately from sys_linux.c due to conflicting headers.
-+  */
-+
-+#include <linux/termios.h>
-+
-+#include "sys_linux_scmp.h"
-+
-+unsigned long
-+SYS_Linux_GetExtraScmpIoctl(int index)
-+{
-+  const unsigned long ioctls[] = {
-+#ifdef TCGETS2
-+    /* Conflict between <linux/termios.h> and <sys/ioctl.h> */
-+    TCGETS2,
-+#endif
-+    0
-+  };
-+
-+  return ioctls[index];
-+}
-diff --git a/sys_linux_scmp.h b/sys_linux_scmp.h
-new file mode 100644
-index 00000000..62a9d548
---- /dev/null
-+++ b/sys_linux_scmp.h
-@@ -0,0 +1,28 @@
-+/*
-+  chronyd/chronyc - Programs for keeping computer clocks accurate.
-+
-+ **********************************************************************
-+ * Copyright (C) Miroslav Lichvar  2025
-+ * 
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of version 2 of the GNU General Public License as
-+ * published by the Free Software Foundation.
-+ * 
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ * 
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+ * 
-+ **********************************************************************
-+
-+  =======================================================================
-+
-+  Header file for lists that are needed in seccomp filters but need to
-+  be compiled separately from sys_linux.c due to conflicting headers.
-+  */
-+
-+extern unsigned long SYS_Linux_GetExtraScmpIoctl(int index);

diff --git a/chrony.spec b/chrony.spec
index 4cfa3c6..93e5ab0 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -1,5 +1,6 @@
 %global _hardened_build 1
-%global clknetsim_ver 6ee99f50dec8
+%global prerelease -pre1
+%global clknetsim_ver 93750cc17ebe
 %bcond_without debug
 %bcond_without nts
 
@@ -8,7 +9,7 @@
 %endif
 
 Name:           chrony
-Version:        4.8
+Version:        4.9
 Release:        7%{?dist}
 Summary:        An NTP client/server
 
@@ -27,8 +28,6 @@ Source10:       https://gitlab.com/chrony/clknetsim/-/archive/master/clknetsim-%
 Patch1:         chrony-nm-dispatcher-dhcp.patch
 # let systemd create /var/lib/chrony and /var/log/chrony
 Patch2:         chrony-servicedirs.patch
-# update seccomp filter for new glibc
-Patch3:         chrony-seccomp.patch
 
 BuildRequires:  libcap-devel libedit-devel nettle-devel pps-tools-devel
 BuildRequires:  gcc gcc-c++ make bison systemd gnupg2

diff --git a/sources b/sources
index 35a8415..918b553 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (chrony-4.8-tar-gz-asc.txt) = df7f4e06f74a4b8c9a49e8fe57ea02e0324c5683d036412c32192a09f08e08f33537609cef8df0b4302bfcd63332b3092f33f40c8d02857c93ecea13822b5b47
-SHA512 (chrony-4.8.tar.gz) = 949b796bb34db32a5c1b9e6b53be6a22e51c59f24a316d585b8a52a52ab1f61bdf0378dc58b282bb0ba4fac1f05e1e99fbe37cb4259aa2b359e7bf679c176aab
-SHA512 (clknetsim-6ee99f50dec8.tar.gz) = 2621d1c44b84b42fcdf644f236ff90dab9f8a8407a138c8719c53dd9c4f21480db3b4ba598116aa1b9d6bd1fa02fc410d85a43baf55ddf8ad47fc09aba4c4477
+SHA512 (chrony-4.9-pre1-tar-gz-asc.txt) = 6d6ce15eb196f0cd3819cedd2b5b95ab89b9f249f0602669cb701794d6ed7787c8c4f8141cb54bd2aeb4d59aa311d29fd14101d0ee86a1083d7449968edb061d
+SHA512 (chrony-4.9-pre1.tar.gz) = 0f71080682425a6cef003fd376ea5ab559ff8b9eea88be3e1a100b43197038f40cb7dcc936970a89fbcd4f0c670e8c06ddb1052ea2fc0ff53fcd9c9c8cb0823b
+SHA512 (clknetsim-93750cc17ebe.tar.gz) = 74afca527d3de2538552ca07ba59fcdb8f727fce606498de5f40cf97df95e2d2fa40f1540040519c871ada4f131a9871f9d4845d57765eb7a7cf94e8f596bcce