Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2025-12-04 14:30:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new.1939 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Thu Dec 4 14:30:37 2025 rev:459 rq:1321158 version:257.9 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2025-12-02 13:18:12.257936125 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new.1939/systemd.changes 2025-12-04 14:30:40.436618950 +0100 @@ -2,89 +1,0 @@ -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. - -- 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-or-soften-some-upstream-warnings.patch 5003-core-when-isolating-keep-triggered-units-only-if-the.patch mkosi.local.conf systemd-258.2+suse.5.ge103ce013e.tar.xz New: ---- 0001-Drop-support-for-efivar-SystemdOptions.patch 0009-pid1-handle-console-specificities-weirdness-for-s390.patch systemd-257.9+suse.23.gc139debf2c.tar.xz ----------(Old B)---------- Old: WARN: 0001-Drop-or-soften-some-upstream-warnings.patch not found in changes Old: WARN: 5003-core-when-isolating-keep-triggered-units-only-if-the.patch not found in changes ----------(Old E)---------- ----------(New B)---------- New: - Add 0001-Drop-support-for-efivar-SystemdOptions.patch (bsc#1220338) New: - Update 0009-pid1-handle-console-specificities-weirdness-for-s390.patch to not warn when "conmode=" is not specified on s390x (bsc#1236725). ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:41.924681369 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:41.928681536 +0100 @@ -1,6 +1,7 @@ # # spec file for package systemd # +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties @@ -31,9 +32,9 @@ %bcond_with obs_service_set_version %if %{without obs_service_set_version} -%define systemd_version 258.2 +%define systemd_version 257.9 %define systemd_release 0 -%define archive_version +suse.5.ge103ce013e +%define archive_version +suse.23.gc139debf2c %endif %define _testsuitedir %{_systemd_util_dir}/tests @@ -98,6 +99,7 @@ %endif BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools +BuildRequires: polkit # python is only required for generating systemd.directives.xml BuildRequires: python3-base BuildRequires: python3-lxml @@ -134,7 +136,7 @@ BuildRequires: timezone %if %{with bootstrap} -#!BuildIgnore: dbus-service +#!BuildIgnore: dbus-1 Provides: systemd = %{version}-%{release} Conflicts: systemd # Don't consider the mini flavors when building kiwi medias. This conflict is @@ -148,7 +150,7 @@ # the buildignore is important for bootstrapping #!BuildIgnore: udev Requires: aaa_base >= 13.2 -Requires: dbus-service +Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: netcfg >= 11.5 Requires: systemd-default-settings-branding @@ -199,7 +201,6 @@ Source8: pam.systemd-user Source9: pam.systemd-run0 Source14: kbd-model-map.legacy -Source15: mkosi.local.conf Source101: fixlet-systemd-post.sh @@ -233,12 +234,12 @@ # inside the following if block. # %if %{without upstream} -Patch: 0001-Drop-or-soften-some-upstream-warnings.patch +Patch: 0001-Drop-support-for-efivar-SystemdOptions.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 @@ -246,7 +247,6 @@ # and will be removed as soon as a proper fix is merged by upstream. Patch: 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch Patch: 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch -Patch: 5003-core-when-isolating-keep-triggered-units-only-if-the.patch %endif %description @@ -613,6 +613,83 @@ %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 @@ -620,26 +697,16 @@ extended testsuite is used to test various functionalities of systemd and all its components. -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. +Note that you need root privileges to run the extended testsuite. 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: -$ 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 +$ NO_BUILD=1 TEST_NESTED_VM=1 %{_testsuitedir}/integration-tests/run-integration-tests.sh Or to run one specific integration test: -$ 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. +$ NO_BUILD=1 TEST_NESTED_VM=1 make -C %{_testsuitedir}/integration-tests/TEST-01-BASIC clean setup run For more details on the available options to run the extended testsuite, please refer to %{_testsuitedir}/integration-tests/README.testsuite. @@ -825,7 +892,7 @@ -Dsbat-distro-url="%{?sbat_distro_url}" \ \ -Dsbat-distro-pkgname="%{name}" \ - -Dsbat-distro-version="%{version}" \ + -Dsbat-distro-version="%{version}%[%{without upstream}?"-%{release}":""]" \ \ -Ddefault-dnssec=no \ -Ddns-servers='' \ @@ -1001,10 +1068,8 @@ # 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 @@ -1029,8 +1094,15 @@ cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map %if %{with testsuite} -install -m0644 %{SOURCE15} %{buildroot}%{_testsuitedir}/mkosi/mkosi.local.conf -install -m0644 test/integration-tests/README.md %{buildroot}%{_testsuitedir}/integration-tests/ +# -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/ %endif %if %{without bootstrap} @@ -1040,8 +1112,7 @@ rm -fr %{buildroot}%{_docdir}/systemd %endif -# Some systemd system users needs to exist before %post is executed -# (bsc#1248501). +# Generate system users for pre scriptlets. %if %{with resolved} %sysusers_generate_pre %{buildroot}/%{_sysusersdir}/systemd-resolve.conf systemd-resolve systemd-resolve.conf %endif ++++++ 0001-Drop-support-for-efivar-SystemdOptions.patch ++++++ >From 91fa48c2d1aac250728379a0c0430f9f7a3c8351 Mon Sep 17 00:00:00 2001 From: Franck Bui <[email protected]> Date: Fri, 22 Mar 2024 12:07:34 +0100 Subject: [PATCH 1/1] Drop support for efivar SystemdOptions Upstream deprecated it and plan to drop it in the future. Let's get ahead and drop it now as this feature might be used to gain access to encrypted SLEM systems with unattended disk unlock and with secure boot disabled. [fbui: fixes bsc#1220338] --- src/basic/efivars.c | 27 +++++------------------ src/bootctl/bootctl-systemd-efi-options.c | 4 ++++ 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/basic/efivars.c b/src/basic/efivars.c index 5e04c32212..78bdd28263 100644 --- a/src/basic/efivars.c +++ b/src/basic/efivars.c @@ -368,29 +368,14 @@ SecureBootMode efi_get_secure_boot_mode(void) { } static int read_efi_options_variable(char **ret) { - int r; - /* In SecureBoot mode this is probably not what you want. As your cmdline is cryptographically signed - * like when using Type #2 EFI Unified Kernel Images (https://uapi-group.org/specifications/specs/boot_loader_specification) - * The user's intention is then that the cmdline should not be modified. You want to make sure that - * the system starts up as exactly specified in the signed artifact. - * - * (NB: For testing purposes, we still check the $SYSTEMD_EFI_OPTIONS env var before accessing this - * cache, even when in SecureBoot mode.) */ - if (is_efi_secure_boot()) { - /* Let's be helpful with the returned error and check if the variable exists at all. If it - * does, let's return a recognizable error (EPERM), and if not ENODATA. */ - - if (access(EFIVAR_PATH(EFI_SYSTEMD_VARIABLE_STR("SystemdOptions")), F_OK) < 0) - return errno == ENOENT ? -ENODATA : -errno; - - return -EPERM; - } + /* For SUSE distros, support for SystemdOptions has already been dropped as it might be a security + * concern for systems with unattended disk unlock and with disabled secure boot. */ - r = efi_get_variable_string(EFI_SYSTEMD_VARIABLE_STR("SystemdOptions"), ret); - if (r == -ENOENT) - return -ENODATA; - return r; + if (access(EFIVAR_PATH(EFI_SYSTEMD_VARIABLE_STR("SystemdOptions")), F_OK) < 0) + return errno == ENOENT ? -ENODATA : -errno; + + return log_warning_errno(SYNTHETIC_ERRNO(EPERM), "Boot options passed via SystemdOptions EFI variable is no more supported, ignoring: %m"); } int cache_efi_options_variable(void) { diff --git a/src/bootctl/bootctl-systemd-efi-options.c b/src/bootctl/bootctl-systemd-efi-options.c index d626d87abc..32b79bd1e1 100644 --- a/src/bootctl/bootctl-systemd-efi-options.c +++ b/src/bootctl/bootctl-systemd-efi-options.c @@ -6,6 +6,7 @@ #include "efi-loader.h" int verb_systemd_efi_options(int argc, char *argv[], void *userdata) { +#if 0 int r; /* This is obsolete and subject to removal */ @@ -40,4 +41,7 @@ int verb_systemd_efi_options(int argc, char *argv[], void *userdata) { } return 0; +#else + return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Support for the SystemdOptions EFI variable has been dropped."); +#endif } -- 2.43.0 ++++++ 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:41.972683382 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:41.976683550 +0100 @@ -1,4 +1,4 @@ -From 128ce1fc50b12e012ac50e9d1728c0bb52124d10 Mon Sep 17 00:00:00 2001 +From e1562e145272efea60275ffe8e7edeb65224ab8d 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 b135f3894d..92cd3652f9 100644 +index 6fb0838cdb..768f720032 100644 --- a/units/rc-local.service.in +++ b/units/rc-local.service.in @@ -13,7 +13,7 @@ - Description={{SYSTEM_SYSVRCLOCAL_PATH}} Compatibility + Description={{RC_LOCAL_PATH}} Compatibility Documentation=man:systemd-rc-local-generator(8) - ConditionFileIsExecutable={{SYSTEM_SYSVRCLOCAL_PATH}} + ConditionFileIsExecutable={{RC_LOCAL_PATH}} -After=network.target +After=basic.target [Service] Type=forking -- -2.43.0 +2.35.3 ++++++ 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:41.992684221 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.000684556 +0100 @@ -1,4 +1,4 @@ -From 85adbcd1d7f16d9fc3e9257f7fd6444b42fdc5ac Mon Sep 17 00:00:00 2001 +From 6eb24d1fcf8ea676bd0f0e32a9afda7431eafd77 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 e11edef15e..b694159b6d 100644 +index 4485e2e368..e0833a7179 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c -@@ -413,8 +413,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text +@@ -412,8 +412,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.43.0 +2.35.3 ++++++ 0009-pid1-handle-console-specificities-weirdness-for-s390.patch ++++++ >From 09184a555aec3ef612425ba6fe596cf05383ca09 Mon Sep 17 00:00:00 2001 From: Franck Bui <[email protected]> Date: Fri, 10 Jun 2016 15:19:57 +0200 Subject: [PATCH 1/1] pid1: handle console specificities/weirdness for s390 arch The 3270 console on S/390 can do color but not the 3215 console. Partial forward port of 0001-On_s390_con3270_disable_ANSI_colour_esc.patch from SLE12-SP1. A bunch of the previous code has been dropped since some changes imported from upsteam made them uneeded. The remaining bits are probably hackish but at least they are now minimal. It was an attempt to address bnc#860937 to automatically turn the console color mode off by passing $TERM=dumb when the specified terminal device is other than "3270". For more details, see https://www.ibm.com/docs/en/linux-on-systems?topic=setup-kernel-parameters. See also a short discussion which happened on @systemd-maintainers whose $subject is "[PATCH] support conmode setting on command line". [fbui: fixes bsc#860937] Don't warn if "conmode=" is missing as this option should not be passed on s390x KVM. [fbui: fixes bsc#1236725] --- src/basic/terminal-util.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 409f2abb45..630fc81836 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -912,7 +912,19 @@ bool tty_is_vc_resolve(const char *tty) { } const char* default_term_for_tty(const char *tty) { - return tty && tty_is_vc_resolve(tty) ? "linux" : "vt220"; + if (tty && tty_is_vc_resolve(tty)) + return "linux"; + +#if defined (__s390__) || defined (__s390x__) + if (tty && tty_is_console(tty)) { + _cleanup_free_ char *mode = NULL; + + /* Returns "dumb" in case of OOM. */ + (void) proc_cmdline_get_key("conmode", 0, &mode); + return streq_ptr(mode, "3270") ? "ibm327x" : "dumb"; + } +#endif + return "vt220"; } int fd_columns(int fd) { -- 2.43.0 ++++++ 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:42.028685732 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.048686570 +0100 @@ -1,8 +1,8 @@ -From 6842234e7007e83b3faa2358fbc131c0dc297ae4 Mon Sep 17 00:00:00 2001 +From 1861e68a986c39cfec3c7fe8a348d331d93800d7 Mon Sep 17 00:00:00 2001 From: Franck Bui <[email protected]> Date: Fri, 12 Jan 2024 10:55:17 +0100 -Subject: [PATCH] Revert "udev: revert workarounds for issues caused by the - devlink creation optimization" +Subject: [PATCH 5002/5002] 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 e07f7b5d7a..23c24edb7c 100644 +index 6787430208..39a6555045 100644 --- a/rules.d/60-persistent-storage.rules.in +++ b/rules.d/60-persistent-storage.rules.in -@@ -136,6 +136,17 @@ KERNEL!="sr*|mmcblk[0-9]boot[0-9]", IMPORT{builtin}="blkid" +@@ -134,6 +134,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.43.0 +2.35.3 ++++++ files.container ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:42.120689590 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.124689758 +0100 @@ -6,7 +6,9 @@ %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 @@ -26,17 +28,19 @@ %{_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 -%endif +%if %{with upstream} %{_systemd_util_dir}/user/[email protected] -%if %{without bootstrap} +%endif %{_unitdir}/systemd-mountfsd.service %{_unitdir}/systemd-mountfsd.socket %endif @@ -53,10 +57,6 @@ %{_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,31 +67,25 @@ %{_mandir}/man5/org.freedesktop.machine1.5.gz %{_mandir}/man8/systemd-machined.8.gz %{_mandir}/man8/systemd-machined.service.8.gz -%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 +%if %{with upstream} %{_systemd_util_dir}/user/machine.slice %{_systemd_util_dir}/user/machines.target -%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 %{_systemd_util_dir}/user/[email protected] +%endif %{_tmpfilesdir}/systemd-nspawn.conf %{_unitdir}/dbus-org.freedesktop.machine1.service %{_unitdir}/machine.slice %{_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 @@ -108,7 +102,11 @@ %{_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.CnlvTB/_old 2025-12-04 14:30:42.168691604 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.176691939 +0100 @@ -285,7 +285,9 @@ %{_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 @@ -439,6 +441,7 @@ %{_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 @@ -453,6 +456,7 @@ %{_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 @@ -667,29 +671,6 @@ %{_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 @@ -729,7 +710,9 @@ %{_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 @@ -764,22 +747,14 @@ %{_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 -%{_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_get_description.3.gz %{_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.CnlvTB/_old 2025-12-04 14:30:42.204693114 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.208693282 +0100 @@ -6,26 +6,25 @@ %dir %{_distconfdir}/ssh %dir %{_distconfdir}/ssh/ssh_config.d %if %{without bootstrap} -%if %{with upstream} -%if %{with sd_boot} -%dir %{_libdir}/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 %{without bootstrap} -%if %{with sd_boot} +%if %{with upstream} %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-mute-console +%{_bindir}/systemd-pty-forward %endif %{_bindir}/systemd-vmspawn %{_bindir}/updatectl @@ -45,23 +44,17 @@ %{_datadir}/zsh/site-functions/_oomctl %endif %{_distconfdir}/ssh/ssh_config.d/20-systemd-ssh-proxy.conf -%if %{with upstream} -%if %{with sd_boot} -%{_libdir}/nvpcr/cryptsetup.nvpcr -%{_libdir}/nvpcr/hardware.nvpcr -%endif -%endif %if %{without bootstrap} %{_mandir}/man1/oomctl.1.gz %{_mandir}/man1/systemd-keyutil.1.gz %{_mandir}/man1/systemd-measure.1.gz %if %{with upstream} -%{_mandir}/man1/systemd-mute-console.1.gz -%{_mandir}/man1/systemd-mute-console.socket.1.gz -%{_mandir}/man1/[email protected] +%{_mandir}/man1/systemd-pty-forward.1.gz %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 @@ -73,15 +66,13 @@ %{_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] -%if %{with upstream} -%{_unitdir}/systemd-mute-console.socket -%{_unitdir}/[email protected] %endif %{_mandir}/man8/systemd-oomd.8.gz %{_mandir}/man8/systemd-oomd.service.8.gz @@ -97,15 +88,9 @@ %{_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 @@ -117,23 +102,27 @@ %{_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 +%endif %if %{without bootstrap} %{_systemd_util_dir}/oomd.conf %{_systemd_util_dir}/systemd-bsod -%endif +%if %{with upstream} %{_systemd_util_dir}/systemd-factory-reset -%if %{without bootstrap} +%endif %{_systemd_util_dir}/systemd-keyutil %{_systemd_util_dir}/systemd-measure %{_systemd_util_dir}/systemd-oomd @@ -141,75 +130,69 @@ %{_systemd_util_dir}/systemd-pcrextend %endif %{_systemd_util_dir}/systemd-sbsign -%endif +%if %{with upstream} %{_systemd_util_dir}/systemd-ssh-issue +%endif +%endif %{_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 -%{_systemd_util_dir}/systemd-validatefs -%if %{without bootstrap} +%if %{with upstream} %{_systemd_util_dir}/user/[email protected] -%endif %{_systemdgeneratordir}/systemd-factory-reset-generator +%endif +%endif # 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 -%endif +%if %{with upstream} %{_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 -%endif -%{_unitdir}/sockets.target.wants/systemd-factory-reset.socket %if %{with upstream} -%{_unitdir}/sockets.target.wants/systemd-mute-console.socket +%{_unitdir}/sockets.target.wants/systemd-factory-reset.socket %endif -%if %{without bootstrap} %if %{with sd_boot} %{_unitdir}/sockets.target.wants/systemd-pcrextend.socket %endif %{_unitdir}/storage-target-mode.target -%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 +%{_unitdir}/storage-target-mode.target.wants/systemd-pcrphase-storage-target-mode.service %endif +%if %{with sd_boot} +%{_unitdir}/sysinit.target.wants/systemd-pcrmachine.service %{_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 -%if %{with upstream} -%{_unitdir}/system-systemd\x2dmute\x2dconsole.slice -%endif %{_unitdir}/systemd-bsod.service -%endif +%if %{with upstream} %{_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} +%endif %{_unitdir}/systemd-oomd.service %{_unitdir}/systemd-oomd.socket %if %{with sd_boot} @@ -227,16 +210,14 @@ %{_unitdir}/[email protected] %{_unitdir}/systemd-pcrmachine.service %if %{with upstream} -%{_unitdir}/systemd-pcrnvdone.service -%endif %{_unitdir}/systemd-pcrphase-factory-reset.service +%endif %{_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 @@ -244,15 +225,21 @@ %{_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 -%endif +%if %{with upstream} %{_unitdir}/[email protected] -%if %{without bootstrap} -%{_unitdir}/[email protected] %endif +%{_unitdir}/[email protected] +%if %{with upstream} /usr/etc/profile.d/80-systemd-osc-context.sh +%endif +%endif ++++++ files.networkd ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:42.268695799 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.272695967 +0100 @@ -47,9 +47,8 @@ %{_tmpfilesdir}/systemd-network.conf %{_unitdir}/systemd-networkd-persistent-storage.service %if %{with upstream} -%{_unitdir}/systemd-networkd-resolve-hook.socket -%endif %{_unitdir}/systemd-networkd-varlink.socket +%endif %{_unitdir}/systemd-networkd-wait-online.service %{_unitdir}/[email protected] %{_unitdir}/systemd-networkd.service ++++++ files.resolved ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:42.308697476 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.312697644 +0100 @@ -6,7 +6,9 @@ %{_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 @@ -19,7 +21,9 @@ %{_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 @@ -30,6 +34,8 @@ %{_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 ++++++ files.systemd ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:42.336698651 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.340698819 +0100 @@ -2,6 +2,7 @@ # Please keep the list sorted (with `LC_ALL=C sort`). # + %dir %{_binfmtdir} %if %{without bootstrap} %dir %{_datadir}/bash-completion @@ -13,6 +14,8 @@ %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 @@ -44,14 +47,15 @@ %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} @@ -127,7 +131,6 @@ %{_bindir}/systemd-mount %{_bindir}/systemd-notify %{_bindir}/systemd-path -%{_bindir}/systemd-pty-forward %{_bindir}/systemd-run %{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge @@ -167,9 +170,8 @@ %{_datadir}/bash-completion/completions/systemd-sysext %{_datadir}/bash-completion/completions/systemd-vpick %{_datadir}/bash-completion/completions/timedatectl -%{_datadir}/bash-completion/completions/userdbctl %if %{with upstream} -%{_datadir}/bash-completion/completions/varlinkctl +%{_datadir}/bash-completion/completions/userdbctl %endif %endif # dbus introspection data for code generators: https://github.com/systemd/systemd/pull/20294 @@ -214,9 +216,8 @@ %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy -%{_datadir}/polkit-1/rules.d/10-systemd-logind-root-ignore-inhibitors.rules.example %if %{with upstream} -%{_datadir}/polkit-1/rules.d/empower.rules +%{_datadir}/polkit-1/rules.d/10-systemd-logind-root-ignore-inhibitors.rules.example %endif %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map @@ -228,7 +229,6 @@ %{_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,7 +281,6 @@ %{_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 @@ -294,10 +293,6 @@ %{_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 @@ -323,10 +318,6 @@ %{_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 @@ -392,7 +383,9 @@ %{_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 @@ -418,7 +411,9 @@ %{_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 @@ -428,7 +423,9 @@ %{_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 @@ -474,7 +471,10 @@ %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,6 +483,9 @@ %{_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 @@ -528,10 +531,14 @@ %{_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 @@ -567,10 +574,12 @@ %{_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 @@ -595,7 +604,7 @@ %{_unitdir}/[email protected] %{_unitdir}/graphical.target %{_unitdir}/halt.target -%if %{without bootstrap} +%if %{with upstream} %{_unitdir}/imports-pre.target %{_unitdir}/imports.target %endif @@ -608,8 +617,10 @@ %{_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 @@ -641,7 +652,9 @@ %{_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 @@ -649,7 +662,9 @@ %{_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 @@ -662,9 +677,6 @@ %{_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 @@ -679,6 +691,9 @@ %{_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} @@ -692,11 +707,15 @@ %{_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 @@ -720,15 +739,19 @@ %{_unitdir}/[email protected] %{_unitdir}/systemd-kexec.service %{_unitdir}/systemd-localed.service -%{_unitdir}/systemd-logind-varlink.socket %{_unitdir}/systemd-logind.service +%if %{with upstream} +%{_unitdir}/systemd-logind-varlink.socket %{_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] @@ -744,7 +767,9 @@ %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.CnlvTB/_old 2025-12-04 14:30:42.372700161 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.376700329 +0100 @@ -1,11 +1,61 @@ # # 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.CnlvTB/_old 2025-12-04 14:30:42.420702175 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.428702510 +0100 @@ -99,7 +99,9 @@ %{_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 @@ -141,8 +143,12 @@ %{_mandir}/man8/systemd-pstore.8.gz %{_mandir}/man8/systemd-pstore.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 @@ -162,7 +168,9 @@ %{_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 @@ -310,13 +318,12 @@ %{_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 @@ -340,9 +347,13 @@ %{_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 +%endif %{_udevrulesdir}/90-iocost.rules %{_udevrulesdir}/90-vconsole.rules %if %{without bootstrap} @@ -353,7 +364,9 @@ %{_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 @@ -367,7 +380,9 @@ %{_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 @@ -375,14 +390,11 @@ %{_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} @@ -439,10 +451,6 @@ %{_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 @@ -457,7 +465,9 @@ %{_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-vconsole-setup.service %{_unitdir}/systemd-volatile-root.service %{_unitdir}/tpm2.target ++++++ files.uefi-boot ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:42.456703685 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.460703853 +0100 @@ -15,7 +15,9 @@ %{_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. @@ -26,7 +28,9 @@ %{_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 ++++++ pam.systemd-user ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:42.556707879 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.564708215 +0100 @@ -16,7 +16,7 @@ # auth required pam_deny.so -account required pam_unix.so no_pass_expiry +account include common-account session required pam_selinux.so close session required pam_selinux.so nottys open ++++++ systemd-258.2+suse.5.ge103ce013e.tar.xz -> systemd-257.9+suse.23.gc139debf2c.tar.xz ++++++ /work/SRC/openSUSE:Factory/systemd/systemd-258.2+suse.5.ge103ce013e.tar.xz /work/SRC/openSUSE:Factory/.systemd.new.1939/systemd-257.9+suse.23.gc139debf2c.tar.xz differ: char 26, line 1 ++++++ systemd-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.CnlvTB/_old 2025-12-04 14:30:42.616710397 +0100 +++ /var/tmp/diff_new_pack.CnlvTB/_new 2025-12-04 14:30:42.620710564 +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-resolved\..*: E: shlib-policy-name-error .* libnss_resolve") +addFilter("systemd-network\..*: E: shlib-policy-name-error .* libnss_resolve")
