From b486774bf9638af5f911427eb4af3d84b8bfe57a Mon Sep 17 00:00:00 2001 From: Allison Karlitskaya Date: Fri, 2 Feb 2024 07:52:16 +0100 Subject: [PATCH] vendor: update to the latest systemd_ctypes We didn't sync this in a while and there have been a lot of changes. We also have a critical bug fix included: we recently introduced a test case (in 0bb7438820486d31211b8b832a1063b0e6cbbeea) which triggers a segfault in the binding layer of systemd_ctypes due to FFI call trampolines being garbage collected while they're still running. This is currently blocking downstream packaging on several non-x86_64 architectures. --- src/cockpit/channels/filesystem.py | 3 ++- vendor/systemd_ctypes | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cockpit/channels/filesystem.py b/src/cockpit/channels/filesystem.py index b986b215e29..1403ecf3074 100644 --- a/src/cockpit/channels/filesystem.py +++ b/src/cockpit/channels/filesystem.py @@ -31,6 +31,7 @@ from cockpit._vendor.systemd_ctypes import Handle, PathWatch from cockpit._vendor.systemd_ctypes.inotify import Event as InotifyEvent +from cockpit._vendor.systemd_ctypes.pathwatch import Listener as PathWatchListener from ..channel import Channel, ChannelError, GeneratorChannel from ..jsonutil import ( @@ -298,7 +299,7 @@ class Follow(enum.Enum): YES = True -class FsInfoChannel(Channel): +class FsInfoChannel(Channel, PathWatchListener): payload = 'fsinfo' # Options (all get set in `do_open()`) diff --git a/vendor/systemd_ctypes b/vendor/systemd_ctypes index 46c18b5783f..833f5cee8ea 160000 --- a/vendor/systemd_ctypes +++ b/vendor/systemd_ctypes @@ -1 +1 @@ -Subproject commit 46c18b5783f674e28fe2fab17e4a691b0762bbf4 +Subproject commit 833f5cee8ea5d4c93aecf0ac2bf517cd5b52f5ec