[Backport staging-25.05] systemd: 257.7 -> 257.8 (#433546)

pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] meson.build: do not create systemdstatedir
  1 file changed, 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 7ede6f7a96..90860be99a 100644
+index a4730f0570..b5aaecd669 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2795,7 +2795,6 @@ install_data('LICENSE.GPL2',
+@@ -2815,7 +2815,6 @@ install_data('LICENSE.GPL2',
  install_subdir('LICENSES',
                 install_dir : docdir)
  

pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch

@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Wed, 19 Jun 2024 16:11:23 +0900
-Subject: [PATCH] bootctl: do not fail when the same file is updated multiple
- times
-
-In the second or later trial, copy_file_with_version_check() -> version_check()
-fails with -ESRCH. Let's ignore the failure.
-
-This also adds missing assertions in update_efi_boot_binaries(), and
-drop redundant version check in update_efi_boot_binaries(), as version
-will be anyway checked later.
-
-Fixes a regression caused by 929f41c6528fb630753d4e2f588a8eb6c2f6a609.
-Fixes #33392.
----
- src/bootctl/bootctl-install.c | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c
-index e15c2c6bed..5b4cff5d5e 100644
---- a/src/bootctl/bootctl-install.c
-+++ b/src/bootctl/bootctl-install.c
-@@ -329,6 +329,9 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat
-         _cleanup_free_ char *p = NULL;
-         int r, ret = 0;
- 
-+        assert(esp_path);
-+        assert(source_path);
-+
-         r = chase_and_opendir("/EFI/BOOT", esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, &p, &d);
-         if (r == -ENOENT)
-                 return 0;
-@@ -354,19 +357,14 @@ static int update_efi_boot_binaries(const char *esp_path, const char *source_pat
-                 if (r == 0)
-                         continue;
- 
--                r = get_file_version(fd, &v);
--                if (r == -ESRCH)
--                        continue;  /* No version information */
--                if (r < 0)
--                        return r;
--                if (!startswith(v, "systemd-boot "))
--                        continue;
--
-                 _cleanup_free_ char *dest_path = path_join(p, de->d_name);
-                 if (!dest_path)
-                         return log_oom();
- 
--                RET_GATHER(ret, copy_file_with_version_check(source_path, dest_path, /* force = */ false));
-+                r = copy_file_with_version_check(source_path, dest_path, /* force = */ false);
-+                if (IN_SET(r, -ESTALE, -ESRCH))
-+                        continue;
-+                RET_GATHER(ret, r);
-         }
- 
-         return ret;

pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] meson: Don't link ssh dropins
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 90860be99a..f021f76031 100644
+index b5aaecd669..91b23f2d72 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -207,13 +207,13 @@ sshconfdir = get_option('sshconfdir')

pkgs/os-specific/linux/systemd/default.nix

@@ -197,7 +197,7 @@ assert withBootloader -> withEfi;
 let
   wantCurl = withRemote || withImportd;
 
-  version = "257.7";
+  version = "257.8";
 
   # Use the command below to update `releaseTimestamp` on every (major) version
   # change. More details in the commentary at mesonFlags.
@@ -215,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "systemd";
     repo = "systemd";
     rev = "v${version}";
-    hash = "sha256-9OnjeMrfV5DSAoX/aetI4r/QLPYITUd2aOY0DYfkTzQ=";
+    hash = "sha256-XQ+IyRar74qQij96CKClHXW0kkPnGeKUgA8ULiWh5YY=";
   };
 
   # On major changes, or when otherwise required, you *must* :
@@ -245,19 +245,15 @@ stdenv.mkDerivation (finalAttrs: {
     ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
     ./0017-meson.build-do-not-create-systemdstatedir.patch
 
-    # https://github.com/systemd/systemd/issues/33392
-    # https://github.com/systemd/systemd/pull/33400
-    ./0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch
-
     # systemd tries to link the systemd-ssh-proxy ssh config snippet with tmpfiles
     # if the install prefix is not /usr, but that does not work for us
     # because we include the config snippet manually
-    ./0019-meson-Don-t-link-ssh-dropins.patch
+    ./0018-meson-Don-t-link-ssh-dropins.patch
 
-    ./0020-install-unit_file_exists_full-follow-symlinks.patch
+    ./0019-install-unit_file_exists_full-follow-symlinks.patch
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
-    ./0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+    ./0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
   ]
   ++ lib.optionals stdenv.hostPlatform.isMusl (
     let