Import commit 409c6ef1ea5cd4d11214648aabd34227aa058d79 (merge of v257.10)

aba474eeaa main: switch explicitly to tty1 on soft-reboot (bsc#1231986)
  a437bf2499 terminal-util: modernize vtnr_from_tty() a bit
  2dbe9f5809 units: don't force the loading of the loop and dm_mod modules in systemd-repart.service (bsc#1248356)

5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch

@@ -1,8 +1,8 @@
-From f847d3d3b73c22c674bb713f179522cef8ddabb7 Mon Sep 17 00:00:00 2001
+From 6b03bc81cccec72f6e6ee31e8b08816713c42dac Mon Sep 17 00:00:00 2001
 From: Franck Bui <fbui@suse.com>
 Date: Fri, 12 Jan 2024 10:54:57 +0100
-Subject: [PATCH 5001/5002] Revert "udev: update devlink with the newer device
- node even when priority is equivalent"
+Subject: [PATCH] Revert "udev: update devlink with the newer device node
+ even when priority is equivalent"
 
 This reverts commit 277cb24ffb7a520f640eb36d11340f11bf0c7c4f.
 ---
@@ -10,27 +10,27 @@ This reverts commit 277cb24ffb7a520f640eb36d11340f11bf0c7c4f.
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
-index 673f723ff2..6e2fff72e9 100644
+index 412775b38b..94149d7115 100644
 --- a/src/udev/udev-node.c
 +++ b/src/udev/udev-node.c
-@@ -457,13 +457,13 @@ static int link_update(sd_device *dev, const char *slink, bool add) {
-                                 /* The devlink priority is downgraded. Another device may have a higher
-                                  * priority now. Let's find the device node with the highest priority. */
-                         } else {
--                                if (current_prio > prio)
--                                        /* The devlink with a higher priority already exists and is owned by
--                                         * another device. Hence, it is not necessary to recreate it. */
-+                                if (current_prio >= prio)
-+                                        /* The devlink with equal or higher priority already exists and is
-+                                         * owned by another device. Hence, it is not necessary to recreate it. */
-                                         return 0;
+@@ -538,13 +538,13 @@ static int link_update(sd_device *dev, const char *slink, bool add) {
+                 return link_search_and_update(dev, slink, dirfd, add);
+         }
  
--                                /* This device has the equal or a higher priority than the current. Let's
--                                 * create the devlink to our device node. */
-+                                /* This device has a higher priority than the current. Let's create the
-+                                 * devlink to our device node. */
-                                 return node_create_symlink(dev, /* devnode = */ NULL, slink);
-                         }
+-        if (current_prio > prio)
+-                /* The devlink with a higher priority already exists and is owned by another device. Hence,
+-                 * it is not necessary to recreate it. */
++        if (current_prio >= prio)
++                /* The devlink with equal or higher priority already exists and is owned by another
++                 * device. Hence, it is not necessary to recreate it. */
+                 return 0;
+ 
+-        /* This device has the equal or a higher priority than the current. Let's create the devlink to our
+-         * device node. */
++        /* This device has a higher priority than the current. Let's create the devlink to our device
++         * node. */
+         return node_create_symlink(dev, /* devnode = */ NULL, slink);
+ }
  
 -- 
 2.43.0

files.devel-doc

@@ -122,6 +122,7 @@
 %{_mandir}/man3/sd-journal.3.gz
 %{_mandir}/man3/sd-json.3.gz
 %{_mandir}/man3/sd-login.3.gz
+%{_mandir}/man3/sd-path.3.gz
 %{_mandir}/man3/sd-varlink.3.gz
 %{_mandir}/man3/sd_booted.3.gz
 %{_mandir}/man3/sd_bus_add_fallback.3.gz

files.experimental

@@ -87,8 +87,8 @@
 %{_pam_vendordir}/systemd-run0
 %if %{with sd_boot}
 %{_prefix}/lib/kernel/install.d/60-ukify.install
-%endif
 %{_prefix}/lib/kernel/uki.conf
+%endif
 %{_prefix}/lib/pcrlock.d/350-action-efi-application.pcrlock
 %{_prefix}/lib/pcrlock.d/400-secureboot-separator.pcrlock.d/300-0x00000000.pcrlock
 %{_prefix}/lib/pcrlock.d/400-secureboot-separator.pcrlock.d/600-0xffffffff.pcrlock

files.udev

@@ -267,6 +267,7 @@
 %{_udevhwdbdir}/70-cameras.hwdb
 %{_udevhwdbdir}/70-hardware-wallets.hwdb
 %{_udevhwdbdir}/70-joystick.hwdb
