From ccc474fdb4007ac2788533b50ec26740d47e9a56 Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 27 May 2026 00:22:46 +0200 Subject: [PATCH] systemd: v260.2 -> v261 --- ...e-usr-share-zoneinfo-to-etc-zoneinfo.patch | 20 ++++++++--------- ...e-NSCD-when-DNSSEC-validation-is-dis.patch | 8 +++---- pkgs/os-specific/linux/systemd/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/0002-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0002-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index a9ec66f9dd3d..5d993d1493d7 100644 --- a/pkgs/os-specific/linux/systemd/0002-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0002-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -35,10 +35,10 @@ index 3a13e04a27..4fd58068a1 100644 Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 5dd00af952..b97a41f6ac 100644 +index eb74de32c2..6906462b36 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1443,7 +1443,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { +@@ -1456,7 +1456,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { assert(ret); @@ -47,7 +47,7 @@ index 5dd00af952..b97a41f6ac 100644 if (!f) return -errno; -@@ -1488,7 +1488,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { +@@ -1501,7 +1501,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { assert(ret); @@ -56,7 +56,7 @@ index 5dd00af952..b97a41f6ac 100644 if (!f) return -errno; -@@ -1603,7 +1603,7 @@ int verify_timezone(const char *name, int log_level) { +@@ -1616,7 +1616,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) return -ENAMETOOLONG; @@ -65,7 +65,7 @@ index 5dd00af952..b97a41f6ac 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) -@@ -1675,7 +1675,7 @@ int get_timezone(char **ret) { +@@ -1688,7 +1688,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* Return EINVAL if not a symlink */ @@ -75,10 +75,10 @@ index 5dd00af952..b97a41f6ac 100644 return -EINVAL; if (!timezone_is_valid(e, LOG_DEBUG)) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index ae1899593c..20d3071114 100644 +index e922abdd63..986a9e25d1 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -584,7 +584,7 @@ static int prompt_timezone(int rfd, sd_varlink **mute_console_link) { +@@ -601,7 +601,7 @@ static int prompt_timezone(int rfd, sd_varlink **mute_console_link) { static int process_timezone(int rfd, sd_varlink **mute_console_link) { _cleanup_close_ int pfd = -EBADF; @@ -87,7 +87,7 @@ index ae1899593c..20d3071114 100644 const char *e; int r; -@@ -630,12 +630,9 @@ static int process_timezone(int rfd, sd_varlink **mute_console_link) { +@@ -647,12 +647,9 @@ static int process_timezone(int rfd, sd_varlink **mute_console_link) { if (isempty(arg_timezone)) return 0; @@ -103,10 +103,10 @@ index ae1899593c..20d3071114 100644 return log_error_errno(r, "Failed to create /etc/localtime symlink: %m"); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 84e94e845a..8e1f1a6ea2 100644 +index 7f7ceac318..5f3faa7bf4 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1856,8 +1856,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid +@@ -1757,8 +1757,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, diff --git a/pkgs/os-specific/linux/systemd/0006-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0006-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch index bf6ebeebe59a..0724cd661fd5 100644 --- a/pkgs/os-specific/linux/systemd/0006-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch +++ b/pkgs/os-specific/linux/systemd/0006-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch @@ -13,13 +13,13 @@ directly. 1 file changed, 11 insertions(+) diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c -index 96d0dd5c2b..ee7cc4bd17 100644 +index 5e0d13023a..1bfe0b1e6f 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c -@@ -25,6 +25,11 @@ +@@ -22,6 +22,11 @@ + #include "timesyncd-bus.h" #include "timesyncd-conf.h" #include "timesyncd-manager.h" - #include "user-util.h" +#include "env-util.h" + +struct traced_file; @@ -28,7 +28,7 @@ index 96d0dd5c2b..ee7cc4bd17 100644 static int advance_tstamp(int fd, usec_t epoch) { assert(fd >= 0); -@@ -204,6 +209,12 @@ static int run(int argc, char *argv[]) { +@@ -169,6 +174,12 @@ static int run(int argc, char *argv[]) { if (r < 0) return log_error_errno(r, "Failed to parse fallback server strings: %m"); diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4d91ed2e72a5..c46ba6792a86 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -35,7 +35,6 @@ lz4, openssl, libgcrypt, - libgpg-error, libidn2, curl, zlib, @@ -106,6 +105,7 @@ withHostnamed ? true, withHwdb ? true, withImportd ? true, + withImds ? true, withKmod ? true, withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" @@ -142,6 +142,7 @@ withRemote ? true, withResolved ? true, withShellCompletions ? true, + withSysinstall ? true, withSysusers ? true, withSysupdate ? true, withTimedated ? true, @@ -190,7 +191,7 @@ assert withRepart -> withCryptsetup; assert withBootloader -> withEfi; let - wantCurl = withRemote || withImportd; + wantCurl = withRemote || withImportd || withImds; # Use the command below to update `releaseTimestamp` on every (major) version # change. More details in the commentary at mesonFlags. @@ -201,13 +202,13 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "260.2"; + version = "261"; src = fetchFromGitHub { owner = "systemd"; repo = "systemd"; - rev = "v${finalAttrs.version}"; - hash = "sha256-NXmmSV7/9WIW6C8wjdOwaerCy4v7Zcrd8+XDzcS8rEk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6IB1ZEQqQ0impwBhCaLZAEgMVkVFU61JDVlGotxNzGQ="; }; # PATCH POLICY @@ -308,11 +309,7 @@ stdenv.mkDerivation (finalAttrs: { jinja2 ] ++ lib.optional withEfi ps.pyelftools - # pefile is only required to trigger a check in meson to actually build - # ukify. This module should never appear in the runtime closure of ukify. - # Instead the pefile from buildInputs should be used. - # Remove this when it's fixed upstream: https://github.com/systemd/systemd/pull/41959 - ++ lib.optional withUkify ps.pefile + ++ lib.optional (withUkify && finalAttrs.finalPackage.doCheck) ps.pefile )) ] ++ lib.optionals withLibBPF [ @@ -331,7 +328,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withGcrypt [ libgcrypt - libgpg-error ] ++ lib.optionals withOpenSSL [ openssl ] ++ lib.optional withTests glib @@ -347,7 +343,7 @@ stdenv.mkDerivation (finalAttrs: { zstd ] ++ lib.optional withCoredump elfutils - ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) + ++ lib.optional withCryptsetup cryptsetup ++ lib.optional withKexectools kexec-tools ++ lib.optional withKmod kmod ++ lib.optional withLibidn2 libidn2 @@ -498,6 +494,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "apparmor" withApparmor) (lib.mesonEnable "gcrypt" withGcrypt) (lib.mesonEnable "importd" withImportd) + (lib.mesonEnable "imds" withImds) (lib.mesonEnable "homed" withHomed) (lib.mesonEnable "polkit" withPolkit) (lib.mesonEnable "elfutils" withCoredump) @@ -539,6 +536,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "coredump" withCoredump) (lib.mesonBool "firstboot" withFirstboot) (lib.mesonBool "resolve" withResolved) + (lib.mesonBool "sysinstall" withSysinstall) (lib.mesonBool "sysusers" withSysusers) (lib.mesonBool "efi" withEfi) (lib.mesonBool "utmp" withUtmp) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4368ded8af14..c3c268a911ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8319,6 +8319,7 @@ with pkgs; withHomed = false; withHwdb = false; withImportd = false; + withImds = false; withLibBPF = false; withLibidn2 = false; withLocaled = false; @@ -8335,6 +8336,7 @@ with pkgs; withRemote = false; withResolved = false; withShellCompletions = false; + withSysinstall = false; withSysupdate = false; withSysusers = false; withTimedated = false;