systemd: 260 -> 260.1

2026-03-25 11:39:23 +01:00
parent 8de047d3fa
commit 13b2a08502
19 changed files with 30 additions and 30 deletions
@@ -13,7 +13,7 @@ unit.  (However, this ignores the fsck unit, so it's not perfect...)
 1 file changed, 4 deletions(-)

 diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
-index bebc4d7..60278a0 100644
+index bebc4d7d09..60278a0da7 100644
 --- a/rules.d/99-systemd.rules.in
 +++ b/rules.d/99-systemd.rules.in
@@ -30,10 +30,6 @@ SUBSYSTEM=="block", ACTION=="add", KERNEL=="dm-*", ENV{DM_NAME}!="?*", ENV{SYSTE
@@ -14,7 +14,7 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
 2 files changed, 6 insertions(+), 2 deletions(-)

 diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
-index 25e229b..b9af1c3 100644
+index 25e229bf3e..b9af1c3b13 100644
 --- a/src/shared/fstab-util.c
 +++ b/src/shared/fstab-util.c
@@ -76,6 +76,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
@@ -27,7 +27,7 @@ index 25e229b..b9af1c3 100644
                         "/etc"))
                 return true;
 diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
-index 7729a1d..744abee 100644
+index 7729a1d415..744abeee23 100644
 --- a/src/shutdown/umount.c
 +++ b/src/shutdown/umount.c