+%{_udevhwdbdir}/70-maker-tools.hwdb
 %{_udevhwdbdir}/70-mouse.hwdb
 %{_udevhwdbdir}/70-pda.hwdb
 %{_udevhwdbdir}/70-pointingstick.hwdb

systemd-rpmlintrc

@@ -16,4 +16,4 @@ addFilter("libudev.*-mini\..*: E: shlib-policy-name-error SONAME: libudev.*")
 
 # 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.changes

@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Wed Nov 19 15:58:39 UTC 2025 - Franck Bui <fbui@suse.com>
+
+- Import commit 409c6ef1ea5cd4d11214648aabd34227aa058d79 (merge of v257.10)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/aba474eeaac455ebe22b643ecdd856e5583094a1...409c6ef1ea5cd4d11214648aabd34227aa058d79
+
+-------------------------------------------------------------------
+Wed Nov 19 14:03:26 UTC 2025 - Franck Bui <fbui@suse.com>
+
+- Import commit aba474eeaac455ebe22b643ecdd856e5583094a1
+
+  aba474eeaa main: switch explicitly to tty1 on soft-reboot (bsc#1231986)
+  a437bf2499 terminal-util: modernize vtnr_from_tty() a bit
+  2dbe9f5809 units: don't force the loading of the loop and dm_mod modules in systemd-repart.service (bsc#1248356)
+
+-------------------------------------------------------------------
+Wed Sep 17 15:20:51 UTC 2025 - Valentin Lefebvre <valentin.lefebvre@suse.com>
+
+- systemd.spec: use %sysusers_generate_pre so that some systemd users are
+  already available in %pre. This is important because D-Bus automatically
+  reloads its configuration whenever new configuration files are installed,
+  i.e. between %pre and %post. (bsc#1248501)
+  
+  No needs for systemd and udev packages as they are always installed during
+  the initial installation.
+
+-------------------------------------------------------------------
+Wed Sep 17 14:53:39 UTC 2025 - Franck Bui <fbui@suse.com>
+
+- Import commit c139debf2c6e9556df8ee6eca77ae18d5b98f027 (merge of v257.9)
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/835af70f4e4fab4746319145d9fdb1a01e33f4c8...c139debf2c6e9556df8ee6eca77ae18d5b98f027
+
+- Rebase 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch
+ 
+-------------------------------------------------------------------
+Wed Sep 17 14:42:17 UTC 2025 - Franck Bui <fbui@suse.com>
+
+- Import commit 835af70f4e4fab4746319145d9fdb1a01e33f4c8
+
+  835af70f4e core/cgroup: Properly handle aborting a pending freeze operation
+  1f96f9da13 detect-virt: add bare-metal support for GCE (bsc#1244449)
+  c3bcfc9558 uki.conf is used by the ukify tool to create an Unified Kernel Image[...]
+
+-------------------------------------------------------------------
+Wed Sep 17 14:25:51 UTC 2025 - Franck Bui <fbui@suse.com>
+
+- Make sure that the ordering trick used to update the udev package as close as
+  as possible to the update of the systemd package also works with zypper.
+
+  We also need to add "Suggests: udev", which serves the same purpose as
+  "OrderWithRequires: udev" but is part of the repository metadata. It should
+  therefore hint zypper to install systemd and udev as close together as
+  possible (see bsc#1228659)
+
 -------------------------------------------------------------------
 Thu Jul 31 14:32:25 UTC 2025 - Franck Bui <fbui@suse.com>
 
@@ -237,6 +294,11 @@ Thu Dec 26 10:07:33 UTC 2024 - Franck Bui <fbui@suse.com>
   for details. For running the testsuite, the systemd git repository has to be
   cloned for now. We'll try to adapt the testsuite sub-package these changes.
 
+-------------------------------------------------------------------
+Tue Dec 24 08:43:42 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Fix systemd-network recommending libidn2-devel (boo#1234765)
+
 -------------------------------------------------------------------
 Sun Dec 22 17:31:07 UTC 2024 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -26,9 +26,9 @@
 %define systemd_release    %{?release_override}%{!?release_override:0}
 %define archive_version    %{nil}
 %else
-%define systemd_version    257.7
+%define systemd_version    257.10
 %define systemd_release    0
-%define archive_version    +suse.19.ga0dfd5de4c
+%define archive_version    +suse.27.g409c6ef1ea
 %endif
 
 %define systemd_major      257
@@ -123,6 +123,7 @@ BuildRequires:  meson >= 0.53.2
 BuildRequires:  pam-devel
 BuildRequires:  python3-Jinja2
 BuildRequires:  systemd-rpm-macros
+BuildRequires:  sysuser-tools
 BuildRequires:  pkgconfig(blkid) >= 2.26
 # The following packages are only required by the execution of the unit tests
 # during the 'check' section.
@@ -156,14 +157,18 @@ Requires(post): coreutils
 Requires(post): findutils
 Requires(post): systemd-presets-branding
 Requires(post): pam-config >= 0.79-5
-# See bsc#1228659
-OrderWithRequires(post): udev
-OrderWithRequires(post): systemd-boot
 # These weak dependencies because some features are optional and enabled at
 # runtime with the presence of the relevant libs.
 Recommends:     libpcre2-8-0
 Recommends:     libbpf1
 %endif
+# These 2 following dependencies (the first one needed by rpm, the second one by
+# zypper) ensure that udev and systemd are updated as close together as possible
+# in order to reduce the window during which libsystemd-shared.so has been
+# updated but udev has not and still relies on the old version of the shared lib
+# (see bsc#1228659).
+OrderWithRequires(post): udev
+Suggests:       udev
 Provides:       group(systemd-journal)
 Conflicts:      filesystem < 11.5
 Provides:       sbin_init
@@ -338,7 +343,7 @@ Requires:       filesystem
 %if %{without bootstrap}
 # kmod executable is needed by kmod-static-nodes.service
 Requires:       kmod
-# By v256 libkmod will be dlopen()ed.
+# From v256 libkmod will be dlopen()ed.
 Requires:       libkmod2
 %endif
 Requires:       system-group-hardware
@@ -486,12 +491,14 @@ Summary:        Systemd Network Manager
 License:        LGPL-2.1-or-later
 Requires:       %{name} = %{version}-%{release}
 %systemd_requires
+%sysusers_requires
 Obsoletes:      systemd-network < %{version}-%{release}
 Provides:       systemd-network = %{version}-%{release}
 Provides:       systemd-network:/usr/lib/systemd/systemd-networkd
-# Workaround for bsc#1241513: ensure systemd-resolved is always installed before
-# systemd-network when the latter is replaced by both systemd-resolved and
-# systemd-networkd. The systemd-update-helper script logic depends on that.
+# Workaround for bsc#1241513 and libzypp: ensure systemd-resolved is always
+# installed before systemd-network is being removed when the latter is replaced
+# by both systemd-resolved and systemd-networkd. The systemd-update-helper
+# script logic depends on it.
 Suggests:       systemd-resolved
 
 %description networkd
@@ -509,8 +516,9 @@ Summary:        Systemd Network Name Resolution Manager
 License:        LGPL-2.1-or-later
 Requires:       %{name} = %{version}-%{release}
 %systemd_requires
+%sysusers_requires
 # This Recommends because some symbols of libidn2 are dlopen()ed by resolved
-Recommends:     pkgconfig(libidn2)
+Recommends:     libidn2
 BuildRequires:  pkgconfig(libidn2)
 BuildRequires:  pkgconfig(openssl)
 Obsoletes:      nss-resolve < %{version}-%{release}
@@ -1097,6 +1105,14 @@ rm -f %{buildroot}%{_unitdir}/systemd-nspawn@.service
 rm -f %{buildroot}%{_systemd_util_dir}/systemd-ssh-proxy
 %endif
 
+# Generate system users for pre scriptlets.
+%if %{with resolved}
+%sysusers_generate_pre %{buildroot}/%{_sysusersdir}/systemd-resolve.conf systemd-resolve systemd-resolve.conf
+%endif
+%if %{with networkd}
+%sysusers_generate_pre %{buildroot}/%{_sysusersdir}/systemd-network.conf systemd-network systemd-network.conf
+%endif
+
 # Don't drop the following 'pre' section even if it becomes empty: the build
 # process of installation images uses a hardcoded list of packages with a 'pre'
 # section that needs to be run during the build and complains if it can't find
@@ -1275,13 +1291,12 @@ fi
 %endif
 
 %if %{with networkd}
-%pre networkd
+%pre networkd -f systemd-network.pre
 %systemd_pre systemd-networkd.service
 %systemd_pre systemd-networkd-wait-online.service
 
 %post networkd
 %if %{without filetriggers}
-%sysusers_create systemd-network.conf
 %tmpfiles_create systemd-network.conf
 %endif
 %systemd_post systemd-networkd.service
@@ -1297,13 +1312,12 @@ fi
 %endif
 
 %if %{with resolved}
-%pre resolved
+%pre resolved -f systemd-resolve.pre
 %systemd_pre systemd-resolved.service
 
 %post resolved
 %ldconfig
 %if %{without filetriggers}
-%sysusers_create systemd-resolve.conf
 %tmpfiles_create systemd-resolve.conf
 %endif
 %systemd_post systemd-resolved.service