From d8e966caccba22c83200e6edadc8161f6c9ae8f8 Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 8 Aug 2025 01:22:21 +0900 Subject: [PATCH] systemd: 257.7 -> 257.8 https://github.com/systemd/systemd/compare/v257.7...v257.8 Signed-off-by: misilelab --- ....build-do-not-create-systemdstatedir.patch | 4 +- ...ail-when-the-same-file-is-updated-mu.patch | 57 ------------------- ...> 0018-meson-Don-t-link-ssh-dropins.patch} | 2 +- ...it_file_exists_full-follow-symlinks.patch} | 0 ...-NSCD-when-DNSSEC-validation-is-dis.patch} | 0 pkgs/os-specific/linux/systemd/default.nix | 14 ++--- 6 files changed, 8 insertions(+), 69 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch rename pkgs/os-specific/linux/systemd/{0019-meson-Don-t-link-ssh-dropins.patch => 0018-meson-Don-t-link-ssh-dropins.patch} (96%) rename pkgs/os-specific/linux/systemd/{0020-install-unit_file_exists_full-follow-symlinks.patch => 0019-install-unit_file_exists_full-follow-symlinks.patch} (100%) rename pkgs/os-specific/linux/systemd/{0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch => 0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch} (100%) diff --git a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch index 76b85b8db674..65cd257a8a41 100644 --- a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch +++ b/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) diff --git a/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch b/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch deleted file mode 100644 index 70c3f0ef5f26..000000000000 --- a/pkgs/os-specific/linux/systemd/0018-bootctl-do-not-fail-when-the-same-file-is-updated-mu.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -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; diff --git a/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch similarity index 96% rename from pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch rename to pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch index 55d8f989e842..da170d869ad7 100644 --- a/pkgs/os-specific/linux/systemd/0019-meson-Don-t-link-ssh-dropins.patch +++ b/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') diff --git a/pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch b/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0020-install-unit_file_exists_full-follow-symlinks.patch rename to pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch diff --git a/pkgs/os-specific/linux/systemd/0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0021-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch rename to pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d533b228f883..473787864315 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -195,7 +195,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. @@ -213,7 +213,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* : @@ -243,19 +243,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.isPower64) [ # Auto-detect ELF ABI instead of hardcoding ELFv2 for BPF build