Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hyprlock for openSUSE:Factory checked in at 2026-11-18 18:30:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hyprlock (Old) and /work/SRC/openSUSE:Factory/.hyprlock.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hyprlock" Wed Nov 18 18:30:27 2026 rev:5 rq:1398265 version:0.9.7 Changes: -------- --- /work/SRC/openSUSE:Factory/hyprlock/hyprlock.changes 2026-08-01 18:34:34.902677086 +0200 +++ /work/SRC/openSUSE:Factory/.hyprlock.new.1251/hyprlock.changes 2026-11-18 18:31:06.613723096 +0100 @@ -1,0 +2,9 @@ +Tue Nov 10 21:12:28 UTC 2026 - Avindra Goolcharan <[email protected]> + +- Update to version 0.9.7: + * pam: fix deadlock on terminate + * auth: validate fingerprint D-Bus signal senders + * feat: general:disable_screencopy option + * core: keep the failure display until the next key press + +------------------------------------------------------------------- Old: ---- hyprlock-0.9.6.obscpio New: ---- hyprlock-0.9.7.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyprlock.spec ++++++ --- /var/tmp/diff_new_pack.bRVTjt/_old 2026-11-18 18:31:07.899777580 +0100 +++ /var/tmp/diff_new_pack.bRVTjt/_new 2026-11-18 18:31:07.904777792 +0100 @@ -25,7 +25,7 @@ %endif Name: hyprlock -Version: 0.9.6 +Version: 0.9.7 Release: 0 Summary: Hyprland's screen locking utility License: BSD-3-Clause ++++++ hyprlock-0.9.6.obscpio -> hyprlock-0.9.7.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hyprlock-0.9.6/VERSION new/hyprlock-0.9.7/VERSION --- old/hyprlock-0.9.6/VERSION 2026-07-18 17:55:27.000000000 +0200 +++ new/hyprlock-0.9.7/VERSION 2026-11-01 19:12:21.000000000 +0100 @@ -1 +1 @@ -0.9.6 +0.9.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hyprlock-0.9.6/flake.lock new/hyprlock-0.9.7/flake.lock --- old/hyprlock-0.9.6/flake.lock 2026-07-18 17:55:27.000000000 +0200 +++ new/hyprlock-0.9.7/flake.lock 2026-11-01 19:12:21.000000000 +0100 @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1772461523, - "narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", + "lastModified": 1786464367, + "narHash": "sha256-k58p4wbzIXWyRWrW84pP8tD+iaZSSYiiM+fr0Auk4oU=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", + "rev": "7c895c44e3ca6d28ed68ddd80ec02b02b925e7fc", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1772459629, - "narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", + "lastModified": 1786464129, + "narHash": "sha256-339AkTlpMYSIvFuG0rnR+8Yg4/AZKeJalshJavlnKfg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7615ee388de18239a4ab1400946f3d0e498a8186", + "rev": "9508458be316a0d70d37ebed1ab725ccd10411ff", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1772459870, - "narHash": "sha256-xxkK2Cvqxpf/4UGcJ/TyCwrvmiNWsKsJfFzHMp2bxis=", + "lastModified": 1786464080, + "narHash": "sha256-W1hxvumEM57yV+QwsZ4QdAHEqOkr7e4S8VAkLX60qDE=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e63f3a79334dec49f8eb1691f66f18115df04085", + "rev": "c157fe1e3092b980cc69315a6631f89aff09dcce", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1772459835, - "narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", + "lastModified": 1786464033, + "narHash": "sha256-QM8Qe4/L8lpdVN4bgwahmi+jyyc4fisseDMe4afcDxA=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0a692d4a645165eebd65f109146b8861e3a925e7", + "rev": "62e62c1ca23da17612c6890d4ad2064f575643db", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772433332, - "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", + "lastModified": 1786247143, + "narHash": "sha256-8S3Kcxs7D4UtxJxSJZz0m14CGhuW0MxfrIwJxeGWGnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "rev": "279b4a8275f032c566576b3f181fa0f27197f588", "type": "github" }, "original": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hyprlock-0.9.6/nix/overlays.nix new/hyprlock-0.9.7/nix/overlays.nix --- old/hyprlock-0.9.6/nix/overlays.nix 2026-07-18 17:55:27.000000000 +0200 +++ new/hyprlock-0.9.7/nix/overlays.nix 2026-11-01 19:12:21.000000000 +0100 @@ -27,7 +27,7 @@ hyprlock = final: prev: { hyprlock = prev.callPackage ./default.nix { - stdenv = prev.gcc15Stdenv; + stdenv = prev.gcc16Stdenv; version = version + "+date=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hyprlock-0.9.6/src/auth/Fingerprint.cpp new/hyprlock-0.9.7/src/auth/Fingerprint.cpp --- old/hyprlock-0.9.6/src/auth/Fingerprint.cpp 2026-07-18 17:55:27.000000000 +0200 +++ new/hyprlock-0.9.7/src/auth/Fingerprint.cpp 2026-11-01 19:12:21.000000000 +0100 @@ -13,8 +13,34 @@ static const auto FPRINT = sdbus::ServiceName{"net.reactivated.Fprint"}; static const auto DEVICE = sdbus::ServiceName{"net.reactivated.Fprint.Device"}; static const auto MANAGER = sdbus::ServiceName{"net.reactivated.Fprint.Manager"}; +static const auto LOGIN_SERVICE = sdbus::ServiceName{"org.freedesktop.login1"}; static const auto LOGIN_MANAGER = sdbus::ServiceName{"org.freedesktop.login1.Manager"}; +static bool isSignalFromService(const sdbus::ServiceName& service) { + // Unicast signals bypass bus-side match rules; the proxy's well-known sender match is not authentication. + try { + const auto message = g_dbus->m_connection->getCurrentlyProcessedMessage(); + const auto sender = message.getSender(); + if (!sender || !*sender) { + Log::logger->log(Log::WARN, "fprint: ignoring signal with no sender"); + return false; + } + + auto proxy = sdbus::createProxy(*g_dbus->m_connection, sdbus::ServiceName{"org.freedesktop.DBus"}, sdbus::ObjectPath{"/org/freedesktop/DBus"}); + std::string owner; + proxy->callMethod("GetNameOwner").onInterface("org.freedesktop.DBus").withArguments(service).storeResultsTo(owner); + if (owner != sender) { + Log::logger->log(Log::WARN, "fprint: ignoring signal from sender {} which does not own {}", sender, service.c_str()); + return false; + } + + return true; + } catch (const sdbus::Error& e) { + Log::logger->log(Log::WARN, "fprint: ignoring signal, could not resolve owner of {} ({})", service.c_str(), e.what()); + return false; + } +} + enum MatchResult { MATCH_INVALID = 0, MATCH_NO_MATCH, @@ -69,6 +95,8 @@ }); g_dbus->m_freedesktopLogin1->uponSignal("PrepareForSleep").onInterface(LOGIN_MANAGER).call([this](bool start) { + if (!isSignalFromService(LOGIN_SERVICE)) + return; Log::logger->log(Log::INFO, "fprint: PrepareForSleep (start: {})", start); m_sDBUSState.sleeping = start; if (!m_sDBUSState.sleeping && !m_sDBUSState.verifying) @@ -115,14 +143,20 @@ m_sDBUSState.device = sdbus::createProxy(*g_dbus->m_connection, FPRINT, path); m_sDBUSState.device->uponSignal("VerifyFingerSelected").onInterface(DEVICE).call([](const std::string& finger) { + if (!isSignalFromService(FPRINT)) + return; Log::logger->log(Log::INFO, "fprint: finger selected: {}", finger); }); - m_sDBUSState.device->uponSignal("VerifyStatus").onInterface(DEVICE).call([this](const std::string& result, const bool done) { handleVerifyStatus(result, done); }); + m_sDBUSState.device->uponSignal("VerifyStatus").onInterface(DEVICE).call([this](const std::string& result, const bool done) { + if (!isSignalFromService(FPRINT)) + return; + handleVerifyStatus(result, done); + }); m_sDBUSState.device->uponSignal("PropertiesChanged") .onInterface("org.freedesktop.DBus.Properties") .call([this](const std::string& interface, const std::map<std::string, sdbus::Variant>& properties) { - if (interface != DEVICE || m_sDBUSState.done) + if (!isSignalFromService(FPRINT) || interface != DEVICE || m_sDBUSState.done) return; try { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hyprlock-0.9.6/src/auth/Pam.cpp new/hyprlock-0.9.7/src/auth/Pam.cpp --- old/hyprlock-0.9.6/src/auth/Pam.cpp 2026-07-18 17:55:27.000000000 +0200 +++ new/hyprlock-0.9.7/src/auth/Pam.cpp 2026-11-01 19:12:21.000000000 +0100 @@ -12,6 +12,7 @@ #endif #include <cstring> +#include <cstdlib> #include <thread> int conv(int num_msg, const struct pam_message** msg, struct pam_response** resp, void* appdata_ptr) { @@ -19,6 +20,18 @@ struct pam_response* pamReply = (struct pam_response*)calloc(num_msg, sizeof(struct pam_response)); bool initialPrompt = true; + *resp = nullptr; + + if (!pamReply) + return PAM_BUF_ERR; + + const auto abortConversation = [&]() { + for (int i = 0; i < num_msg; ++i) + free(pamReply[i].resp); + free(pamReply); + return PAM_CONV_ERR; + }; + for (int i = 0; i < num_msg; ++i) { switch (msg[i]->msg_style) { case PAM_PROMPT_ECHO_OFF: @@ -37,8 +50,8 @@ } // Needed for unlocks via SIGUSR1 - if (g_pHyprlock->isFadingOutOrTerminating()) - return PAM_CONV_ERR; + if (CONVERSATIONSTATE->terminateRequested || g_pHyprlock->isFadingOutOrTerminating()) + return abortConversation(); pamReply[i].resp = strdup(CONVERSATIONSTATE->input.c_str()); initialPrompt = false; @@ -78,7 +91,7 @@ } CPam::~CPam() { - ; + terminate(); } void CPam::init() { @@ -87,13 +100,13 @@ resetConversation(); // For grace or SIGUSR1 unlocks - if (g_pHyprlock->isFadingOutOrTerminating()) + if (m_sConversationState.terminateRequested || g_pHyprlock->isFadingOutOrTerminating()) return; const auto AUTHENTICATED = auth(); // For SIGUSR1 unlocks - if (g_pHyprlock->isFadingOutOrTerminating()) + if (m_sConversationState.terminateRequested || g_pHyprlock->isFadingOutOrTerminating()) return; if (!AUTHENTICATED) @@ -147,7 +160,8 @@ m_bBlockInput = false; m_sConversationState.waitingForPamAuth = false; m_sConversationState.inputRequested = true; - m_sConversationState.inputSubmittedCondition.wait(lk, [this] { return !m_sConversationState.inputRequested || g_pHyprlock->isFadingOutOrTerminating(); }); + m_sConversationState.inputSubmittedCondition.wait( + lk, [this] { return !m_sConversationState.inputRequested || m_sConversationState.terminateRequested || g_pHyprlock->isFadingOutOrTerminating(); }); m_bBlockInput = true; } @@ -176,6 +190,11 @@ } void CPam::terminate() { + { + std::lock_guard<std::mutex> lg(m_sConversationState.inputMutex); + m_sConversationState.terminateRequested = true; + } + m_sConversationState.inputSubmittedCondition.notify_all(); if (m_thread.joinable()) m_thread.join(); @@ -186,5 +205,5 @@ m_sConversationState.waitingForPamAuth = false; m_sConversationState.inputRequested = false; m_sConversationState.failTextFromPam = false; - m_bBlockInput = false; + m_bBlockInput = false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hyprlock-0.9.6/src/auth/Pam.hpp new/hyprlock-0.9.7/src/auth/Pam.hpp --- old/hyprlock-0.9.6/src/auth/Pam.hpp 2026-07-18 17:55:27.000000000 +0200 +++ new/hyprlock-0.9.7/src/auth/Pam.hpp 2026-11-01 19:12:21.000000000 +0100 @@ -4,6 +4,7 @@ #include <optional> #include <string> +#include <atomic> #include <mutex> #include <condition_variable> #include <functional> @@ -19,10 +20,11 @@ std::mutex inputMutex; std::condition_variable inputSubmittedCondition; - bool waitingForPamAuth = false; - bool inputRequested = false; - bool failTextFromPam = false; - std::function<void()> waitForInput = []() {}; + bool waitingForPamAuth = false; + bool inputRequested = false; + bool failTextFromPam = false; + std::atomic_bool terminateRequested = false; + std::function<void()> waitForInput = []() {}; }; CPam(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hyprlock-0.9.6/src/config/ConfigManager.cpp new/hyprlock-0.9.7/src/config/ConfigManager.cpp --- old/hyprlock-0.9.6/src/config/ConfigManager.cpp 2026-07-18 17:55:27.000000000 +0200 +++ new/hyprlock-0.9.7/src/config/ConfigManager.cpp 2026-11-01 19:12:21.000000000 +0100 @@ -247,6 +247,7 @@ m_config.addConfigValue("general:fractional_scaling", Hyprlang::INT{2}); m_config.addConfigValue("general:screencopy_mode", Hyprlang::INT{0}); m_config.addConfigValue("general:fail_timeout", Hyprlang::INT{2000}); + m_config.addConfigValue("general:disable_screencopy", Hyprlang::INT{0}); m_config.addConfigValue("auth:pam:enabled", Hyprlang::INT{1}); m_config.addConfigValue("auth:pam:module", Hyprlang::STRING{"hyprlock"}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hyprlock-0.9.6/src/core/hyprlock.cpp new/hyprlock-0.9.7/src/core/hyprlock.cpp --- old/hyprlock-0.9.6/src/core/hyprlock.cpp 2026-07-18 17:55:27.000000000 +0200 +++ new/hyprlock-0.9.7/src/core/hyprlock.cpp 2026-11-01 19:12:21.000000000 +0100 @@ -38,6 +38,10 @@ static bool screencopyRequired() { static const auto ANIMATIONSENABLED = g_pConfigManager->getValue<Hyprlang::INT>("animations:enabled"); + static const auto DISABLESC = g_pConfigManager->getValue<Hyprlang::INT>("general:disable_screencopy"); + + if (*DISABLESC) + return false; const auto FADEINCFG = g_pConfigManager->m_AnimationTree.getConfig("fadeIn"); const auto FADEOUTCFG = g_pConfigManager->m_AnimationTree.getConfig("fadeOut"); @@ -530,7 +534,7 @@ } bool CHyprlock::isFadingOutOrTerminating() { - return m_fadeOutOrTerminate; + return m_fadeOutOrTerminate || m_bTerminate; } bool CHyprlock::isTerminating() { @@ -633,10 +637,10 @@ return; } - if (g_pAuth->m_bDisplayFailText) - g_pAuth->resetDisplayFail(); - if (down) { + if (g_pAuth->m_bDisplayFailText) + g_pAuth->resetDisplayFail(); + m_bCapsLock = xkb_state_mod_name_is_active(g_pSeatManager->m_pXKBState, XKB_MOD_NAME_CAPS, XKB_STATE_MODS_LOCKED); m_bNumLock = xkb_state_mod_name_is_active(g_pSeatManager->m_pXKBState, XKB_MOD_NAME_NUM, XKB_STATE_MODS_LOCKED); m_bCtrl = xkb_state_mod_name_is_active(g_pSeatManager->m_pXKBState, XKB_MOD_NAME_CTRL, XKB_STATE_MODS_EFFECTIVE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hyprlock-0.9.6/src/core/hyprlock.hpp new/hyprlock-0.9.7/src/core/hyprlock.hpp --- old/hyprlock-0.9.6/src/core/hyprlock.hpp 2026-07-18 17:55:27.000000000 +0200 +++ new/hyprlock-0.9.7/src/core/hyprlock.hpp 2026-11-01 19:12:21.000000000 +0100 @@ -10,6 +10,7 @@ #include "Output.hpp" #include "Timer.hpp" #include <vector> +#include <atomic> #include <condition_variable> #include <optional> #include <string_view> @@ -120,9 +121,9 @@ void removeDmabufListener(); private: - bool m_lockAquired = false; - bool m_fadeOutOrTerminate = false; - bool m_bTerminate = false; + bool m_lockAquired = false; + std::atomic_bool m_fadeOutOrTerminate = false; + std::atomic_bool m_bTerminate = false; struct { wl_display* display = nullptr; ++++++ hyprlock.obsinfo ++++++ --- /var/tmp/diff_new_pack.bRVTjt/_old 2026-11-18 18:31:08.231791646 +0100 +++ /var/tmp/diff_new_pack.bRVTjt/_new 2026-11-18 18:31:08.239791985 +0100 @@ -1,5 +1,5 @@ name: hyprlock -version: 0.9.6 -mtime: 1784390127 -commit: b222d9b1f87e980cac379371df57913a53b99d7f +version: 0.9.7 +mtime: 1793556741 +commit: 74efcdc96ee6d08480815064dab5112e0101eb1a