@@ -178,8 +178,10 @@ int mount_points_list_get(FILE *f, MountPoint **head) {
@@ -10,7 +10,7 @@ container, so checking early whether it exists will fail.
 1 file changed, 2 insertions(+)

 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 84e94e8..a0052c1 100644
+index 84e94e845a..a0052c1c88 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
@@ -6368,6 +6368,7 @@ static int run(int argc, char *argv[]) {
@@ -16,7 +16,7 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
 2 files changed, 7 insertions(+), 21 deletions(-)

 diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index 862d57d..8ba0ca4 100644
+index 862d57dcb6..8ba0ca4486 100644
 --- a/src/core/systemd.pc.in
 +++ b/src/core/systemd.pc.in
@@ -46,10 +46,10 @@ systemdsystemconfdir=${systemd_system_conf_dir}
@@ -46,7 +46,7 @@ index 862d57d..8ba0ca4 100644
 
 systemd_sleep_dir=${prefix}/lib/systemd/system-sleep
 diff --git a/src/libsystemd/sd-path/path-lookup.c b/src/libsystemd/sd-path/path-lookup.c
-index 32c14fb..7f0bf62 100644
+index 32c14fb14a..7f0bf62844 100644
 --- a/src/libsystemd/sd-path/path-lookup.c
 +++ b/src/libsystemd/sd-path/path-lookup.c
@@ -102,11 +102,7 @@ int runtime_directory(RuntimeScope scope, const char *fallback_suffix, char **re
@@ -13,7 +13,7 @@ in containers.
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/core/manager.c b/src/core/manager.c
-index 79fa19d..2115d74 100644
+index 79fa19d976..2115d74595 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
@@ -1579,7 +1579,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
@@ -11,7 +11,7 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change
 3 files changed, 25 insertions(+)

 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index 04c72e8..1f9f296 100644
+index 04c72e8137..1f9f296d56 100644
 --- a/src/hostname/hostnamed.c
 +++ b/src/hostname/hostnamed.c
@@ -1421,6 +1421,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
@@ -35,7 +35,7 @@ index 04c72e8..1f9f296 100644
 
         context_read_machine_info(c);
 diff --git a/src/locale/localed.c b/src/locale/localed.c
-index 041ba29..02fbe3e 100644
+index 041ba29cd8..02fbe3e278 100644
 --- a/src/locale/localed.c
 +++ b/src/locale/localed.c
@@ -221,6 +221,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
@@ -69,7 +69,7 @@ index 041ba29..02fbe3e 100644
 
         r = x11_context_verify_and_warn(&in, LOG_ERR, error);
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 43cf3fd..1455830 100644
+index 43cf3fddb9..1455830cba 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
@@ -680,6 +680,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
@@ -13,7 +13,7 @@ NixOS uses this path.
 5 files changed, 15 insertions(+), 18 deletions(-)

 diff --git a/man/localtime.xml b/man/localtime.xml
-index 3a13e04..4fd5806 100644
+index 3a13e04a27..4fd58068a1 100644
 --- a/man/localtime.xml
 +++ b/man/localtime.xml
@@ -20,7 +20,7 @@
@@ -35,7 +35,7 @@ index 3a13e04..4fd5806 100644
     <literal>Etc/UTC</literal>. The resulting link should lead to the
     corresponding binary
 diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index 5dd00af..e682337 100644
+index 5dd00af952..e682337ef0 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) {
@@ -75,10 +75,10 @@ index 5dd00af..e682337 100644
                 return -EINVAL;
         if (!timezone_is_valid(e, LOG_DEBUG))
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index 38e3ada..953ad05 100644
+index ae1899593c..20d3071114 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -576,7 +576,7 @@ static int prompt_timezone(int rfd, sd_varlink **mute_console_link) {
+@@ -584,7 +584,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 38e3ada..953ad05 100644
         const char *e;
         int r;
 
-@@ -622,12 +622,9 @@ static int process_timezone(int rfd, sd_varlink **mute_console_link) {
+@@ -630,12 +630,9 @@ static int process_timezone(int rfd, sd_varlink **mute_console_link) {
         if (isempty(arg_timezone))
                 return 0;
 
@@ -103,7 +103,7 @@ index 38e3ada..953ad05 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 a0052c1..39f2b1f 100644
+index a0052c1c88..39f2b1f1e5 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
@@ -118,7 +118,7 @@ index a0052c1..39f2b1f 100644
 
 static bool etc_writable(void) {
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 1455830..532fe36 100644
+index 1455830cba..532fe3684b 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
@@ -268,7 +268,7 @@ static int context_read_data(Context *c) {
@@ -10,7 +10,7 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index 6370300..50def81 100644
+index 63703007ad..50def81940 100644
 --- a/src/locale/localectl.c
 +++ b/src/locale/localectl.c
@@ -295,7 +295,7 @@ static const char* xkb_directory(void) {
@@ -12,7 +12,7 @@ files that I might have missed.
 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/src/basic/constants.h b/src/basic/constants.h
-index 3dbffde..d3c3a1b 100644
+index 3dbffdee26..d3c3a1b067 100644
 --- a/src/basic/constants.h
 +++ b/src/basic/constants.h
@@ -40,13 +40,15 @@
@@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
 1 file changed, 1 insertion(+)

 diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index fc6df23..cb8b45a 100644
+index fc6df238be..cb8b45a41b 100644
 --- a/src/shutdown/shutdown.c
 +++ b/src/shutdown/shutdown.c
@@ -330,6 +330,7 @@ static void notify_supervisor(void) {
@@ -9,7 +9,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
 1 file changed, 1 insertion(+)

 diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index 43aaede..a8e5a75 100644
+index 43aaede5b0..a8e5a75e39 100644
 --- a/src/sleep/sleep.c
 +++ b/src/sleep/sleep.c
@@ -248,6 +248,7 @@ static int execute(
@@ -10,7 +10,7 @@ systemd itself uses extensively.
 1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/src/basic/path-util.h b/src/basic/path-util.h
-index e2e80ae..9f85649 100644
+index e2e80ae91f..9f856490a3 100644
 --- a/src/basic/path-util.h
 +++ b/src/basic/path-util.h
@@ -9,11 +9,11 @@
@@ -16,7 +16,7 @@ executables that are being called from managers.
 1 file changed, 8 insertions(+)

 diff --git a/src/core/manager.c b/src/core/manager.c
-index 2115d74..86f6973 100644
+index 2115d74595..86f697313b 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
@@ -3999,9 +3999,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
@@ -17,7 +17,7 @@ See also: https://github.com/systemd/systemd/issues/24191
 1 file changed, 8 deletions(-)

 diff --git a/src/core/taint.c b/src/core/taint.c
-index 8872a22..bc736e2 100644
+index 8872a224b2..bc736e2ef8 100644
 --- a/src/core/taint.c
 +++ b/src/core/taint.c
@@ -42,14 +42,6 @@ char** taint_strv(void) {
@@ -27,7 +27,7 @@ filename_is_valid with path_is_valid.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
-index 9e05c84..c0dd773 100644
+index 9e05c847ed..c0dd773eee 100644
 --- a/src/shared/tpm2-util.c
 +++ b/src/shared/tpm2-util.c
@@ -918,7 +918,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
@@ -30,7 +30,7 @@ are written into `$XDG_CONFIG_HOME/systemd/user`.
 1 file changed, 3 insertions(+)

 diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
-index a281809..22c9c8f 100644
+index a28180922a..22c9c8fdbd 100644
 --- a/src/systemctl/systemctl-edit.c
 +++ b/src/systemctl/systemctl-edit.c
@@ -336,6 +336,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
@@ -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 ab29125..bd01897 100644
+index 3672005d75..406be24b45 100644
 --- a/meson.build
 +++ b/meson.build
@@ -210,13 +210,13 @@ sshconfdir = get_option('sshconfdir')
@@ -13,7 +13,7 @@ directly.
 1 file changed, 11 insertions(+)

 diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
-index 96d0dd5..ee7cc4b 100644
+index 96d0dd5c2b..ee7cc4bd17 100644
 --- a/src/timesync/timesyncd.c
 +++ b/src/timesync/timesyncd.c
@@ -25,6 +25,11 @@
@@ -206,13 +206,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  inherit pname;
-  version = "260";
+  version = "260.1";

  src = fetchFromGitHub {
    owner = "systemd";
    repo = "systemd";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-tg3sqC+wRAqkHNwcWGttfvQbgmHoj8zk/tH8bcrRM7c=";
+    hash = "sha256-FUKj3lvjz8TIsyu8NyJYtiNele+1BhdJPdw7r7nW6as=";
  };

  # On major changes, or when otherwise required, you *must* :