From ed20425da7a29b9c0dfbbfa1faa9206d348a2aae0391afe4b323f03887e03deb Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 24 Jul 2024 14:15:54 +0000
Subject: [PATCH] - Import commit 5bba1ebe17564b606cc5d1c07b14123c305019a7
 (merge of v256.4)   For a complete list of changes, visit:  
 https://github.com/openSUSE/systemd/compare/bd8b5ee3cf0466b6b78e167967468cf6f93ec807...5bba1ebe17564b606cc5d1c07b14123c305019a7

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1549
---
 files.systemd                            | 3 ++-
 files.udev                               | 1 +
 systemd-v256.2+suse.5.gbd8b5ee3cf.tar.xz | 3 ---
 systemd-v256.4+suse.6.g5bba1ebe17.tar.xz | 3 +++
 systemd.changes                          | 8 ++++++++
 systemd.spec                             | 9 ++++-----
 6 files changed, 18 insertions(+), 9 deletions(-)
 delete mode 100644 systemd-v256.2+suse.5.gbd8b5ee3cf.tar.xz
 create mode 100644 systemd-v256.4+suse.6.g5bba1ebe17.tar.xz

diff --git a/files.systemd b/files.systemd
index a1cce7b3..ea5011f3 100644
--- a/files.systemd
+++ b/files.systemd
@@ -138,8 +138,8 @@
 %{_bindir}/timedatectl
 %if %{without bootstrap}
 %{_bindir}/userdbctl
-%{_bindir}/varlinkctl
 %endif
+%{_bindir}/varlinkctl
 %if %{without bootstrap}
 %{_datadir}/bash-completion/completions/busctl
 %{_datadir}/bash-completion/completions/coredumpctl
@@ -227,6 +227,7 @@
 %{_datadir}/zsh/site-functions/_systemd-run
 %{_datadir}/zsh/site-functions/_systemd-tmpfiles
 %{_datadir}/zsh/site-functions/_timedatectl
+%{_datadir}/zsh/site-functions/_varlinkctl
 %{_journalcatalogdir}/systemd.catalog
 %{_libdir}/libnss_myhostname.so.2
 %{_libdir}/libnss_systemd.so.2
diff --git a/files.udev b/files.udev
index cc2aa1ea..3ab30201 100644
--- a/files.udev
+++ b/files.udev
@@ -263,6 +263,7 @@
 %{_udevhwdbdir}/70-analyzers.hwdb
 %{_udevhwdbdir}/70-av-production.hwdb
 %{_udevhwdbdir}/70-cameras.hwdb
+%{_udevhwdbdir}/70-hardware-wallets.hwdb
 %{_udevhwdbdir}/70-joystick.hwdb
 %{_udevhwdbdir}/70-mouse.hwdb
 %{_udevhwdbdir}/70-pda.hwdb
diff --git a/systemd-v256.2+suse.5.gbd8b5ee3cf.tar.xz b/systemd-v256.2+suse.5.gbd8b5ee3cf.tar.xz
deleted file mode 100644
index f2425770..00000000
--- a/systemd-v256.2+suse.5.gbd8b5ee3cf.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8a726b287cb7107f4e7ba0b1f9048a8f1589b8aa226a25bb6222a701c18bc1e
-size 11222348
diff --git a/systemd-v256.4+suse.6.g5bba1ebe17.tar.xz b/systemd-v256.4+suse.6.g5bba1ebe17.tar.xz
new file mode 100644
index 00000000..26985692
--- /dev/null
+++ b/systemd-v256.4+suse.6.g5bba1ebe17.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72df6e07b7a1d1e706b752c5d9396f7a6c829140b90fa1f82481146bca5a2de8
+size 11233100
diff --git a/systemd.changes b/systemd.changes
index df3755ad..7baa9a9d 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul 24 13:49:10 UTC 2024 - Franck Bui <fbui@suse.com>
+
+- Import commit 5bba1ebe17564b606cc5d1c07b14123c305019a7 (merge of v256.4)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/bd8b5ee3cf0466b6b78e167967468cf6f93ec807...5bba1ebe17564b606cc5d1c07b14123c305019a7
+
 -------------------------------------------------------------------
 Wed Jul 24 12:34:13 UTC 2024 - Michal Koutný <mkoutny@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index bb313e6f..f8a9885a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package systemd
+# spec file
 #
 # Copyright (c) 2024 SUSE LLC
 #
@@ -26,9 +26,9 @@
 %define systemd_release    %{?release_override}%{!?release_override:0}
 %define archive_version    %{nil}
 %else
-%define systemd_version    256.2
+%define systemd_version    256.4
 %define systemd_release    0
-%define archive_version    +suse.5.gbd8b5ee3cf
+%define archive_version    +suse.6.g5bba1ebe17
 %endif
 
 %define systemd_major      %{sub %systemd_version 1 3}
@@ -337,7 +337,7 @@ Requires:       group(lp)
 Requires(pre):  group(kvm)
 Requires(post): sed
 Requires(post): coreutils
-Requires(postun): coreutils
+Requires(postun):coreutils
 # 'regenerate_initrd_post' macro is expanded during build, hence this BR.
 BuildRequires:  suse-module-tools
 %if %{without bootstrap}
@@ -1062,7 +1062,6 @@ tar -cO \
 %if %{without bootstrap}
 %find_lang systemd
 %else
-rm -f  %{buildroot}%{_bindir}/varlinkctl
 rm -f  %{buildroot}%{_journalcatalogdir}/*
 rm -fr %{buildroot}%{_docdir}/systemd
 rm -f %{buildroot}%{_bindir}/run0