Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package systemd for openSUSE:Factory checked 
in at 2026-02-05 17:56:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
 and      /work/SRC/openSUSE:Factory/.systemd.new.1670 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "systemd"

Thu Feb  5 17:56:32 2026 rev:462 rq:1329291 version:258.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd.changes  2025-12-27 
11:28:59.671918024 +0100
+++ /work/SRC/openSUSE:Factory/.systemd.new.1670/systemd.changes        
2026-02-05 17:56:52.998752574 +0100
@@ -1,0 +2,161 @@
+Mon Jan 26 10:02:37 UTC 2026 - Franck Bui <[email protected]>
+
+- Import commit 2ffdb7879d1913b91d75fb7638023689ad49d6ff
+
+  2ffdb7879d pam_systemd: fix regression introduced in v258 by preserving the 
FIFO fd (bsc#1255658)
+  ab7770cb7e repart: support "nodatacow" in btrfs subvolumes
+  245645f444 basic: Use xopenat_full() in mkdir_p_root_full()
+  d197900c28 ssh-generator: suppress error message for vsock EADDRNOTAVAIL 
(bsc#1255656)
+  7dcca22a3a ssh-generator: split out one more helper function
+  1fb6114132 ssh-generator: split out common helper function
+  2f836405c4 core/dbus-manager: propagate meaningful dbus errors from 
EnqueueMarkedJobs
+  9480762ccd core/transaction: when isolating, keep triggered units only if 
their triggers are actually active
+
+- Drop 0003-pam_systemd-fix-regression-introduced-in-v258-by-pre.patch and
+  5003-core-when-isolating-keep-triggered-units-only-if-the.patch as they have
+  been merged by upstream and is part of the last batch of backported commits
+  (see above).
+
+-------------------------------------------------------------------
+Thu Jan 22 08:17:11 UTC 2026 - Franck Bui <[email protected]>
+
+- Add 0003-pam_systemd-fix-regression-introduced-in-v258-by-pre.patch 
(bsc#1255658)
+
+  This patch will be removed once either logind supports restarts or a
+  sufficient amount of time has passed to ensure that systems have transitioned
+  to a version of logind greater than 257.
+
+-------------------------------------------------------------------
+Fri Jan  9 14:46:51 UTC 2026 - Franck Bui <[email protected]>
+
+- Drop most of the workarounds contained in the fixlets
+
+  These workarounds were hold to address old issues that no longer exist in
+  recent versions of systemd. For systems upgrading to this version, we assume
+  these issues have already been fixed by the fixlet scripts in the previous
+  distribution.
+
+  Only the logig warning users about the deprecated usage of the main
+  configuration files (favoring drop-in files) is preserved.
+
+-------------------------------------------------------------------
+Thu Jan  8 16:24:35 UTC 2026 - Franck Bui <[email protected]>
+
+- systemd-update-helper: clean up the flags immediately after they have been
+  consumed (no functional changes).
+
+-------------------------------------------------------------------
+Wed Jan  7 16:14:09 UTC 2026 - Franck Bui <[email protected]>
+
+- systemd.spec: don't reexecute PID1 on transactional updates.
+
+-------------------------------------------------------------------
+Wed Jan  7 14:30:00 UTC 2026 - Franck Bui <[email protected]>
+
+- Drop %filetriggers build flag. It was introduced to ease backport of
+  Base:System to SLE distros where file-triggers were unreliable but that is no
+  longer the case on the latest SLE distros.
+
+-------------------------------------------------------------------
+Fri Dec 12 18:35:01 UTC 2025 - Franck Bui <[email protected]>
+
+- Import commit 25181d4e4c8307a3621d115f99279c4d3c28a9fa (merge of v258.3)
+
+  For a complete list of changes, visit:
+  
https://github.com/openSUSE/systemd/compare/e103ce013ed270c0a43318743ab822cac9325f00...25181d4e4c8307a3621d115f99279c4d3c28a9fa
+
+-------------------------------------------------------------------
+Fri Nov 28 13:32:39 UTC 2025 - Franck Bui <[email protected]>
+
+- Add 5003-core-when-isolating-keep-triggered-units-only-if-the.patch until
+  https://github.com/systemd/systemd/pull/39925 is merged.
+
+-------------------------------------------------------------------
+Thu Nov 20 14:51:47 UTC 2025 - Franck Bui <[email protected]>
+
+- Import commit e103ce013ed270c0a43318743ab822cac9325f00
+
+  e103ce013e pam_systemd: fix OSC write failure message appearing in error logs
+  c81c546411 pam-util: fix pam_syslog_errno() ignoring the level parameter
+
+-------------------------------------------------------------------
+Wed Nov 12 09:54:11 UTC 2025 - Franck Bui <[email protected]>
+
+- Drop 1001-Temporarily-remove-mountfsd-nsresourced-new-Polkit-a.patch
+
+  The relevant polkit actions have been reviewed by the security team.
+
+-------------------------------------------------------------------
+Wed Nov 12 08:42:40 UTC 2025 - Franck Bui <[email protected]>
+
+- Import commit 71c9223a1df429ae23bf113dc9eeb49154d8b734 (merge of v258.2)
+
+  For a complete list of changes, visit:
+  
https://github.com/openSUSE/systemd/compare/1898fac58dd5170dbe85f4c3d01e564889dba0de...71c9223a1df429ae23bf113dc9eeb49154d8b734
+
+- Drop 1002-core-unit-fail-earlier-before-spawning-executor-when.patch as it's
+  part of v258.2.
+
+-------------------------------------------------------------------
+Wed Nov 12 08:33:14 UTC 2025 - Franck Bui <[email protected]>
+
+- Import commit 1898fac58dd5170dbe85f4c3d01e564889dba0de
+
+  1898fac58d main: switch explicitly to tty1 on soft-reboot (bsc#1231986)
+  5fdd32dbe1 units: don't force the loading of the loop and dm_mod modules in 
systemd-repart.service (bsc#1248356)
+
+-------------------------------------------------------------------
+Wed Nov  5 15:25:52 UTC 2025 - Franck Bui <[email protected]>
+
+- Temporarily add
+  1002-core-unit-fail-earlier-before-spawning-executor-when.patch until v258.2
+  is released.
+
+-------------------------------------------------------------------
+Wed Oct 29 14:10:06 UTC 2025 - Martin Wilck <[email protected]>
+
+- pam.systemd-user: skip common-account to avoid issues with pam_sss
+  and other network user directories (bsc#1250691)
+
+-------------------------------------------------------------------
+Wed Oct 22 10:33:00 UTC 2025 - Franck Bui <[email protected]>
+
+- systemd.spec: drop the %{release} number from the SBAT version (1251948)
+
+-------------------------------------------------------------------
+Wed Oct 22 06:26:53 UTC 2025 - Thomas Blume <[email protected]>
+
+- Add 0001-Drop-or-soften-some-upstream-warnings.patch (bsc#1228728) 
(bsc#1251981)
+
+  For now it just drops the 'unmerged-bin' taint flag.
+
+-------------------------------------------------------------------
+Mon Oct 20 07:54:34 UTC 2025 - Franck Bui <[email protected]>
+
+- Upgrade to v258.1 (commit 67a1069b7269cc23c3d04a2fb0cf110abe7abf31)
+
+  See https://github.com/openSUSE/systemd/blob/SUSE/v258/NEWS for details.
+
+  This upgrade includes the following fix:
+
+    c058ff41cb timer: don't run service immediately after restart of a timer 
(bsc#1254563)
+    3e14d02500 detect-virt: bare-metal GCE only for x86 and i386 (bsc#1254293)
+
+- Drop 0001-Drop-support-for-efivar-SystemdOptions.patch, upstream removed
+  support for SystemdOptions efi var, see 14871a652925d08926c2d2d7cf2a95cd.
+
+- Drop 0009-pid1-handle-console-specificities-weirdness-for-s390.patch,
+  upstream gained a new auto-detection logic to setup $TERM on various systems
+  including s390x (bsc#1238117)
+
+- Support for System V style system state control has been removed: drop
+  initctl, runlevel, runlevel*.target, etc.. from the sysvcompat sub-package
+
+- Add 1001-Temporarily-remove-mountfsd-nsresourced-new-Polkit-a.patch. This
+  temporary patch disables the new polkit actions introduced by mountfsd and
+  nsresourced until these actions are validated by the Security team.
+
+- Our testsuite sub-package is functional again and has been updated to work
+  with the meson + mkosi infra.
+
+-------------------------------------------------------------------

Old:
----
  0001-Drop-support-for-efivar-SystemdOptions.patch
  0009-pid1-handle-console-specificities-weirdness-for-s390.patch
  systemd-257.9+suse.23.gc139debf2c.tar.xz

New:
----
  0001-Drop-or-soften-some-upstream-warnings.patch
  mkosi.local.conf
  systemd-258.3+suse.15.g2ffdb7879d.tar.xz

----------(Old B)----------
  Old:
- Drop 0001-Drop-support-for-efivar-SystemdOptions.patch, upstream removed
  support for SystemdOptions efi var, see 14871a652925d08926c2d2d7cf2a95cd.
  Old:
- Drop 0009-pid1-handle-console-specificities-weirdness-for-s390.patch,
  upstream gained a new auto-detection logic to setup $TERM on various systems
----------(Old E)----------

----------(New B)----------
  New:
- Add 0001-Drop-or-soften-some-upstream-warnings.patch (bsc#1228728) 
(bsc#1251981)
----------(New E)----------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.406811705 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.410811874 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2026 SUSE LLC
 # Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
@@ -32,9 +32,9 @@
 %bcond_with obs_service_set_version
 
 %if %{without obs_service_set_version}
-%define systemd_version    257.9
+%define systemd_version    258.3
 %define systemd_release    0
-%define archive_version    +suse.23.gc139debf2c
+%define archive_version    +suse.15.g2ffdb7879d
 %endif
 
 %define _testsuitedir %{_systemd_util_dir}/tests
@@ -79,10 +79,6 @@
 
 %bcond_with upstream
 
-# The following features are kept to ease migrations toward SLE. Their default
-# value is independent of the build flavor.
-%bcond_without  filetriggers
-
 Name:           systemd%{?mini}
 URL:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        %{?systemd_version}
@@ -99,7 +95,6 @@
 %endif
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libxslt-tools
-BuildRequires:  polkit
 # python is only required for generating systemd.directives.xml
 BuildRequires:  python3-base
 BuildRequires:  python3-lxml
@@ -136,7 +131,7 @@
 BuildRequires:  timezone
 
 %if %{with bootstrap}
-#!BuildIgnore:  dbus-1
+#!BuildIgnore:  dbus-service
 Provides:       systemd = %{version}-%{release}
 Conflicts:      systemd
 # Don't consider the mini flavors when building kiwi medias. This conflict is
@@ -150,7 +145,9 @@
 # the buildignore is important for bootstrapping
 #!BuildIgnore:  udev
 Requires:       aaa_base >= 13.2
-Requires:       dbus-1 >= 1.4.0
+Requires:       dbus-service
+# Temporary workaround for bsc#1255655
+Requires:       dbus-1-common
 Requires:       kbd
 Requires:       netcfg >= 11.5
 Requires:       systemd-default-settings-branding
@@ -201,8 +198,9 @@
 Source8:        pam.systemd-user
 Source9:        pam.systemd-run0
 Source14:       kbd-model-map.legacy
+Source15:       mkosi.local.conf
 
-Source101:      fixlet-systemd-post.sh
+Source100:      fixlet-systemd-post.sh
 
 Source200:      files.systemd
 Source201:      files.udev
@@ -234,12 +232,12 @@
 # inside the following if block.
 #
 %if %{without upstream}
-Patch:          0001-Drop-support-for-efivar-SystemdOptions.patch
+Patch:          0001-Drop-or-soften-some-upstream-warnings.patch
 %if %{with sysvcompat}
 Patch:          0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch
 Patch:          0008-sysv-generator-translate-Required-Start-into-a-Wants.patch
 %endif
-Patch:          0009-pid1-handle-console-specificities-weirdness-for-s390.patch
+
 # The patches listed below are in quarantine. Normally, all changes must be
 # pushed to upstream first and then cherry-picked into the SUSE git
 # repository. However, in few cases, some issues might take too much time to be
@@ -613,83 +611,6 @@
 %package testsuite
 Summary:        Testsuite for systemd
 License:        LGPL-2.1-or-later
-Recommends:     python3
-Recommends:     python3-colorama
-# Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped)
-Recommends:     dosfstools
-# Optional deps needed by TEST-70-TPM2 (otherwise skipped)
-Recommends:     swtpm
-Recommends:     tpm2.0-tools
-%if %{with resolved}
-# Optional dep for knot needed by TEST-75-RESOLVED
-Recommends:     knot
-%endif
-%if %{with selinux}
-# Optional deps needed by TEST-06-SELINUX (otherwise skipped)
-Recommends:     selinux-policy-devel
-Recommends:     selinux-policy-targeted
-%endif
-Requires:       %{name} = %{version}-%{release}
-Requires:       attr
-Requires:       binutils
-Requires:       busybox-static
-Requires:       cryptsetup
-Requires:       dhcp-client
-Requires:       dosfstools
-Requires:       iproute2
-Requires:       jq
-Requires:       libcap-progs
-Requires:       lz4
-Requires:       make
-Requires:       mtools
-Requires:       python3-pexpect
-Requires:       qemu
-Requires:       quota
-Requires:       socat
-Requires:       squashfs
-Requires:       stress-ng
-Requires:       systemd-container
-# System users/groups that some tests rely on.
-Requires:       group(bin)
-Requires:       group(daemon)
-Requires:       group(games)
-Requires:       group(nobody)
-Requires:       user(bin)
-Requires:       user(daemon)
-Requires:       user(games)
-Requires:       user(nobody)
-# The following deps on libs are for test-dlopen-so whereas the pkgconfig ones
-# are used by test-funtions to find the libs on the host and install them in 
the
-# image, see install_missing_libraries() for details.
-Requires:       pkgconfig(libarchive)
-Requires:       pkgconfig(libfido2)
-Requires:       pkgconfig(libidn2)
-Requires:       pkgconfig(libkmod)
-Requires:       pkgconfig(libqrencode)
-Requires:       pkgconfig(pwquality)
-Requires:       pkgconfig(tss2-esys)
-Requires:       pkgconfig(tss2-mu)
-Requires:       pkgconfig(tss2-rc)
-%if %{with sd_boot}
-Requires:       systemd-boot
-%endif
-Requires:       systemd-experimental
-%if %{with homed}
-Requires:       systemd-homed
-%endif
-%if %{with journal_remote}
-Requires:       systemd-journal-remote
-%endif
-%if %{with networkd}
-Requires:       systemd-networkd
-%endif
-%if %{with portabled}
-Requires:       systemd-portable
-%endif
-%if %{with sd_boot}
-Requires:       systemd-ukify
-%endif
-Requires:       xz
 
 %description testsuite
 This package contains the unit tests as well as the extended testsuite. The 
unit
@@ -697,16 +618,26 @@
 extended testsuite is used to test various functionalities of systemd and all
 its components.
 
-Note that you need root privileges to run the extended testsuite.
+For now, you will also need to grab and install the most recent version of
+mkosi, available at https://github.com/systemd/mkosi.git. Indeed running the
+integration tests with meson + mkosi relies on the mkosi latest features.
 
 Run the following python script to run all unit tests at once:
 $ %{_testsuitedir}/run-unit-tests.py
 
 To run the full extended testsuite do the following:
-$ NO_BUILD=1 TEST_NESTED_VM=1 
%{_testsuitedir}/integration-tests/run-integration-tests.sh
+$ cp -a %{_testsuitedir} /var/tmp/systemd-testsuite
+$ cd /var/tmp/systemd-testsuite
+$ mkosi genkey
+$ mkosi summary
+$ mkosi -f
+$ mkosi -f box -- meson setup build integration-tests/standalone
+$ mkosi -f box -- meson test -C build --setup=integration 
--suite=integration-tests
 
 Or to run one specific integration test:
-$ NO_BUILD=1 TEST_NESTED_VM=1 make -C 
%{_testsuitedir}/integration-tests/TEST-01-BASIC clean setup run
+$ mkosi -f box -- meson test -C build --setup=integration 
--suite=integration-tests -v TEST-01-BASIC
+
+Note that you need root privileges to run the extended testsuite.
 
 For more details on the available options to run the extended testsuite, please
 refer to %{_testsuitedir}/integration-tests/README.testsuite.
@@ -808,6 +739,7 @@
 %if %{without sysvcompat}
         -Dsysvinit-path= \
         -Dsysvrcnd-path= \
+        -Drc-local= \
 %else
         -Drc-local=/etc/init.d/boot.local \
 %endif
@@ -892,7 +824,7 @@
         -Dsbat-distro-url="%{?sbat_distro_url}" \
         \
         -Dsbat-distro-pkgname="%{name}" \
-        -Dsbat-distro-version="%{version}%[%{without 
upstream}?"-%{release}":""]" \
+        -Dsbat-distro-version="%{version}" \
         \
         -Ddefault-dnssec=no \
         -Ddns-servers='' \
@@ -943,7 +875,7 @@
 
 # Install the fixlets
 mkdir -p %{buildroot}%{_systemd_util_dir}/rpm
-install -m0755 %{SOURCE101} %{buildroot}%{_systemd_util_dir}/rpm/
+install -m0755 %{SOURCE100} %{buildroot}%{_systemd_util_dir}/rpm/
 
 # Make sure /usr/lib/modules-load.d exists in udev(-mini)?, so other
 # packages can install modules without worry
@@ -1068,8 +1000,10 @@
 # Make sure to disable all services by default. The branding presets package
 # takes care of defining the SUSE policies.
 rm -f %{buildroot}%{_presetdir}/*.preset
+rm -f %{buildroot}%{_systemd_util_dir}/initrd-preset/*.preset
 echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset
 echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset
+echo 'disable *' 
>%{buildroot}%{_systemd_util_dir}/initrd-preset/99-default.preset
 
 # Most of the entries for the generic paths are defined by filesystem package 
as
 # the definitions used by SUSE distros diverged from the ones defined by
@@ -1094,15 +1028,8 @@
 cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map
 
 %if %{with testsuite}
-# -Dinstall_test took care of installing the unit tests only (those in
-# src/tests) and testdata directory. Here we copy the integration tests
-# including also all related scripts used to prepare and run the integration
-# tests in dedicated VMs.
-mkdir -p %{buildroot}%{_testsuitedir}/integration-tests
-tar -cO \
-    --exclude-vcs  \
-    --exclude-vcs-ignores \
-    -C test/integration-tests/ . | tar -xC 
%{buildroot}%{_testsuitedir}/integration-tests/
+install -m0644 %{SOURCE15} %{buildroot}%{_testsuitedir}/mkosi/mkosi.local.conf
+install -m0644 test/integration-tests/README.md 
%{buildroot}%{_testsuitedir}/integration-tests/
 %endif
 
 %if %{without bootstrap}
@@ -1112,7 +1039,8 @@
 rm -fr %{buildroot}%{_docdir}/systemd
 %endif
 
-# Generate system users for pre scriptlets.
+# Some systemd system users needs to exist before %post is executed
+# (bsc#1248501).
 %if %{with resolved}
 %sysusers_generate_pre %{buildroot}/%{_sysusersdir}/systemd-resolve.conf 
systemd-resolve systemd-resolve.conf
 %endif
@@ -1162,20 +1090,10 @@
 %ldconfig
 %endif
 
-systemctl daemon-reexec || :
-# Reexecute the user managers (if any)
+# Reexecute the managers
+%{_systemd_util_dir}/systemd-update-helper system-reexec || :
 %{_systemd_util_dir}/systemd-update-helper user-reexec || :
 
-%if %{without filetriggers}
-# During package installation, the followings are for config files shipped by
-# packages that got installed before systemd and by the systemd main package
-# itself. During update they deal with files that could have been introduced by
-# new versions of systemd.
-systemd-sysusers || :
-systemd-tmpfiles --create || :
-journalctl --update-catalog || :
-%endif
-
 # See the comment in the 'pre' section about why we need to call 'systemd_pre'
 # macro.
 %systemd_post remote-fs.target
@@ -1183,8 +1101,7 @@
 %systemd_post systemd-journald-audit.socket
 %systemd_post systemd-userdbd.service
 
-# Run the hacks/fixups to clean up the old stuff left by (very) old versions of
-# systemd.
+# Run the workarounds to fix the issues left by (very) old versions of systemd.
 %{_systemd_util_dir}/rpm/fixlet-systemd-post.sh $1 || :
 
 %postun
@@ -1210,11 +1127,6 @@
 
 %post -n udev%{?mini}
 %regenerate_initrd_post
-%if %{without filetriggers}
-%udev_hwdb_update
-%tmpfiles_create systemd-pstore.conf
-%sysusers_create systemd-timesync.conf
-%endif
 %systemd_post remote-cryptsetup.target
 %systemd_post systemd-pstore.service
 %systemd_post systemd-timesyncd.service
@@ -1262,9 +1174,6 @@
 %post container
 %if %{with machined}
 %ldconfig
-%if %{without filetriggers}
-%tmpfiles_create systemd-nspawn.conf
-%endif
 %systemd_post systemd-mountfsd.socket
 %systemd_post systemd-nsresourced.socket
 %systemd_post machines.target
@@ -1277,10 +1186,6 @@
 %systemd_pre systemd-journal-upload.service
 
 %post journal-remote
-# Assume that all files shipped by systemd-journal-remove are owned by root.
-%if %{without filetriggers}
-%sysusers_create systemd-remote.conf
-%endif
 %systemd_post systemd-journal-gatewayd.service
 %systemd_post systemd-journal-remote.service
 %systemd_post systemd-journal-upload.service
@@ -1302,9 +1207,6 @@
 %systemd_pre systemd-networkd-wait-online.service
 
 %post networkd
-%if %{without filetriggers}
-%tmpfiles_create systemd-network.conf
-%endif
 %systemd_post systemd-networkd.service
 %systemd_post systemd-networkd-wait-online.service
 
@@ -1323,9 +1225,6 @@
 
 %post resolved
 %ldconfig
-%if %{without filetriggers}
-%tmpfiles_create systemd-resolve.conf
-%endif
 %systemd_post systemd-resolved.service
 
 %preun resolved
@@ -1361,9 +1260,6 @@
 %systemd_pre systemd-portabled.service
 
 %post portable
-%if %{without filetriggers}
-%tmpfiles_create portables.conf
-%endif
 %systemd_post systemd-portabled.service
 
 %preun portable
@@ -1373,13 +1269,6 @@
 %systemd_postun_with_restart systemd-portabled.service
 %endif
 
-%post experimental
-%if %{without filetriggers}
-%if %{without bootstrap}
-%sysusers_create systemd-oom.conf
-%endif
-%endif
-
 # Keep the clean section until the following issue is solved:
 # https://github.com/rpm-software-management/rpm/issues/3658
 %clean
@@ -1393,9 +1282,7 @@
     elfbins.list
 
 # File trigger definitions
-%if %{with filetriggers}
 %include %{SOURCE7}
-%endif
 
 %files
 %include %{SOURCE200}

++++++ 0001-Drop-or-soften-some-upstream-warnings.patch ++++++
>From 358ea09a537b1953dce898d85c31bde294831fa0 Mon Sep 17 00:00:00 2001
From: Thomas Blume <[email protected]>
Date: Wed, 22 Oct 2025 08:04:12 +0200
Subject: [PATCH] Drop or soften some upstream warnings

- drop unmerged-bin taint flag (bsc#1228728) (bsc#1251981)
---
 catalog/systemd.catalog.in       | 1 -
 man/org.freedesktop.systemd1.xml | 9 ---------
 src/core/taint.c                 | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in
index f7ef980962..30f70a66de 100644
--- a/catalog/systemd.catalog.in
+++ b/catalog/systemd.catalog.in
@@ -582,7 +582,6 @@ Support: %SUPPORT_URL%
 The following "tags" are possible:
 - "unmerged-usr" - /bin, /sbin, /lib* are not symlinks to their counterparts
   under /usr/
-- "unmerged-bin" - /usr/sbin is not a symlink to /usr/bin/
 - "var-run-bad" — /var/run is not a symlink to /run/
 - "cgroupsv1" - the system is using the deprecated cgroup v1 hierarchy
 - "local-hwclock" - the local hardware clock (RTC) is configured to be in
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index ed22712748..aec2486759 100644
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -1695,15 +1695,6 @@ node /org/freedesktop/systemd1 {
           <xi:include href="version-info.xml" xpointer="v252"/></listitem>
         </varlistentry>
 
-        <varlistentry>
-          <term><literal>unmerged-bin</literal></term>
-
-          <listitem><para><filename>/usr/sbin</filename> is not a symlink to 
<filename>/usr/bin/</filename>.
-          </para>
-
-          <xi:include href="version-info.xml" xpointer="v256"/></listitem>
-        </varlistentry>
-
         <varlistentry>
           <term><literal>var-run-bad</literal></term>
 
diff --git a/src/core/taint.c b/src/core/taint.c
index 8872a224b2..02d33fdd15 100644
--- a/src/core/taint.c
+++ b/src/core/taint.c
@@ -47,9 +47,6 @@ char** taint_strv(void) {
 
         /* Note that the check is different from default_PATH(), as we want to 
taint on uncanonical symlinks
          * too. */
-        if (readlink_malloc("/usr/sbin", &usr_sbin) < 0 || 
!PATH_IN_SET(usr_sbin, "bin", "/usr/bin"))
-                stage[n++] = "unmerged-bin";
-
         if (readlink_malloc("/var/run", &var_run) < 0 || !PATH_IN_SET(var_run, 
"../run", "/run"))
                 stage[n++] = "var-run-bad";
 
-- 
2.51.0


++++++ 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.462814058 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.462814058 +0100
@@ -1,4 +1,4 @@
-From e1562e145272efea60275ffe8e7edeb65224ab8d Mon Sep 17 00:00:00 2001
+From 128ce1fc50b12e012ac50e9d1728c0bb52124d10 Mon Sep 17 00:00:00 2001
 From: Thomas Blume <[email protected]>
 Date: Tue, 25 Mar 2014 13:08:56 +0000
 Subject: [PATCH] rc-local: fix ordering startup for /etc/init.d/boot.local
@@ -9,19 +9,19 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/units/rc-local.service.in b/units/rc-local.service.in
-index 6fb0838cdb..768f720032 100644
+index b135f3894d..92cd3652f9 100644
 --- a/units/rc-local.service.in
 +++ b/units/rc-local.service.in
 @@ -13,7 +13,7 @@
- Description={{RC_LOCAL_PATH}} Compatibility
+ Description={{SYSTEM_SYSVRCLOCAL_PATH}} Compatibility
  Documentation=man:systemd-rc-local-generator(8)
- ConditionFileIsExecutable={{RC_LOCAL_PATH}}
+ ConditionFileIsExecutable={{SYSTEM_SYSVRCLOCAL_PATH}}
 -After=network.target
 +After=basic.target
  
  [Service]
  Type=forking
 -- 
-2.35.3
+2.43.0
 
 

++++++ 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.490815234 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.506815906 +0100
@@ -1,4 +1,4 @@
-From 6eb24d1fcf8ea676bd0f0e32a9afda7431eafd77 Mon Sep 17 00:00:00 2001
+From 85adbcd1d7f16d9fc3e9257f7fd6444b42fdc5ac Mon Sep 17 00:00:00 2001
 From: Thomas Blume <[email protected]>
 Date: Wed, 4 May 2016 17:40:04 +0200
 Subject: [PATCH] sysv-generator: translate "Required-Start" into a "Wants"
@@ -21,10 +21,10 @@
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/src/sysv-generator/sysv-generator.c 
b/src/sysv-generator/sysv-generator.c
-index 4485e2e368..e0833a7179 100644
+index e11edef15e..b694159b6d 100644
 --- a/src/sysv-generator/sysv-generator.c
 +++ b/src/sysv-generator/sysv-generator.c
-@@ -412,8 +412,13 @@ static int handle_dependencies(SysvStub *s, unsigned 
line, const char *full_text
+@@ -413,8 +413,13 @@ static int handle_dependencies(SysvStub *s, unsigned 
line, const char *full_text
                                  return log_oom();
  
                          r = strv_extend(&s->wants, m);
@@ -53,6 +53,6 @@
  
      def test_lsb_deps(self):
 -- 
-2.35.3
+2.43.0
 
 

++++++ 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.530816914 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.534817081 +0100
@@ -1,8 +1,8 @@
-From 1861e68a986c39cfec3c7fe8a348d331d93800d7 Mon Sep 17 00:00:00 2001
+From 6842234e7007e83b3faa2358fbc131c0dc297ae4 Mon Sep 17 00:00:00 2001
 From: Franck Bui <[email protected]>
 Date: Fri, 12 Jan 2024 10:55:17 +0100
-Subject: [PATCH 5002/5002] Revert "udev: revert workarounds for issues caused
- by the devlink creation optimization"
+Subject: [PATCH] Revert "udev: revert workarounds for issues caused by the
+ devlink creation optimization"
 
 This reverts commit b8fa62589271a0a7552c6eb02e6beac3ca759ba7.
 ---
@@ -10,10 +10,10 @@
  1 file changed, 11 insertions(+)
 
 diff --git a/rules.d/60-persistent-storage.rules.in 
b/rules.d/60-persistent-storage.rules.in
-index 6787430208..39a6555045 100644
+index e07f7b5d7a..23c24edb7c 100644
 --- a/rules.d/60-persistent-storage.rules.in
 +++ b/rules.d/60-persistent-storage.rules.in
-@@ -134,6 +134,17 @@ KERNEL!="sr*|mmcblk[0-9]boot[0-9]", 
IMPORT{builtin}="blkid"
+@@ -136,6 +136,17 @@ KERNEL!="sr*|mmcblk[0-9]boot[0-9]", 
IMPORT{builtin}="blkid"
  LABEL="persistent_storage_blkid_probe_end"
  {% endif %}
  
@@ -32,6 +32,6 @@
  ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", 
SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
  ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_LABEL_ENC}=="?*", 
SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
 -- 
-2.35.3
+2.43.0
 
 

++++++ files.container ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.622820777 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.630821113 +0100
@@ -6,9 +6,7 @@
 %if %{without bootstrap}
 %{_datadir}/bash-completion/completions/systemd-nspawn
 %{_datadir}/polkit-1/actions/io.systemd.mount-file-system.policy
-%if %{with upstream}
 %{_datadir}/polkit-1/actions/io.systemd.namespace-resource.policy
-%endif
 %{_datadir}/zsh/site-functions/_systemd-nspawn
 %{_mandir}/man1/systemd-nspawn.1.gz
 %{_mandir}/man5/systemd.nspawn.5.gz
@@ -28,19 +26,17 @@
 %{_systemd_util_dir}/network/80-container-vz.network
 %{_systemd_util_dir}/network/80-namespace-ns.link
 %{_systemd_util_dir}/network/80-namespace-ns.network
-%if %{with upstream}
 %{_systemd_util_dir}/network/80-namespace-ns-tun.link
 %{_systemd_util_dir}/network/80-namespace-ns-tun.network
 %endif
-%endif
 %if %{without bootstrap}
 %{_systemd_util_dir}/systemd-mountfsd
 %{_systemd_util_dir}/systemd-mountwork
 %{_systemd_util_dir}/systemd-nsresourced
 %{_systemd_util_dir}/systemd-nsresourcework
-%if %{with upstream}
-%{_systemd_util_dir}/user/[email protected]
 %endif
+%{_systemd_util_dir}/user/[email protected]
+%if %{without bootstrap}
 %{_unitdir}/systemd-mountfsd.service
 %{_unitdir}/systemd-mountfsd.socket
 %endif
@@ -57,6 +53,10 @@
 %{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Image.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Machine.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Manager.xml
+%if %{with upstream}
+%{_datadir}/dbus-1/services/org.freedesktop.import1.service
+%{_datadir}/dbus-1/services/org.freedesktop.machine1.service
+%endif
 %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
@@ -67,11 +67,20 @@
 %{_mandir}/man5/org.freedesktop.machine1.5.gz
 %{_mandir}/man8/systemd-machined.8.gz
 %{_mandir}/man8/systemd-machined.service.8.gz
-%{_systemd_util_dir}/systemd-machined
 %if %{with upstream}
+%{_systemd_util_dir}/user/dbus-org.freedesktop.import1.service
+%{_systemd_util_dir}/user/dbus-org.freedesktop.machine1.service
+%endif
+%{_systemd_util_dir}/systemd-machined
 %{_systemd_util_dir}/user/machine.slice
 %{_systemd_util_dir}/user/machines.target
-%{_systemd_util_dir}/user/[email protected]
+%if %{with upstream}
+%{_systemd_util_dir}/user/sockets.target.wants/systemd-importd.socket
+%{_systemd_util_dir}/user/sockets.target.wants/systemd-machined.socket
+%{_systemd_util_dir}/user/systemd-importd.service
+%{_systemd_util_dir}/user/systemd-importd.socket
+%{_systemd_util_dir}/user/systemd-machined.service
+%{_systemd_util_dir}/user/systemd-machined.socket
 %endif
 %{_tmpfilesdir}/systemd-nspawn.conf
 %{_unitdir}/dbus-org.freedesktop.machine1.service
@@ -79,13 +88,9 @@
 %{_unitdir}/machines.target
 %{_unitdir}/machines.target.wants/var-lib-machines.mount
 %{_unitdir}/remote-fs.target.wants/var-lib-machines.mount
-%if %{with upstream}
 %{_unitdir}/sockets.target.wants/systemd-machined.socket
-%endif
 %{_unitdir}/systemd-machined.service
-%if %{with upstream}
 %{_unitdir}/systemd-machined.socket
-%endif
 %{_unitdir}/var-lib-machines.mount
 %endif
 
@@ -102,11 +107,7 @@
 %{_mandir}/man8/systemd-importd.8.gz
 %{_mandir}/man8/systemd-importd.service.8.gz
 %{_mandir}/man8/systemd-import-generator.8.gz
-%if %{without upstream}
-%{_systemd_util_dir}/import-pubring.gpg
-%else
 %{_systemd_util_dir}/import-pubring.pgp
-%endif
 %{_systemd_util_dir}/systemd-export
 %{_systemd_util_dir}/systemd-import
 %{_systemd_util_dir}/systemd-import-fs

++++++ files.devel-doc ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.678823129 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.682823297 +0100
@@ -285,9 +285,7 @@
 %{_mandir}/man3/sd_bus_message_close_container.3.gz
 %{_mandir}/man3/sd_bus_message_copy.3.gz
 %{_mandir}/man3/sd_bus_message_dump.3.gz
-%if %{with upstream}
 %{_mandir}/man3/sd_bus_message_dump_json.3.gz
-%endif
 %{_mandir}/man3/sd_bus_message_enter_container.3.gz
 %{_mandir}/man3/sd_bus_message_exit_container.3.gz
 %{_mandir}/man3/sd_bus_message_get_allow_interactive_authorization.3.gz
@@ -441,7 +439,6 @@
 %{_mandir}/man3/sd_bus_unref.3.gz
 %{_mandir}/man3/sd_bus_unrefp.3.gz
 %{_mandir}/man3/sd_bus_wait.3.gz
-%if %{with upstream}
 %{_mandir}/man3/sd_device_enumerator_add_all_parents.3.gz
 %{_mandir}/man3/sd_device_enumerator_add_match_parent.3.gz
 %{_mandir}/man3/sd_device_enumerator_add_match_property.3.gz
@@ -456,7 +453,6 @@
 %{_mandir}/man3/sd_device_enumerator_get_device_next.3.gz
 %{_mandir}/man3/sd_device_enumerator_get_subsystem_first.3.gz
 %{_mandir}/man3/sd_device_enumerator_get_subsystem_next.3.gz
-%endif
 %{_mandir}/man3/sd_device_enumerator_new.3.gz
 %{_mandir}/man3/sd_device_enumerator_ref.3.gz
 %{_mandir}/man3/sd_device_enumerator_unref.3.gz
@@ -496,6 +492,9 @@
 %{_mandir}/man3/sd_event_dispatch.3.gz
 %{_mandir}/man3/sd_event_exit.3.gz
 %{_mandir}/man3/sd_event_get_exit_code.3.gz
+%if %{with upstream}
+%{_mandir}/man3/sd_event_get_exit_on_idle.3.gz
+%endif
 %{_mandir}/man3/sd_event_get_fd.3.gz
 %{_mandir}/man3/sd_event_get_iteration.3.gz
 %{_mandir}/man3/sd_event_get_state.3.gz
@@ -510,6 +509,9 @@
 %{_mandir}/man3/sd_event_prepare.3.gz
 %{_mandir}/man3/sd_event_ref.3.gz
 %{_mandir}/man3/sd_event_run.3.gz
+%if %{with upstream}
+%{_mandir}/man3/sd_event_set_exit_on_idle.3.gz
+%endif
 %{_mandir}/man3/sd_event_set_signal_exit.3.gz
 %{_mandir}/man3/sd_event_set_watchdog.3.gz
 %{_mandir}/man3/sd_event_signal_handler_t.3.gz
@@ -671,6 +673,29 @@
 %{_mandir}/man3/sd_journal_stream_fd_with_namespace.3.gz
 %{_mandir}/man3/sd_journal_test_cursor.3.gz
 %{_mandir}/man3/sd_journal_wait.3.gz
+%if %{with upstream}
+%{_mandir}/man3/sd_json_dispatch_const_string.3.gz
+%{_mandir}/man3/sd_json_dispatch_double.3.gz
+%{_mandir}/man3/sd_json_dispatch_id128.3.gz
+%{_mandir}/man3/sd_json_dispatch_int16.3.gz
+%{_mandir}/man3/sd_json_dispatch_int32.3.gz
+%{_mandir}/man3/sd_json_dispatch_int64.3.gz
+%{_mandir}/man3/sd_json_dispatch_int8.3.gz
+%{_mandir}/man3/sd_json_dispatch_intbool.3.gz
+%{_mandir}/man3/sd_json_dispatch_signal.3.gz
+%{_mandir}/man3/sd_json_dispatch_stdbool.3.gz
+%{_mandir}/man3/sd_json_dispatch_string.3.gz
+%{_mandir}/man3/sd_json_dispatch_strv.3.gz
+%{_mandir}/man3/sd_json_dispatch_tristate.3.gz
+%{_mandir}/man3/sd_json_dispatch_uid_gid.3.gz
+%{_mandir}/man3/sd_json_dispatch_uint16.3.gz
+%{_mandir}/man3/sd_json_dispatch_uint32.3.gz
+%{_mandir}/man3/sd_json_dispatch_uint64.3.gz
+%{_mandir}/man3/sd_json_dispatch_uint8.3.gz
+%{_mandir}/man3/sd_json_dispatch_unsupported.3.gz
+%{_mandir}/man3/sd_json_dispatch_variant.3.gz
+%{_mandir}/man3/sd_json_dispatch_variant_noref.3.gz
+%endif
 %{_mandir}/man3/sd_listen_fds.3.gz
 %{_mandir}/man3/sd_listen_fds_with_names.3.gz
 %{_mandir}/man3/sd_login_monitor.3.gz
@@ -710,9 +735,7 @@
 %{_mandir}/man3/sd_pid_notifyf.3.gz
 %{_mandir}/man3/sd_pid_notifyf_with_fds.3.gz
 %{_mandir}/man3/sd_pidfd_get_cgroup.3.gz
-%if %{with upstream}
 %{_mandir}/man3/sd_pidfd_get_inode_id.3.gz
-%endif
 %{_mandir}/man3/sd_pidfd_get_machine_name.3.gz
 %{_mandir}/man3/sd_pidfd_get_owner_uid.3.gz
 %{_mandir}/man3/sd_pidfd_get_session.3.gz
@@ -747,14 +770,22 @@
 %{_mandir}/man3/sd_uid_get_sessions.3.gz
 %{_mandir}/man3/sd_uid_get_state.3.gz
 %{_mandir}/man3/sd_uid_is_on_seat.3.gz
-%if %{with upstream}
 %{_mandir}/man3/sd_varlink_get_description.3.gz
+%if %{with upstream}
+%{_mandir}/man3/sd_varlink_is_connected.3.gz
+%{_mandir}/man3/sd_varlink_is_idle.3.gz
+%endif
 %{_mandir}/man3/sd_varlink_push_dup_fd.3.gz
 %{_mandir}/man3/sd_varlink_push_fd.3.gz
 %{_mandir}/man3/sd_varlink_send.3.gz
 %{_mandir}/man3/sd_varlink_sendb.3.gz
 %{_mandir}/man3/sd_varlink_sendbo.3.gz
+%if %{with upstream}
+%{_mandir}/man3/sd_varlink_server_new.3.gz
+%endif
 %{_mandir}/man3/sd_varlink_set_description.3.gz
+%if %{with upstream}
+%{_mandir}/man3/sd_varlink_set_relative_timeout.3.gz
 %endif
 %{_mandir}/man3/sd_watchdog_enabled.3.gz
 %{_mandir}/man3/udev_device_get_action.3.gz

++++++ files.experimental ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.714824641 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.718824809 +0100
@@ -6,33 +6,32 @@
 %dir %{_distconfdir}/ssh
 %dir %{_distconfdir}/ssh/ssh_config.d
 %if %{without bootstrap}
+%if %{with upstream}
+%if %{with sd_boot}
+%dir %{_prefix}/lib/nvpcr
+%endif
+%endif
 %dir %{_sysconfdir}/systemd/oomd.conf.d
 %endif
-%if %{with upstream}
 %dir %{_unitdir}/factory-reset.target.wants
-%endif
 %if %{with sd_boot}
 %dir %{_unitdir}/initrd.target.wants
 %endif
-%if %{with upstream}
+%if %{without bootstrap}
+%if %{with sd_boot}
 %dir %{_unitdir}/storage-target-mode.target.wants
 %endif
-%if %{without bootstrap}
 # Main config files have been replaced in favor of drop-ins.
 %ghost %{_sysconfdir}/systemd/oomd.conf
 %{_bindir}/oomctl
-%endif
-%if %{without bootstrap}
 %if %{with upstream}
-%{_bindir}/systemd-pty-forward
+%{_bindir}/systemd-mute-console
 %endif
 %{_bindir}/systemd-vmspawn
 %{_bindir}/updatectl
 %{_datadir}/bash-completion/completions/oomctl
 %{_datadir}/bash-completion/completions/systemd-vmspawn
 %{_datadir}/dbus-1/interfaces/org.freedesktop.oom1.Manager.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Image.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Manager.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.sysupdate1.Job.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.sysupdate1.Manager.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.sysupdate1.Target.xml
@@ -49,12 +48,12 @@
 %{_mandir}/man1/systemd-keyutil.1.gz
 %{_mandir}/man1/systemd-measure.1.gz
 %if %{with upstream}
-%{_mandir}/man1/systemd-pty-forward.1.gz
+%{_mandir}/man1/systemd-mute-console.1.gz
+%{_mandir}/man1/systemd-mute-console.socket.1.gz
+%{_mandir}/man1/[email protected]
 %endif
 %{_mandir}/man1/systemd-sbsign.1.gz
-%if %{with upstream}
 %{_mandir}/man1/systemd-ssh-issue.1.gz
-%endif
 %{_mandir}/man1/systemd-ssh-proxy.1.gz
 %{_mandir}/man1/systemd-vmspawn.1.gz
 %{_mandir}/man1/updatectl.1.gz
@@ -66,14 +65,12 @@
 %{_mandir}/man5/sysupdate.features.5.gz
 %{_mandir}/man8/systemd-bsod.8.gz
 %{_mandir}/man8/systemd-bsod.service.8.gz
-%if %{with upstream}
 %{_mandir}/man8/systemd-factory-reset-complete.service.8.gz
 %{_mandir}/man8/systemd-factory-reset-generator.8.gz
 %{_mandir}/man8/systemd-factory-reset-request.service.8.gz
 %{_mandir}/man8/systemd-factory-reset.8.gz
 %{_mandir}/man8/systemd-factory-reset.socket.8.gz
 %{_mandir}/man8/[email protected]
-%endif
 %{_mandir}/man8/systemd-oomd.8.gz
 %{_mandir}/man8/systemd-oomd.service.8.gz
 %if %{with sd_boot}
@@ -88,9 +85,15 @@
 %{_mandir}/man8/systemd-pcrlock-secureboot-authority.service.8.gz
 %{_mandir}/man8/systemd-pcrlock-secureboot-policy.service.8.gz
 %{_mandir}/man8/systemd-pcrmachine.service.8.gz
+%if %{with upstream}
+%{_mandir}/man8/systemd-pcrnvdone.service.8.gz
+%endif
 %{_mandir}/man8/systemd-pcrphase-initrd.service.8.gz
 %{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz
 %{_mandir}/man8/systemd-pcrphase.service.8.gz
+%if %{with upstream}
+%{_mandir}/man8/systemd-pcrproduct.service.8.gz
+%endif
 %endif
 %{_mandir}/man8/systemd-ssh-generator.8.gz
 %{_mandir}/man8/systemd-storagetm.8.gz
@@ -102,27 +105,29 @@
 %{_mandir}/man8/systemd-sysupdate.timer.8.gz
 %{_mandir}/man8/systemd-sysupdated.8.gz
 %{_mandir}/man8/systemd-sysupdated.service.8.gz
-%if %{with upstream}
 %if %{with sd_boot}
 %{_mandir}/man8/systemd-tpm2-clear.service.8.gz
 %endif
-%endif
 %{_mandir}/man8/systemd-tpm2-generator.8.gz
 %if %{with sd_boot}
 %{_mandir}/man8/systemd-tpm2-setup-early.service.8.gz
 %{_mandir}/man8/systemd-tpm2-setup.8.gz
 %{_mandir}/man8/systemd-tpm2-setup.service.8.gz
 %endif
-%if %{with upstream}
 %{_mandir}/man8/[email protected]
 %endif
+%if %{with upstream}
+%if %{with sd_boot}
+%{_prefix}/lib/nvpcr/cryptsetup.nvpcr
+%{_prefix}/lib/nvpcr/hardware.nvpcr
+%endif
 %endif
 %if %{without bootstrap}
 %{_systemd_util_dir}/oomd.conf
 %{_systemd_util_dir}/systemd-bsod
-%if %{with upstream}
-%{_systemd_util_dir}/systemd-factory-reset
 %endif
+%{_systemd_util_dir}/systemd-factory-reset
+%if %{without bootstrap}
 %{_systemd_util_dir}/systemd-keyutil
 %{_systemd_util_dir}/systemd-measure
 %{_systemd_util_dir}/systemd-oomd
@@ -130,68 +135,78 @@
 %{_systemd_util_dir}/systemd-pcrextend
 %endif
 %{_systemd_util_dir}/systemd-sbsign
-%if %{with upstream}
-%{_systemd_util_dir}/systemd-ssh-issue
-%endif
 %endif
+%{_systemd_util_dir}/systemd-ssh-issue
 %{_systemd_util_dir}/systemd-ssh-proxy
 %if %{without bootstrap}
 %{_systemd_util_dir}/systemd-storagetm
 %{_systemd_util_dir}/systemd-sysupdate
 %{_systemd_util_dir}/systemd-sysupdated
 %if %{with sd_boot}
-%if %{with upstream}
 %{_systemd_util_dir}/systemd-tpm2-clear
-%endif
 %{_systemd_util_dir}/systemd-tpm2-setup
-%if %{with upstream}
-%{_systemd_util_dir}/systemd-validatefs
 %endif
 %endif
-%if %{with upstream}
+%{_systemd_util_dir}/systemd-validatefs
+%if %{without bootstrap}
 %{_systemd_util_dir}/user/[email protected]
-%{_systemdgeneratordir}/systemd-factory-reset-generator
-%endif
 %endif
+%{_systemdgeneratordir}/systemd-factory-reset-generator
 # ssh-generator: in the futur to be moved to the main package
 %{_systemdgeneratordir}/systemd-ssh-generator
 %{_systemdgeneratordir}/systemd-tpm2-generator
 %if %{without bootstrap}
 %{_sysusersdir}/systemd-oom.conf
 %{_unitdir}/dbus-org.freedesktop.sysupdate1.service
-%if %{with upstream}
+%endif
 %{_unitdir}/factory-reset-now.target
 %{_unitdir}/factory-reset.target.wants/systemd-factory-reset-request.service
+%if %{without bootstrap}
+%if %{with sd_boot}
 %{_unitdir}/factory-reset.target.wants/systemd-pcrphase-factory-reset.service
 %endif
 %{_unitdir}/initrd.target.wants/systemd-bsod.service
 %if %{with sd_boot}
 %{_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.service
 %endif
-%if %{with upstream}
+%endif
 %{_unitdir}/sockets.target.wants/systemd-factory-reset.socket
+%if %{with upstream}
+%{_unitdir}/sockets.target.wants/systemd-mute-console.socket
 %endif
+%if %{without bootstrap}
 %if %{with sd_boot}
 %{_unitdir}/sockets.target.wants/systemd-pcrextend.socket
 %endif
 %{_unitdir}/storage-target-mode.target
-%if %{with upstream}
-%{_unitdir}/storage-target-mode.target.wants/systemd-pcrphase-storage-target-mode.service
-%endif
 %if %{with sd_boot}
+%{_unitdir}/storage-target-mode.target.wants/systemd-pcrphase-storage-target-mode.service
 %{_unitdir}/sysinit.target.wants/systemd-pcrmachine.service
+%if %{with upstream}
+%{_unitdir}/sysinit.target.wants/systemd-pcrnvdone.service
+%endif
 %{_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service
 %{_unitdir}/sysinit.target.wants/systemd-pcrphase.service
+%if %{with upstream}
+%{_unitdir}/sysinit.target.wants/systemd-pcrproduct.service
+%endif
 %{_unitdir}/sysinit.target.wants/systemd-tpm2-setup-early.service
 %{_unitdir}/sysinit.target.wants/systemd-tpm2-setup.service
 %endif
-%{_unitdir}/systemd-bsod.service
 %if %{with upstream}
+%{_unitdir}/system-systemd\x2dmute\x2dconsole.slice
+%endif
+%{_unitdir}/systemd-bsod.service
+%endif
 %{_unitdir}/systemd-factory-reset-complete.service
 %{_unitdir}/systemd-factory-reset-reboot.service
 %{_unitdir}/systemd-factory-reset-request.service
 %{_unitdir}/systemd-factory-reset.socket
 %{_unitdir}/[email protected]
+%if %{without bootstrap}
+%if %{with upstream}
+%{_unitdir}/systemd-mute-console.socket
+%{_unitdir}/[email protected]
 %endif
 %{_unitdir}/systemd-oomd.service
 %{_unitdir}/systemd-oomd.socket
@@ -210,14 +225,16 @@
 %{_unitdir}/[email protected]
 %{_unitdir}/systemd-pcrmachine.service
 %if %{with upstream}
-%{_unitdir}/systemd-pcrphase-factory-reset.service
+%{_unitdir}/systemd-pcrnvdone.service
 %endif
+%{_unitdir}/systemd-pcrphase-factory-reset.service
 %{_unitdir}/systemd-pcrphase-initrd.service
-%if %{with upstream}
 %{_unitdir}/systemd-pcrphase-storage-target-mode.service
-%endif
 %{_unitdir}/systemd-pcrphase-sysinit.service
 %{_unitdir}/systemd-pcrphase.service
+%if %{with upstream}
+%{_unitdir}/systemd-pcrproduct.service
+%endif
 %endif
 %{_unitdir}/systemd-storagetm.service
 %{_unitdir}/systemd-sysupdate-reboot.service
@@ -225,21 +242,15 @@
 %{_unitdir}/systemd-sysupdate.service
 %{_unitdir}/systemd-sysupdate.timer
 %{_unitdir}/systemd-sysupdated.service
-%if %{with upstream}
 %if %{with sd_boot}
 %{_unitdir}/systemd-tpm2-clear.service
-%endif
-%endif
-%if %{with sd_boot}
 %{_unitdir}/systemd-tpm2-setup-early.service
 %{_unitdir}/systemd-tpm2-setup.service
 %endif
-%if %{with upstream}
-%{_unitdir}/[email protected]
 %endif
+%{_unitdir}/[email protected]
+%if %{without bootstrap}
 %{_unitdir}/[email protected]
-%if %{with upstream}
-/usr/etc/profile.d/80-systemd-osc-context.sh
-%endif
 %endif
+/usr/etc/profile.d/80-systemd-osc-context.sh
 

++++++ files.journal-remote ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.778827329 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.790827833 +0100
@@ -1,13 +1,13 @@
 #
 # Please keep the list sorted (with `LC_ALL=C sort`).
 #
+%dir %{_datadir}/systemd/gatewayd
 %dir %{_sysconfdir}/systemd/journal-remote.conf.d
 %dir %{_sysconfdir}/systemd/journal-upload.conf.d
 %ghost %dir %{_localstatedir}/log/journal/remote
 # Main config files have been replaced in favor of drop-ins.
 %ghost %{_sysconfdir}/systemd/journal-remote.conf
 %ghost %{_sysconfdir}/systemd/journal-upload.conf
-%{_datadir}/systemd/gatewayd
 %{_datadir}/systemd/gatewayd/browse.html
 %{_mandir}/man5/journal-remote.conf.5.gz
 %{_mandir}/man5/journal-remote.conf.d.5.gz

++++++ files.networkd ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.862830857 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.870831192 +0100
@@ -32,8 +32,8 @@
 %{_systemd_util_dir}/network/80-6rd-tunnel.link
 %{_systemd_util_dir}/network/80-6rd-tunnel.network
 %{_systemd_util_dir}/network/80-auto-link-local.network.example
-%{_systemd_util_dir}/network/80-container-host0.network
 %{_systemd_util_dir}/network/80-container-host0-tun.network
+%{_systemd_util_dir}/network/80-container-host0.network
 %{_systemd_util_dir}/network/80-vm-vt.link
 %{_systemd_util_dir}/network/80-vm-vt.network
 %{_systemd_util_dir}/network/80-wifi-adhoc.network
@@ -47,8 +47,9 @@
 %{_tmpfilesdir}/systemd-network.conf
 %{_unitdir}/systemd-networkd-persistent-storage.service
 %if %{with upstream}
-%{_unitdir}/systemd-networkd-varlink.socket
+%{_unitdir}/systemd-networkd-resolve-hook.socket
 %endif
+%{_unitdir}/systemd-networkd-varlink.socket
 %{_unitdir}/systemd-networkd-wait-online.service
 %{_unitdir}/[email protected]
 %{_unitdir}/systemd-networkd.service

++++++ files.portable ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.898832368 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.902832537 +0100
@@ -2,13 +2,25 @@
 # Please keep the list sorted (with `LC_ALL=C sort`).
 #
 %{_bindir}/portablectl
+%{_datadir}/bash-completion/completions/portablectl
+%if %{with upstream}
+%{_datadir}/dbus-1/services/org.freedesktop.portable1.service
+%endif
+%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Image.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Manager.xml
 %{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy
 %{_mandir}/man1/portablectl.1.gz
+%{_mandir}/man5/org.freedesktop.portable1.5.gz
 %{_mandir}/man8/systemd-portabled.8.gz
 %{_mandir}/man8/systemd-portabled.service.8.gz
 %{_systemd_util_dir}/portable
+%if %{with upstream}
+%{_systemd_util_dir}/user/dbus-org.freedesktop.portable1.service
+%{_systemd_util_dir}/user/portable
+%{_systemd_util_dir}/user/systemd-portabled.service
+%endif
 %{_systemd_util_dir}/systemd-portabled
 %{_tmpfilesdir}/portables.conf
 %{_unitdir}/dbus-org.freedesktop.portable1.service

++++++ files.resolved ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.934833880 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.938834048 +0100
@@ -6,9 +6,7 @@
 %{_bindir}/systemd-resolve
 %{_datadir}/bash-completion/completions/resolvectl
 %{_datadir}/bash-completion/completions/systemd-resolve
-%if %{with upstream}
 %{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.DnsDelegate.xml
-%endif
 %{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.DnssdService.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Link.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Manager.xml
@@ -21,9 +19,7 @@
 %{_mandir}/man5/org.freedesktop.resolve1.5.gz
 %{_mandir}/man5/resolved.conf.5.gz
 %{_mandir}/man5/resolved.conf.d.5.gz
-%if %{with upstream}
 %{_mandir}/man5/systemd.dns-delegate.5.gz
-%endif
 %{_mandir}/man8/libnss_resolve.so.2.8.gz
 %{_mandir}/man8/nss-resolve.8.gz
 %{_mandir}/man8/systemd-resolved.8.gz
@@ -33,9 +29,7 @@
 %{_systemd_util_dir}/systemd-resolved
 %{_sysusersdir}/systemd-resolve.conf
 %{_tmpfilesdir}/systemd-resolve.conf
-%{_unitdir}/systemd-resolved.service
-%if %{with upstream}
 %{_unitdir}/systemd-resolved-monitor.socket
 %{_unitdir}/systemd-resolved-varlink.socket
-%endif
+%{_unitdir}/systemd-resolved.service
 

++++++ files.systemd ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:54.986836064 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:54.990836232 +0100
@@ -2,7 +2,6 @@
 # Please keep the list sorted (with `LC_ALL=C sort`).
 #
 
-
 %dir %{_binfmtdir}
 %if %{without bootstrap}
 %dir %{_datadir}/bash-completion
@@ -14,8 +13,6 @@
 %dir %{_datadir}/dbus-1/system-services
 %dir %{_datadir}/dbus-1/system.d
 %dir %{_datadir}/factory
-%dir %{_datadir}/polkit-1
-%dir %{_datadir}/polkit-1/actions
 %dir %{_datadir}/systemd
 %if %{without bootstrap}
 %dir %{_datadir}/zsh
@@ -47,15 +44,14 @@
 %dir %{_systemd_system_env_generator_dir}
 %dir %{_systemd_user_env_generator_dir}
 %dir %{_systemd_util_dir}
-%if %{with upstream}
 %dir %{_systemd_util_dir}/initrd-preset
-%endif
 %dir %{_systemd_util_dir}/ntp-units.d
 %dir %{_systemd_util_dir}/rpm
 %dir %{_systemd_util_dir}/system-preset
 %dir %{_systemd_util_dir}/system-shutdown
 %dir %{_systemd_util_dir}/user
 %dir %{_systemd_util_dir}/user-preset
+%dir %{_systemd_util_dir}/user/sockets.target.wants
 %dir %{_systemdgeneratordir}
 %dir %{_systemdusergeneratordir}
 %dir %{_sysusersdir}
@@ -78,6 +74,9 @@
 %dir %{_unitdir}/shutdown.target.wants
 %dir %{_unitdir}/sockets.target.wants
 %dir %{_unitdir}/sysinit.target.wants
+%if %{with upstream}
+%dir %{_unitdir}/system-update-pre.target.wants
+%endif
 %dir %{_unitdir}/timers.target.wants
 %dir %{_unitdir}/user-.slice.d
 %dir %{_unitdir}/[email protected]
@@ -131,6 +130,7 @@
 %{_bindir}/systemd-mount
 %{_bindir}/systemd-notify
 %{_bindir}/systemd-path
+%{_bindir}/systemd-pty-forward
 %{_bindir}/systemd-run
 %{_bindir}/systemd-socket-activate
 %{_bindir}/systemd-stdio-bridge
@@ -152,7 +152,6 @@
 %{_datadir}/bash-completion/completions/journalctl
 %{_datadir}/bash-completion/completions/localectl
 %{_datadir}/bash-completion/completions/loginctl
-%{_datadir}/bash-completion/completions/portablectl
 %{_datadir}/bash-completion/completions/run0
 %{_datadir}/bash-completion/completions/systemctl
 %{_datadir}/bash-completion/completions/systemd-analyze
@@ -170,9 +169,8 @@
 %{_datadir}/bash-completion/completions/systemd-sysext
 %{_datadir}/bash-completion/completions/systemd-vpick
 %{_datadir}/bash-completion/completions/timedatectl
-%if %{with upstream}
 %{_datadir}/bash-completion/completions/userdbctl
-%endif
+%{_datadir}/bash-completion/completions/varlinkctl
 %endif
 # dbus introspection data for code generators: 
https://github.com/systemd/systemd/pull/20294
 %{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml
@@ -211,13 +209,17 @@
 %{_datadir}/mime/packages/io.systemd.xml
 %{_datadir}/pkgconfig/systemd.pc
 %{_datadir}/polkit-1/actions/io.systemd.credentials.policy
+%if %{with upstream}
+%{_datadir}/polkit-1/actions/io.systemd.sysext.policy
+%endif
 %{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
-%if %{with upstream}
 
%{_datadir}/polkit-1/rules.d/10-systemd-logind-root-ignore-inhibitors.rules.example
+%if %{with upstream}
+%{_datadir}/polkit-1/rules.d/empower.rules
 %endif
 %{_datadir}/systemd/kbd-model-map
 %{_datadir}/systemd/language-fallback-map
@@ -229,6 +231,7 @@
 %{_datadir}/zsh/site-functions/_localectl
 %{_datadir}/zsh/site-functions/_loginctl
 %{_datadir}/zsh/site-functions/_run0
+%{_datadir}/zsh/site-functions/_sd_bus_address
 %{_datadir}/zsh/site-functions/_sd_hosts_or_user_at_host
 %{_datadir}/zsh/site-functions/_sd_outputmodes
 %{_datadir}/zsh/site-functions/_sd_unit_files
@@ -281,6 +284,7 @@
 %{_mandir}/man1/systemd-mount.1.gz
 %{_mandir}/man1/systemd-notify.1.gz
 %{_mandir}/man1/systemd-path.1.gz
+%{_mandir}/man1/systemd-pty-forward.1.gz
 %{_mandir}/man1/systemd-run.1.gz
 %{_mandir}/man1/systemd-socket-activate.1.gz
 %{_mandir}/man1/systemd-stdio-bridge.1.gz
@@ -293,6 +297,10 @@
 %{_mandir}/man1/varlinkctl.1.gz
 %{_mandir}/man5/binfmt.d.5.gz
 %{_mandir}/man5/[email protected]
+%if %{with upstream}
+%{_mandir}/man5/confext.conf.5.gz
+%{_mandir}/man5/confext.conf.d.5.gz
+%endif
 %{_mandir}/man5/coredump.conf.5.gz
 %{_mandir}/man5/coredump.conf.d.5.gz
 %{_mandir}/man5/dnssec-trust-anchors.d.5.gz
@@ -313,11 +321,14 @@
 %{_mandir}/man5/org.freedesktop.hostname1.5.gz
 %{_mandir}/man5/org.freedesktop.locale1.5.gz
 %{_mandir}/man5/org.freedesktop.login1.5.gz
-%{_mandir}/man5/org.freedesktop.portable1.5.gz
 %{_mandir}/man5/org.freedesktop.systemd1.5.gz
 %{_mandir}/man5/org.freedesktop.timedate1.5.gz
 %{_mandir}/man5/os-release.5.gz
 %{_mandir}/man5/sysctl.d.5.gz
+%if %{with upstream}
+%{_mandir}/man5/sysext.conf.5.gz
+%{_mandir}/man5/sysext.conf.d.5.gz
+%endif
 %{_mandir}/man5/system.conf.d.5.gz
 %{_mandir}/man5/systemd-system.conf.5.gz
 %{_mandir}/man5/systemd-user-runtime-dir.5.gz
@@ -383,9 +394,7 @@
 %{_mandir}/man8/systemd-binfmt.service.8.gz
 %{_mandir}/man8/systemd-boot-check-no-failures.8.gz
 %{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz
-%if %{with upstream}
 %{_mandir}/man8/systemd-confext-initrd.service.8.gz
-%endif
 %{_mandir}/man8/systemd-confext.8.gz
 %{_mandir}/man8/systemd-confext.service.8.gz
 %{_mandir}/man8/systemd-coredump.8.gz
@@ -411,9 +420,7 @@
 %{_mandir}/man8/systemd-localed.service.8.gz
 %{_mandir}/man8/systemd-logind.8.gz
 %{_mandir}/man8/systemd-logind.service.8.gz
-%if %{with upstream}
 %{_mandir}/man8/[email protected]
-%endif
 %{_mandir}/man8/systemd-machine-id-commit.service.8.gz
 %{_mandir}/man8/systemd-poweroff.service.8.gz
 %{_mandir}/man8/systemd-reboot.service.8.gz
@@ -423,9 +430,7 @@
 %{_mandir}/man8/systemd-soft-reboot.service.8.gz
 %{_mandir}/man8/systemd-sysctl.8.gz
 %{_mandir}/man8/systemd-sysctl.service.8.gz
-%if %{with upstream}
 %{_mandir}/man8/systemd-sysext-initrd.service.8.gz
-%endif
 %{_mandir}/man8/systemd-sysext.8.gz
 %{_mandir}/man8/systemd-sysext.service.8.gz
 %{_mandir}/man8/systemd-system-update-generator.8.gz
@@ -471,10 +476,7 @@
 %if %{without bootstrap}
 %{_systemd_util_dir}/coredump.conf
 %endif
-%if %{with upstream}
-%{_systemd_util_dir}/initrd-preset/90-systemd.preset
 %{_systemd_util_dir}/initrd-preset/99-default.preset
-%endif
 %{_systemd_util_dir}/journald.conf
 %{_systemd_util_dir}/logind.conf
 %{_systemd_util_dir}/rpm/fixlet-systemd-post.sh
@@ -483,9 +485,6 @@
 %{_systemd_util_dir}/systemd
 %{_systemd_util_dir}/systemd-binfmt
 %{_systemd_util_dir}/systemd-boot-check-no-failures
-%if %{without upstream}
-%{_systemd_util_dir}/systemd-cgroups-agent
-%endif
 %if %{without bootstrap}
 %{_systemd_util_dir}/systemd-coredump
 %endif
@@ -531,14 +530,10 @@
 %{_systemd_util_dir}/user/shutdown.target
 %{_systemd_util_dir}/user/smartcard.target
 %{_systemd_util_dir}/user/sockets.target
-%if %{with upstream}
 %{_systemd_util_dir}/user/sockets.target.wants/systemd-ask-password.socket
-%endif
 %{_systemd_util_dir}/user/sound.target
-%if %{with upstream}
 %{_systemd_util_dir}/user/systemd-ask-password.socket
 %{_systemd_util_dir}/user/[email protected]
-%endif
 %{_systemd_util_dir}/user/systemd-exit.service
 %{_systemd_util_dir}/user/systemd-tmpfiles-clean.service
 %{_systemd_util_dir}/user/systemd-tmpfiles-clean.timer
@@ -569,17 +564,17 @@
 %{_udevrulesdir}/71-seat.rules
 %{_udevrulesdir}/73-seat-late.rules
 %{_udevrulesdir}/99-systemd.rules
+%if %{without upstream}
 %{_unitdir}/[email protected]
+%endif
 %{_unitdir}/basic.target
 %{_unitdir}/[email protected]
 %{_unitdir}/bluetooth.target
 %{_unitdir}/boot-complete.target
-%if %{with upstream}
 %{_unitdir}/breakpoint-pre-basic.service
 %{_unitdir}/breakpoint-pre-mount.service
 %{_unitdir}/breakpoint-pre-switch-root.service
 %{_unitdir}/breakpoint-pre-udev.service
-%endif
 %{_unitdir}/capsule.slice
 %{_unitdir}/[email protected]
 %{_unitdir}/console-getty.service
@@ -604,7 +599,7 @@
 %{_unitdir}/[email protected]
 %{_unitdir}/graphical.target
 %{_unitdir}/halt.target
-%if %{with upstream}
+%if %{without bootstrap}
 %{_unitdir}/imports-pre.target
 %{_unitdir}/imports.target
 %endif
@@ -617,10 +612,8 @@
 %{_unitdir}/initrd-switch-root.target
 %{_unitdir}/initrd-usr-fs.target
 %{_unitdir}/initrd.target
-%if %{with upstream}
 %{_unitdir}/initrd.target.wants/systemd-confext-initrd.service
 %{_unitdir}/initrd.target.wants/systemd-sysext-initrd.service
-%endif
 %{_unitdir}/kexec.target
 %{_unitdir}/local-fs-pre.target
 %{_unitdir}/local-fs.target
@@ -652,9 +645,7 @@
 %{_unitdir}/slices.target
 %{_unitdir}/smartcard.target
 %{_unitdir}/sockets.target
-%if %{with upstream}
 %{_unitdir}/sockets.target.wants/systemd-ask-password.socket
-%endif
 %if %{without bootstrap}
 %{_unitdir}/sockets.target.wants/systemd-coredump.socket
 %endif
@@ -662,9 +653,7 @@
 %{_unitdir}/sockets.target.wants/systemd-hostnamed.socket
 %{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket
 %{_unitdir}/sockets.target.wants/systemd-journald.socket
-%if %{with upstream}
 %{_unitdir}/sockets.target.wants/systemd-logind-varlink.socket
-%endif
 %{_unitdir}/sockets.target.wants/systemd-sysext.socket
 %{_unitdir}/soft-reboot.target
 %{_unitdir}/sound.target
@@ -677,6 +666,9 @@
 %{_unitdir}/sysinit.target
 %{_unitdir}/sysinit.target.wants/dev-hugepages.mount
 %{_unitdir}/sysinit.target.wants/dev-mqueue.mount
+%if %{without bootstrap}
+%{_unitdir}/sysinit.target.wants/imports.target
+%endif
 %{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount
 %{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount
 %{_unitdir}/sysinit.target.wants/sys-kernel-config.mount
@@ -691,9 +683,6 @@
 %{_unitdir}/sysinit.target.wants/systemd-machine-id-commit.service
 %{_unitdir}/sysinit.target.wants/systemd-sysctl.service
 %{_unitdir}/sysinit.target.wants/systemd-sysusers.service
-%if %{with upstream}
-%{_unitdir}/sysinit.target.wants/imports.target
-%endif
 %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service
 %{_unitdir}/sysinit.target.wants/systemd-update-done.service
 %if %{with utmp}
@@ -702,20 +691,19 @@
 %{_unitdir}/syslog.socket
 %{_unitdir}/system-update-cleanup.service
 %{_unitdir}/system-update-pre.target
+%if %{with upstream}
+%{_unitdir}/system-update-pre.target.wants/systemd-coredump.socket
+%endif
 %{_unitdir}/system-update.target
 %{_unitdir}/systemd-ask-password-console.path
 %{_unitdir}/systemd-ask-password-console.service
 %{_unitdir}/systemd-ask-password-wall.path
 %{_unitdir}/systemd-ask-password-wall.service
-%if %{with upstream}
 %{_unitdir}/systemd-ask-password.socket
 %{_unitdir}/[email protected]
-%endif
 %{_unitdir}/systemd-binfmt.service
 %{_unitdir}/systemd-boot-check-no-failures.service
-%if %{with upstream}
 %{_unitdir}/systemd-confext-initrd.service
-%endif
 %{_unitdir}/systemd-confext.service
 %if %{without bootstrap}
 %{_unitdir}/systemd-coredump.socket
@@ -739,19 +727,15 @@
 %{_unitdir}/[email protected]
 %{_unitdir}/systemd-kexec.service
 %{_unitdir}/systemd-localed.service
-%{_unitdir}/systemd-logind.service
-%if %{with upstream}
 %{_unitdir}/systemd-logind-varlink.socket
+%{_unitdir}/systemd-logind.service
 %{_unitdir}/[email protected]
-%endif
 %{_unitdir}/systemd-machine-id-commit.service
 %{_unitdir}/systemd-poweroff.service
 %{_unitdir}/systemd-reboot.service
 %{_unitdir}/systemd-soft-reboot.service
 %{_unitdir}/systemd-sysctl.service
-%if %{with upstream}
 %{_unitdir}/systemd-sysext-initrd.service
-%endif
 %{_unitdir}/systemd-sysext.service
 %{_unitdir}/systemd-sysext.socket
 %{_unitdir}/[email protected]
@@ -767,9 +751,7 @@
 %endif
 %{_unitdir}/systemd-user-sessions.service
 %if %{without bootstrap}
-%if %{with upstream}
 %{_unitdir}/systemd-userdb-load-credentials.service
-%endif
 %{_unitdir}/systemd-userdbd.service
 %{_unitdir}/systemd-userdbd.socket
 %endif

++++++ files.sysvcompat ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:55.022837576 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:55.030837912 +0100
@@ -1,61 +1,11 @@
 #
 # Please keep the list sorted (with `LC_ALL=C sort`).
 #
-%if %{without upstream}
-%dir %{_unitdir}/runlevel1.target.wants
-%dir %{_unitdir}/runlevel2.target.wants
-%dir %{_unitdir}/runlevel3.target.wants
-%dir %{_unitdir}/runlevel4.target.wants
-%dir %{_unitdir}/runlevel5.target.wants
-%endif
 %{_mandir}/man8/rc-local.service.8.gz
-%if %{without upstream}
-%{_mandir}/man8/runlevel.8.gz
-%{_mandir}/man8/systemd-initctl.8.gz
-%{_mandir}/man8/systemd-initctl.service.8.gz
-%{_mandir}/man8/systemd-initctl.socket.8.gz
-%endif
 %{_mandir}/man8/systemd-rc-local-generator.8.gz
 %{_mandir}/man8/systemd-sysv-generator.8.gz
-%if %{without upstream}
-%if %{with utmp}
-%{_mandir}/man8/systemd-update-utmp-runlevel.service.8.gz
-%endif
-%{_mandir}/man8/telinit.8.gz
-%{_sbindir}/runlevel
-%{_sbindir}/telinit
-%{_systemd_util_dir}/systemd-initctl
-%endif
 %{_systemd_util_dir}/systemd-sysv-install
 %{_systemdgeneratordir}/systemd-rc-local-generator
 %{_systemdgeneratordir}/systemd-sysv-generator
-%if %{without upstream}
-%if %{with utmp}
-%{_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service
-%{_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service
-%endif
-%endif
 %{_unitdir}/rc-local.service
-%if %{without upstream}
-%if %{with utmp}
-%{_unitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service
-%endif
-%{_unitdir}/runlevel0.target
-%{_unitdir}/runlevel1.target
-%{_unitdir}/runlevel2.target
-%{_unitdir}/runlevel3.target
-%{_unitdir}/runlevel4.target
-%{_unitdir}/runlevel5.target
-%{_unitdir}/runlevel6.target
-%{_unitdir}/sockets.target.wants/systemd-initctl.socket
-%{_unitdir}/systemd-initctl.service
-%{_unitdir}/systemd-initctl.socket
-%if %{with utmp}
-%{_unitdir}/systemd-update-utmp-runlevel.service
-%endif
-%if %{with split_usr}
-/sbin/runlevel
-/sbin/telinit
-%endif
-%endif
 

++++++ files.udev ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:55.066839424 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:55.070839592 +0100
@@ -99,9 +99,7 @@
 %{_mandir}/man5/veritytab.5.gz
 %{_mandir}/man7/hwdb.7.gz
 %{_mandir}/man7/smbios-type-11.7.gz
-%if %{with upstream}
 %{_mandir}/man7/systemd.image-filter.7.gz
-%endif
 %{_mandir}/man7/systemd.image-policy.7.gz
 %{_mandir}/man7/udev.7.gz
 %{_mandir}/man8/kernel-install.8.gz
@@ -142,13 +140,9 @@
 %endif
 %{_mandir}/man8/systemd-pstore.8.gz
 %{_mandir}/man8/systemd-pstore.service.8.gz
+%{_mandir}/man8/systemd-quotacheck-root.service.8.gz
 %{_mandir}/man8/systemd-quotacheck.8.gz
-%if %{with upstream}
 %{_mandir}/man8/[email protected]
-%{_mandir}/man8/systemd-quotacheck-root.service.8.gz
-%else
-%{_mandir}/man8/systemd-quotacheck.service.8.gz
-%endif
 %{_mandir}/man8/systemd-random-seed.8.gz
 %{_mandir}/man8/systemd-random-seed.service.8.gz
 %{_mandir}/man8/systemd-remount-fs.8.gz
@@ -168,9 +162,7 @@
 %{_mandir}/man8/systemd-udev-settle.service.8.gz
 %{_mandir}/man8/systemd-udevd-control.socket.8.gz
 %{_mandir}/man8/systemd-udevd-kernel.socket.8.gz
-%if %{with upstream}
 %{_mandir}/man8/systemd-udevd-varlink.socket.8.gz
-%endif
 %{_mandir}/man8/systemd-udevd.8.gz
 %{_mandir}/man8/systemd-udevd.service.8.gz
 %{_mandir}/man8/systemd-vconsole-setup.8.gz
@@ -302,6 +294,9 @@
 %{_udevhwdbdir}/70-cameras.hwdb
 %{_udevhwdbdir}/70-hardware-wallets.hwdb
 %{_udevhwdbdir}/70-joystick.hwdb
+%if %{with upstream}
+%{_udevhwdbdir}/70-lights.hwdb
+%endif
 %{_udevhwdbdir}/70-maker-tools.hwdb
 %{_udevhwdbdir}/70-mouse.hwdb
 %{_udevhwdbdir}/70-pda.hwdb
@@ -310,6 +305,9 @@
 %{_udevhwdbdir}/70-sound-card.hwdb
 %{_udevhwdbdir}/70-touchpad.hwdb
 %{_udevhwdbdir}/80-ieee1394-unit-function.hwdb
+%if %{with upstream}
+%{_udevhwdbdir}/82-net-auto-link-local.hwdb
+%endif
 %{_udevrulesdir}/50-udev-default.rules
 %{_udevrulesdir}/60-autosuspend.rules
 %{_udevrulesdir}/60-block.rules
@@ -318,12 +316,13 @@
 %{_udevrulesdir}/60-drm.rules
 %{_udevrulesdir}/60-evdev.rules
 %{_udevrulesdir}/60-fido-id.rules
+%if %{with upstream}
+%{_udevrulesdir}/60-gpiochip.rules
+%endif
 %{_udevrulesdir}/60-infiniband.rules
 %{_udevrulesdir}/60-input-id.rules
 %{_udevrulesdir}/60-persistent-alsa.rules
-%if %{with upstream}
 %{_udevrulesdir}/60-persistent-hidraw.rules
-%endif
 %{_udevrulesdir}/60-persistent-input.rules
 %{_udevrulesdir}/60-persistent-storage-mtd.rules
 %{_udevrulesdir}/60-persistent-storage-tape.rules
@@ -347,13 +346,12 @@
 %{_udevrulesdir}/80-drivers.rules
 %endif
 %{_udevrulesdir}/80-net-setup-link.rules
-%if %{with upstream}
 %{_udevrulesdir}/81-net-bridge.rules
-%endif
 %{_udevrulesdir}/81-net-dhcp.rules
 %if %{with upstream}
-%{_udevrulesdir}/90-image-dissect.rules
+%{_udevrulesdir}/82-net-auto-link-local.rules
 %endif
+%{_udevrulesdir}/90-image-dissect.rules
 %{_udevrulesdir}/90-iocost.rules
 %{_udevrulesdir}/90-vconsole.rules
 %if %{without bootstrap}
@@ -364,9 +362,7 @@
 %{_unitdir}/hybrid-sleep.target
 %if %{without bootstrap}
 %{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target
-%if %{with upstream}
 %{_unitdir}/initrd-root-device.target.wants/remote-integritysetup.target
-%endif
 %{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target
 %endif
 %{_unitdir}/initrd-udevadm-cleanup-db.service
@@ -380,9 +376,7 @@
 %{_unitdir}/[email protected]
 %if %{without bootstrap}
 %{_unitdir}/remote-cryptsetup.target
-%if %{with upstream}
 %{_unitdir}/remote-integritysetup.target
-%endif
 %{_unitdir}/remote-veritysetup.target
 %endif
 %{_unitdir}/sleep.target
@@ -390,11 +384,14 @@
 %{_unitdir}/sockets.target.wants/systemd-bootctl.socket
 %{_unitdir}/sockets.target.wants/systemd-pcrlock.socket
 %endif
+%if %{without bootstrap}
+%if %{with upstream}
+%{_unitdir}/sockets.target.wants/systemd-repart.socket
+%endif
+%endif
 %{_unitdir}/sockets.target.wants/systemd-udevd-control.socket
 %{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket
-%if %{with upstream}
 %{_unitdir}/sockets.target.wants/systemd-udevd-varlink.socket
-%endif
 %{_unitdir}/suspend-then-hibernate.target
 %{_unitdir}/suspend.target
 %if %{without bootstrap}
@@ -451,6 +448,10 @@
 %{_unitdir}/systemd-remount-fs.service
 %if %{without bootstrap}
 %{_unitdir}/systemd-repart.service
+%if %{with upstream}
+%{_unitdir}/systemd-repart.socket
+%{_unitdir}/[email protected]
+%endif
 %endif
 %{_unitdir}/systemd-rfkill.service
 %{_unitdir}/systemd-rfkill.socket
@@ -464,10 +465,8 @@
 %{_unitdir}/systemd-udev-trigger.service
 %{_unitdir}/systemd-udevd-control.socket
 %{_unitdir}/systemd-udevd-kernel.socket
-%{_unitdir}/systemd-udevd.service
-%if %{with upstream}
 %{_unitdir}/systemd-udevd-varlink.socket
-%endif
+%{_unitdir}/systemd-udevd.service
 %{_unitdir}/systemd-vconsole-setup.service
 %{_unitdir}/systemd-volatile-root.service
 %{_unitdir}/tpm2.target

++++++ files.uefi-boot ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:55.106841104 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:55.126841944 +0100
@@ -15,9 +15,7 @@
 %{_mandir}/man8/systemd-bless-boot-generator.8.gz
 %{_mandir}/man8/systemd-bless-boot.8.gz
 %{_mandir}/man8/systemd-bless-boot.service.8.gz
-%if %{with upstream}
 %{_mandir}/man8/systemd-boot-clear-sysfail.service.8.gz
-%endif
 %{_mandir}/man8/systemd-boot-random-seed.service.8.gz
 %endif
 # These are the few exceptions where glob pattern is allowed.
@@ -28,9 +26,7 @@
 %{_systemdgeneratordir}/systemd-bless-boot-generator
 %{_unitdir}/sysinit.target.wants/systemd-boot-random-seed.service
 %{_unitdir}/systemd-bless-boot.service
-%if %{with upstream}
 %{_unitdir}/systemd-boot-clear-sysfail.service
-%endif
 %{_unitdir}/systemd-boot-random-seed.service
 %{_unitdir}/systemd-boot-update.service
 

++++++ fixlet-systemd-post.sh ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:55.190844632 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:55.198844968 +0100
@@ -9,69 +9,6 @@
 }
 
 #
-# /etc/machine-id might have been created writeable incorrectly (boo#1092269).
-#
-# Note: run at each package update.
-#
-fix_machine_id_perms() {
-       if [ "$(stat -c%a /etc/machine-id)" != 444 ]; then
-               echo "Incorrect file mode bits for /etc/machine-id which should 
be 0444, fixing..."
-               chmod 444 /etc/machine-id
-       fi
-}
-
-#
-# v228 wrongly set world writable suid root permissions on timestamp files used
-# by permanent timers. Fix the timestamps that might have been created by the
-# affected versions of systemd (bsc#1020601).
-#
-# Note: run at each package update.
-#
-fix_bsc_1020601() {
-       for stamp in $(ls /var/lib/systemd/timers/stamp-*.timer 2>/dev/null); do
-               chmod 0644 $stamp
-       done
-
-       # Same for user lingering created by logind.
-       for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do
-               chmod 0644 $username
-       done
-}
-
-#
-# Due to the fact that DynamicUser= was turned ON during v235 and then switched
-# back to off in v240, /var/lib/systemd/timesync might be a symlink pointing to
-# /var/lib/private/systemd/timesync, which is inaccessible for systemd-timesync
-# user as /var/lib/private is 0700 root:root, see
-# https://github.com/systemd/systemd/issues/11329 for details.
-#
-# Note: only TW might be affected by this bug.
-# Note: run at each package update.
-#
-fix_issue_11329() {
-       if [ -L /var/lib/systemd/timesync ]; then
-               rm /var/lib/systemd/timesync
-               mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync
-       fi
-}
-
-#
-# We don't ship after-local.service anymore however as a courtesy we install a
-# copy in /etc for users who are relying on it.
-#
-# Note: should run only once since it is conditionalized on the presence of
-# %{_unitdir}/after-local.service
-#
-drop_after_local_support() {
-       if [ -x /etc/init.d/after.local ] &&
-          [ -f /usr/lib/systemd/system/after-local.service ]; then
-               echo "after-local.service is no more provided by systemd but a 
copy has been installed in /etc"
-               cp /usr/lib/systemd/system/after-local.service 
/etc/systemd/system/
-               ln -s ../after-local.service 
/etc/systemd/system/multi-user.target.wants/after-local.service
-       fi
-}
-
-#
 # We have stopped shipping the main config files in /etc but we don't try to
 # clean them up automatically as it can have unexepected side effects
 # (bsc#1226415). Instead we simply suggest users to convert them (if they 
exist)
@@ -96,153 +33,5 @@
        done
 }
 
-# On systems using the old btrfs layout, where /var was not a separate
-# subvolume, convert /var/lib/machines into a subvolume suitable for snapper to
-# perform snapshots, rollbacks, see bsc#992573.
-#
-# The conversion might only be problematic for openSUSE distros (TW/Factory)
-# where the subvolume was created at the wrong place (via tmpfiles for example)
-# and it got populated before we had time to fix it. In this case we'll let the
-# user fix it manually.
-#
-# On SLE12 this subvolume was only introduced during the upgrade from v210 to
-# v228 (ie SLE12-SP[01] -> SLE12-SP2+ when we added this workaround hence no
-# user should had time to populate it. Note that the subvolume is still created
-# at the wrong place due to the call to tmpfiles_create macro in the %post
-# section however it's empty so again we shouldn't face any issue to convert 
it.
-#
-# In order to avoid ugly dependencies added in systemd package, this function
-# should only be called during package updates when mksubvolume(8) is
-# available. During installation, /var/lib/machines is supposed to be created 
by
-# the installer now.
-#
-# See bsc#992573.
-#
-is_btrfs_subvolume() {
-       # On btrfs subvolumes always have the inode 256
-       test $(stat --format=%i "$1") -eq 256
-}
-
-# This assumes the directory/subvol to remove is empty.
-rm_subvolume_or_directory() {
-       is_btrfs_subvolume "$1" && {
-               btrfs subvolume delete "$1"
-               return
-       }
-       rmdir "$1"
-}
-
-fix_machines_subvol() {
-       local tagfile=/var/lib/systemd/rpm/container-machines_subvol
-
-       #
-       # This test is probably redundant with the ones below but we don't want
-       # to run this on transactional systems since /var has always been a
-       # separate subvolume on such systems.
-       #
-       if [ -n "${TRANSACTIONAL_UPDATE}" ]; then
-               return 0
-       fi
-
-       if [ -e $tagfile ]; then
-               return 0
-       fi
-       touch $tagfile
-
-       #
-       # If there's already an entry in fstab for /var/lib/machines, it
-       # means that:
-       #
-       #   - the installer initialized /var/lib/machines correctly (default)
-       #   - we already fixed it
-       #   - the sysadmin added it manually
-       #
-       # In any cases we should return.
-       #
-       # Note: we can't simply check if /var/lib/machines has been mounted
-       # because an offline update might be in progress (see bsc#1030290).
-       #
-       if mount --fake /var/lib/machines 2>/dev/null; then
-               return
-       fi
-
-       #
-       # If there is already an entry in fstab for /var, it means that:
-       #
-       #   - the system has a seperate /var subvolume (default from Feb 2018)
-       #   - the system has a seperate /var partition
-       #
-       # In any case we should return.
-       #
-       if mount --fake /var 2>/dev/null; then
-               return
-       fi
-
-       #
-       # If something is already mounted don't try to fix anything, it's been
-       # done manually by the sysadmin.
-       #
-       if mountpoint -q /var/lib/machines; then
-               return
-       fi
-
-       #
-       # Let's try to figure out if the current filesystem uses a Snapper
-       # BTRFS specific layout. Note that TW uses a different layout than
-       # SLE...
-       #
-       # FIXME: not sure if it's correct, reliable or optimal.
-       #
-       case $(findmnt -nr -t btrfs -o FSROOT / 2>/dev/null) in
-       *.snapshots/*/snapshot*)
-               ;;
-       *)
-               return 0
-       esac
-
-       if test -d /var/lib/machines; then
-               #
-               # Ok, we're on a system supporting rollbacks and
-               # /var/lib/machines is not a subvolume remotely mounted so it
-               # cannot be suitable for systems supporting rollback. Fix it.
-               #
-               echo "Making /var/lib/machines suitable for rollbacks..."
-
-               type mksubvolume >/dev/null 2>&1 || {
-                       warn "mksubvolume(8) is not installed, aborting."
-                       return 1
-               }
-               test "$(ls -A /var/lib/machines/)" && {
-                       warn "/var/lib/machines is not empty, aborting."
-                       return 1
-               }
-
-               echo "Deleting empty /var/lib/machines directory/subvolume"
-               rm_subvolume_or_directory /var/lib/machines || {
-                       warn "fail to delete /var/lib/machines"
-                       return 1
-               }
-       fi
-
-       # At this point /var/lib/machines shouldn't exist.
-       echo "Creating /var/lib/machines subvolume suitable for rollbacks."
-       mksubvolume /var/lib/machines
-}
-
-
-r=0
-fix_machine_id_perms || r=1
-fix_bsc_1020601 || r=1
-fix_issue_11329 || r=1
-drop_after_local_support || r=1
-
-if [ $1 -gt 1 ]; then
-       # During upgrade
-       fix_machines_subvol || {
-               warn "Please fix the initialization of /var/lib/machines 
manually."
-               r=1
-       }
-fi
-
-exit $r
+check_config_files
 

++++++ mkosi.local.conf ++++++
[Distribution]
RepositoryKeyFetch=yes

[Build]
BuildDirectory=/var/tmp/systemd-testsuite/build
Environment=NO_BUILD=1

[Output]
OutputDirectory=/var/tmp/systemd-testsuite/output

++++++ pam.systemd-user ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:55.314849840 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:55.318850008 +0100
@@ -16,7 +16,7 @@
 #
 auth     required pam_deny.so
 
-account  include  common-account
+account  required pam_unix.so no_pass_expiry
 
 session  required pam_selinux.so close
 session  required pam_selinux.so nottys open

++++++ systemd-257.9+suse.23.gc139debf2c.tar.xz -> 
systemd-258.3+suse.15.g2ffdb7879d.tar.xz ++++++
/work/SRC/openSUSE:Factory/systemd/systemd-257.9+suse.23.gc139debf2c.tar.xz 
/work/SRC/openSUSE:Factory/.systemd.new.1670/systemd-258.3+suse.15.g2ffdb7879d.tar.xz
 differ: char 13, line 1

++++++ systemd-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:55.378852527 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:55.382852695 +0100
@@ -16,5 +16,5 @@
 
 # These are NSS plugins and are not really subject to shlib policy.
 addFilter("systemd-container\..*: E: shlib-policy-name-error .* 
libnss_mymachines")
-addFilter("systemd-network\..*: E: shlib-policy-name-error .* libnss_resolve")
+addFilter("systemd-resolved\..*: E: shlib-policy-name-error .* libnss_resolve")
 

++++++ systemd-update-helper ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:55.422854375 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:55.426854543 +0100
@@ -48,6 +48,7 @@
 
     for unit in "$@" ; do
         if [ -e /run/systemd/rpm/$mode/needs-preset/"$unit" ]; then
+            rm  /run/systemd/rpm/$mode/needs-preset/"$unit"
             units+=("$unit")
         fi
     done
@@ -70,6 +71,8 @@
     for unit in "$@" ; do
         if [ ! -e /run/systemd/rpm/$mode/dont-disable/"$unit" ]; then
             units+=("$unit")
+        else
+            rm /run/systemd/rpm/$mode/dont-disable/"$unit"
         fi
     done
 
@@ -145,18 +148,18 @@
         wait
         ;;
 
-    system-reload-restart|system-reload|system-restart) # called from 
%transfiletriggerin
+    system-reload-restart|system-reload|system-restart|system-reexec) # called 
once from %transfiletriggerin or %transfiletriggerpostun
         if [ -n "$*" ]; then
             echo >&2 "Unexpected arguments for '$command': $*"
             exit 2
         fi
 
-        # Clean up all flags created during executions of %pre (i.e. on
-        # install/upgrade/rename) at the very end of the transaction.
-        rm -fr /run/systemd/rpm/system
-
         [ -d /run/systemd/system ] || exit 0
 
+        if [[ "$command" =~ reexec ]]; then
+            systemctl daemon-reexec
+        fi
+
         if [[ "$command" =~ reload ]]; then
             systemctl daemon-reload
         fi
@@ -166,16 +169,12 @@
         fi
         ;;
 
-    user-reload-restart|user-reload|user-restart|user-reexec) # called from 
%transfiletriggerin
+    user-reload-restart|user-reload|user-restart|user-reexec) # called once 
from %transfiletriggerin or %transfiletriggerpostun
         if [ -n "$*" ]; then
             echo >&2 "Unexpected arguments for '$command': $*"
             exit 2
         fi
 
-        # Clean up all flags created during executions of %pre (i.e. on
-        # install/upgrade/rename) at the very end of the transaction.
-        rm -fr /run/systemd/rpm/user
-
         [ -d /run/systemd/system ] || exit 0
 
         if [[ "$command" =~ reexec|reload ]]; then

++++++ triggers.systemd ++++++
--- /var/tmp/diff_new_pack.vROA4i/_old  2026-02-05 17:56:55.486857063 +0100
+++ /var/tmp/diff_new_pack.vROA4i/_new  2026-02-05 17:56:55.490857231 +0100
@@ -3,10 +3,12 @@
 #
 #  This file is part of systemd.
 #  Copyright © 2018 Neal Gompa
-
-# The contents of this are an example to be copied into systemd.spec.
 #
-# Minimum rpm version supported: 4.15.0
+#  Minimum rpm version supported: 4.15.0
+#
+#  A basic introduction of rpm file-triggers can be found at
+#  https://rpm.org/docs/4.19.x/manual/file_triggers.html
+#
 
 %transfiletriggerin -P 900900 -p <lua> -- /usr/lib/systemd/system 
/etc/systemd/system
 -- This script will run after any package is initially installed or

Reply via email to