From 42393f46d149bc748f76e4e5c1c6768dc900894b Mon Sep 17 00:00:00 2001 From: AnErrupTion Date: Fri, 30 May 2025 19:14:25 +0200 Subject: [PATCH 1/4] Only support Ly v1.1.x in bug reports Signed-off-by: AnErrupTion --- .github/ISSUE_TEMPLATE/bug.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 3314a84..d9762ef 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -15,7 +15,7 @@ body: id: version attributes: label: Ly version - description: The output of `ly --version`. Please note that only Ly v1.0.0 and above are supported. + description: The output of `ly --version`. Please note that only Ly v1.1.0 and above are supported. placeholder: 1.1.0-dev.12+2b0301c validations: required: true From d12850889cbb1e39faed6ac8296ca89151ce28c4 Mon Sep 17 00:00:00 2001 From: AnErrupTion Date: Sat, 31 May 2025 10:39:03 +0200 Subject: [PATCH 2/4] Start v1.1.1 development cycle Signed-off-by: AnErrupTion --- build.zig | 2 +- build.zig.zon | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index 36635d8..194fff5 100644 --- a/build.zig +++ b/build.zig @@ -21,7 +21,7 @@ comptime { } } -const ly_version = std.SemanticVersion{ .major = 1, .minor = 1, .patch = 0 }; +const ly_version = std.SemanticVersion{ .major = 1, .minor = 1, .patch = 1 }; var dest_directory: []const u8 = undefined; var config_directory: []const u8 = undefined; diff --git a/build.zig.zon b/build.zig.zon index 48c58f3..8e66a31 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,6 +1,6 @@ .{ .name = .ly, - .version = "1.1.0", + .version = "1.1.1", .fingerprint = 0xa148ffcc5dc2cb59, .minimum_zig_version = "0.14.0", .dependencies = .{ From f983c6b19b15477acaa66de878b0e260094e6c44 Mon Sep 17 00:00:00 2001 From: AnErrupTion Date: Sat, 31 May 2025 10:39:15 +0200 Subject: [PATCH 3/4] Backport: Fix big clock UB in ReleaseSafe Signed-off-by: AnErrupTion --- src/bigclock.zig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/bigclock.zig b/src/bigclock.zig index d63f0fd..4fae3a4 100644 --- a/src/bigclock.zig +++ b/src/bigclock.zig @@ -34,24 +34,24 @@ pub fn alphaBlit(x: usize, y: usize, tb_width: usize, tb_height: usize, cells: [ } } -fn toBigNumber(char: u8, bigclock: Bigclock) []const u21 { +fn toBigNumber(char: u8, bigclock: Bigclock) [SIZE]u21 { const locale_chars = switch (bigclock) { .fa => fa.locale_chars, .en => en.locale_chars, .none => unreachable, }; return switch (char) { - '0' => &locale_chars.ZERO, - '1' => &locale_chars.ONE, - '2' => &locale_chars.TWO, - '3' => &locale_chars.THREE, - '4' => &locale_chars.FOUR, - '5' => &locale_chars.FIVE, - '6' => &locale_chars.SIX, - '7' => &locale_chars.SEVEN, - '8' => &locale_chars.EIGHT, - '9' => &locale_chars.NINE, - ':' => &locale_chars.S, - else => &locale_chars.E, + '0' => locale_chars.ZERO, + '1' => locale_chars.ONE, + '2' => locale_chars.TWO, + '3' => locale_chars.THREE, + '4' => locale_chars.FOUR, + '5' => locale_chars.FIVE, + '6' => locale_chars.SIX, + '7' => locale_chars.SEVEN, + '8' => locale_chars.EIGHT, + '9' => locale_chars.NINE, + ':' => locale_chars.S, + else => locale_chars.E, }; } From 170e5238239d71fd8ee9e00e572e991f0b1f3ebb Mon Sep 17 00:00:00 2001 From: AnErrupTion Date: Sun, 6 Jul 2025 09:31:56 +0200 Subject: [PATCH 4/4] Backport: Fix XDG_RUNTIME_DIR not being set properly Signed-off-by: AnErrupTion --- src/auth.zig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/auth.zig b/src/auth.zig index 35eee5e..721516f 100644 --- a/src/auth.zig +++ b/src/auth.zig @@ -96,7 +96,7 @@ pub fn authenticate(options: AuthOptions, current_environment: Environment, logi child_pid = try std.posix.fork(); if (child_pid == 0) { - startSession(options, pwd, handle, current_environment) catch |e| { + startSession(options, tty_str, pwd, handle, current_environment) catch |e| { shared_err.writeError(e); std.process.exit(1); }; @@ -132,6 +132,7 @@ pub fn authenticate(options: AuthOptions, current_environment: Environment, logi fn startSession( options: AuthOptions, + tty_str: [:0]u8, pwd: *interop.pwd.passwd, handle: ?*interop.pam.pam_handle, current_environment: Environment, @@ -155,6 +156,10 @@ fn startSession( // Set up the environment try initEnv(pwd, options.path); + // Reset the XDG environment variables + setXdgSessionEnv(current_environment.display_server); + try setXdgEnv(tty_str, current_environment.xdg_session_desktop, current_environment.xdg_desktop_names); + // Set the PAM variables const pam_env_vars: ?[*:null]?[*:0]u8 = interop.pam.pam_getenvlist(handle); if (pam_env_vars == null) return error.GetEnvListFailed;