Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package waylock for openSUSE:Factory checked in at 2023-02-14 16:46:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/waylock (Old) and /work/SRC/openSUSE:Factory/.waylock.new.27156 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "waylock" Tue Feb 14 16:46:22 2023 rev:2 rq:1065647 version:0.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/waylock/waylock.changes 2023-02-04 14:50:00.489821710 +0100 +++ /work/SRC/openSUSE:Factory/.waylock.new.27156/waylock.changes 2023-02-14 16:47:07.339044868 +0100 @@ -1,0 +2,16 @@ +Tue Feb 7 04:16:23 UTC 2023 - Jan Engelhardt <jeng...@inai.de> + +- Ensure neutrality of descriptions. Trim boastful language + +------------------------------------------------------------------- +Tue Feb 7 04:11:55 UTC 2023 - Soc Virnyl Estela <socvirnyl.est...@gmail.com> + +- Update to version 0.6.2: + * ci: update Zig to 0.10.0 to fix build + * deps: update zig-wayland to fix aarch64 build + * Lock: ignore password submission before locked event + * auth: fix getting username on FreeBSD +- Remove 0000-ignore-password-submission-before-locked-event.patch as + it is already part of 0.6.2 + +------------------------------------------------------------------- Old: ---- 0000-ignore-password-submission-before-locked-event.patch waylock-0.6.1.tar.gz waylock-0.6.1.tar.gz.sig New: ---- waylock-0.6.2.tar.gz waylock-0.6.2.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ waylock.spec ++++++ --- /var/tmp/diff_new_pack.i9m7Gn/_old 2023-02-14 16:47:08.087049285 +0100 +++ /var/tmp/diff_new_pack.i9m7Gn/_new 2023-02-14 16:47:08.091049309 +0100 @@ -1,7 +1,7 @@ # # spec file for package waylock # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: waylock -Version: 0.6.1 +Version: 0.6.2 Release: 0 Summary: Small screenlocker for Wayland compositors License: ISC @@ -26,7 +26,6 @@ Source1: waylock.pamd Source2: https://isaacfreund.com/public_key.txt#/%{name}.keyring Source3: https://github.com/ifreund/waylock/releases/download/v%{version}/waylock-%{version}.tar.gz.sig -Patch0: 0000-ignore-password-submission-before-locked-event.patch BuildRequires: pkgconfig BuildRequires: scdoc >= 1.9.2 BuildRequires: zig @@ -39,9 +38,9 @@ ExclusiveArch: x86_64 aarch64 riscv64 %{mips64} %description -Small screenlocker for Wayland compositors implementing ext-session-lock-v1. -The ext-session-lock-v1 protocol is significantly more robust than previous client-side Wayland screen locking approaches. -Importantly, the screenlocker crashing does not cause the session to be unlocked. +Screenlocker for Wayland compositors implementing ext-session-lock-v1. +(The v1 protocol is robust in that a crashing locker does not +cause the session to be unlocked.) %prep %autosetup -n %{name}-%{version} -p1 ++++++ waylock-0.6.1.tar.gz -> waylock-0.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylock-0.6.1/.builds/alpine.yml new/waylock-0.6.2/.builds/alpine.yml --- old/waylock-0.6.1/.builds/alpine.yml 2023-01-08 20:16:22.000000000 +0100 +++ new/waylock-0.6.2/.builds/alpine.yml 2023-02-06 20:08:01.000000000 +0100 @@ -13,10 +13,10 @@ - https://github.com/ifreund/waylock tasks: - install_deps: | - wget -nv https://ziglang.org/download/0.9.1/zig-linux-x86_64-0.9.1.tar.xz - tar -xvf zig-linux-x86_64-0.9.1.tar.xz 1>/dev/null - sudo mv zig-linux-x86_64-0.9.1/zig /usr/bin/ - sudo mv zig-linux-x86_64-0.9.1/lib /usr/lib/zig + wget -nv https://ziglang.org/download/0.10.0/zig-linux-x86_64-0.10.0.tar.xz + tar -xvf zig-linux-x86_64-0.10.0.tar.xz 1>/dev/null + sudo mv zig-linux-x86_64-0.10.0/zig /usr/bin/ + sudo mv zig-linux-x86_64-0.10.0/lib /usr/lib/zig - build: | cd waylock zig build -Dman-pages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylock-0.6.1/.builds/archlinux.yml new/waylock-0.6.2/.builds/archlinux.yml --- old/waylock-0.6.1/.builds/archlinux.yml 2023-01-08 20:16:22.000000000 +0100 +++ new/waylock-0.6.2/.builds/archlinux.yml 2023-02-06 20:08:01.000000000 +0100 @@ -13,10 +13,10 @@ - https://github.com/ifreund/waylock tasks: - install_deps: | - wget -nv https://ziglang.org/download/0.9.1/zig-linux-x86_64-0.9.1.tar.xz - tar -xvf zig-linux-x86_64-0.9.1.tar.xz 1>/dev/null - sudo mv zig-linux-x86_64-0.9.1/zig /usr/bin/ - sudo mv zig-linux-x86_64-0.9.1/lib /usr/lib/zig + wget -nv https://ziglang.org/download/0.10.0/zig-linux-x86_64-0.10.0.tar.xz + tar -xvf zig-linux-x86_64-0.10.0.tar.xz 1>/dev/null + sudo mv zig-linux-x86_64-0.10.0/zig /usr/bin/ + sudo mv zig-linux-x86_64-0.10.0/lib /usr/lib/zig - build: | cd waylock zig build -Dman-pages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylock-0.6.1/.builds/freebsd.yml new/waylock-0.6.2/.builds/freebsd.yml --- old/waylock-0.6.1/.builds/freebsd.yml 2023-01-08 20:16:22.000000000 +0100 +++ new/waylock-0.6.2/.builds/freebsd.yml 2023-02-06 20:08:01.000000000 +0100 @@ -11,10 +11,10 @@ - https://gitlab.freedesktop.org/wlroots/wlroots tasks: - install_deps: | - wget -nv https://ziglang.org/download/0.9.1/zig-freebsd-x86_64-0.9.1.tar.xz - tar -xvf zig-freebsd-x86_64-0.9.1.tar.xz 1>/dev/null - sudo mv zig-freebsd-x86_64-0.9.1/zig /usr/bin/ - sudo mv zig-freebsd-x86_64-0.9.1/lib /usr/lib/zig + wget -nv https://ziglang.org/download/0.10.0/zig-freebsd-x86_64-0.10.0.tar.xz + tar -xvf zig-freebsd-x86_64-0.10.0.tar.xz 1>/dev/null + sudo mv zig-freebsd-x86_64-0.10.0/zig /usr/bin/ + sudo mv zig-freebsd-x86_64-0.10.0/lib /usr/lib/zig - build: | cd waylock zig build -Dman-pages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylock-0.6.1/build.zig new/waylock-0.6.2/build.zig --- old/waylock-0.6.1/build.zig 2023-01-08 20:16:22.000000000 +0100 +++ new/waylock-0.6.2/build.zig 2023-02-06 20:08:01.000000000 +0100 @@ -10,7 +10,7 @@ /// development with the "-dev" suffix. /// When a release is tagged, the "-dev" suffix should be removed for the commit that gets tagged. /// Directly after the tagged commit, the version should be bumped and the "-dev" suffix added. -const version = "0.6.1"; +const version = "0.6.2"; pub fn build(b: *zbs.Builder) !void { const target = b.standardTargetOptions(.{}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylock-0.6.1/deps/zig-wayland/src/common_core.zig new/waylock-0.6.2/deps/zig-wayland/src/common_core.zig --- old/waylock-0.6.1/deps/zig-wayland/src/common_core.zig 2023-01-08 20:16:22.000000000 +0100 +++ new/waylock-0.6.2/deps/zig-wayland/src/common_core.zig 2023-02-06 20:08:01.000000000 +0100 @@ -100,7 +100,8 @@ } } - @ptrCast(*const fn (*Obj, Payload, Data) void, implementation)( + const HandlerFn = fn (*Obj, Payload, Data) void; + @ptrCast(*const HandlerFn, @alignCast(@alignOf(HandlerFn), implementation))( @ptrCast(*Obj, object), @unionInit(Payload, payload_field.name, payload_data), @intToPtr(Data, @ptrToInt(object.getUserData())), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylock-0.6.1/src/Seat.zig new/waylock-0.6.2/src/Seat.zig --- old/waylock-0.6.1/src/Seat.zig 2023-01-08 20:16:22.000000000 +0100 +++ new/waylock-0.6.2/src/Seat.zig 2023-02-06 20:08:01.000000000 +0100 @@ -157,7 +157,14 @@ switch (@enumToInt(keysym)) { xkb.Keysym.Return => { - lock.submit_password(); + // Ignore the attempt to submit the password if the locked event has not yet + // been received. This should be pretty much impossible to happen in practice + // as the compositor should send the locked event in a matter of milliseconds. + // However if the compositor is behaving strangely it is better to ignore this + // than crash on an assertion failure or commit a protocol error. + if (lock.state == .locked) { + lock.submit_password(); + } return; }, xkb.Keysym.Escape => { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylock-0.6.1/src/auth.zig new/waylock-0.6.2/src/auth.zig --- old/waylock-0.6.1/src/auth.zig 2023-01-08 20:16:22.000000000 +0100 +++ new/waylock-0.6.2/src/auth.zig 2023-02-06 20:08:01.000000000 +0100 @@ -4,6 +4,11 @@ const mem = std.mem; const os = std.os; +const c = @cImport({ + @cInclude("unistd.h"); // getuid() + @cInclude("pwd.h"); // getpwuid() +}); + const pam = @import("pam.zig"); const PasswordBuffer = @import("PasswordBuffer.zig"); @@ -61,7 +66,7 @@ var pamh: *pam.Handle = undefined; { - const pw = getpwuid(os.linux.getuid()) orelse { + const pw = @as(?*c.struct_passwd, c.getpwuid(c.getuid())) orelse { log.err("failed to get name of current user", .{}); os.exit(1); }; @@ -171,19 +176,3 @@ return .success; } - -// TODO: upstream these to the zig standard library -pub const passwd = extern struct { - pw_name: [*:0]const u8, - pw_passwd: [*:0]const u8, - pw_uid: os.uid_t, - pw_gid: os.gid_t, - pw_change: os.time_t, - pw_class: [*:0]const u8, - pw_gecos: [*:0]const u8, - pw_dir: [*:0]const u8, - pw_shell: [*:0]const u8, - pw_expire: os.time_t, -}; - -pub extern fn getpwuid(uid: os.uid_t) ?*passwd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/waylock-0.6.1/src/pam.zig new/waylock-0.6.2/src/pam.zig --- old/waylock-0.6.1/src/pam.zig 2023-01-08 20:16:22.000000000 +0100 +++ new/waylock-0.6.2/src/pam.zig 2023-02-06 20:08:01.000000000 +0100 @@ -134,7 +134,6 @@ // Flags intended to be bitwise or'ed together pub const flags = struct { - /// Authentication service should not generate any messages pub const silent = 0x8000;
