git: 301500484f34 - 2024Q2 - x11/hyprlock: update to 0.3.0

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Mon, 22 Apr 2024 09:35:53 UTC
The branch 2024Q2 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=301500484f348ad1603850d338895aabc8024fff

commit 301500484f348ad1603850d338895aabc8024fff
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-04-08 14:39:01 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-04-22 09:35:50 +0000

    x11/hyprlock: update to 0.3.0
    
    Changes:        https://github.com/hyprwm/hyprlock/releases/tag/v0.3.0
    Reported by:    GitHub (watch releases)
    
    (cherry picked from commit 2e440206b3e57fe8ce930bb69ba84c1b46290d49)
---
 x11/hyprlock/Makefile                 |  5 +++--
 x11/hyprlock/distinfo                 | 12 +++++++-----
 x11/hyprlock/files/patch-pam_hyprlock | 15 +++++++++++++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/x11/hyprlock/Makefile b/x11/hyprlock/Makefile
index 5d5c458b6240..ff45267366aa 100644
--- a/x11/hyprlock/Makefile
+++ b/x11/hyprlock/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	hyprlock
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.0
+DISTVERSION=	0.3.0
 CATEGORIES=	x11 wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	e040c56ad294.patch:-p1 # https://github.com/hyprwm/hyprlock/pull/195
+PATCHFILES+=	d9a6229434fb.patch:-p1 # -G Ninja
+PATCHFILES+=	8658386f212f.patch:-p1 # https://github.com/hyprwm/hyprlock/issues/289
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Hyprland's GPU-accelerated screen locking utility #'
diff --git a/x11/hyprlock/distinfo b/x11/hyprlock/distinfo
index f7bad122e0cf..ecae09020fef 100644
--- a/x11/hyprlock/distinfo
+++ b/x11/hyprlock/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1710343595
-SHA256 (hyprwm-hyprlock-v0.2.0_GH0.tar.gz) = 3d56220ac03016163e196bc2c08e5b16e83583fa9446ad52e32ddbb56c293994
-SIZE (hyprwm-hyprlock-v0.2.0_GH0.tar.gz) = 56798
+TIMESTAMP = 1712587141
+SHA256 (hyprwm-hyprlock-v0.3.0_GH0.tar.gz) = 5e84ac3223ea340bb3d39c22db4edefbb8364da8c3b6b3d0da1dfa45d8cc945f
+SIZE (hyprwm-hyprlock-v0.3.0_GH0.tar.gz) = 61599
 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
-SHA256 (e040c56ad294.patch) = f5d3ceee74733563306c6e3621ba773efe65d2015297bbedfa88e952e8171fb5
-SIZE (e040c56ad294.patch) = 1720
+SHA256 (d9a6229434fb.patch) = c50bfa1b1d69d95a6fe0ae9ab9c023ee220f8b9b535a54f1271782e33b198941
+SIZE (d9a6229434fb.patch) = 852
+SHA256 (8658386f212f.patch) = 36d0de05ba6897dc77ad2ad86ad7ffd0aae6d665dc588b931e0f86243818906d
+SIZE (8658386f212f.patch) = 984
diff --git a/x11/hyprlock/files/patch-pam_hyprlock b/x11/hyprlock/files/patch-pam_hyprlock
index a3e78966d632..57460c064b18 100644
--- a/x11/hyprlock/files/patch-pam_hyprlock
+++ b/x11/hyprlock/files/patch-pam_hyprlock
@@ -1,5 +1,5 @@
-"login" has "auth sufficient pam_self.so" but a screen locker is
-supposed to ask for password regardless.
+"login" and "su" have "auth sufficient pam_self.so" but a screen
+locker is supposed to ask for password regardless.
 
 pam_unix(8) requires root priveleges to access master.passwd(5),
 so try authenticating via setuid helper first.
@@ -14,3 +14,14 @@ so try authenticating via setuid helper first.
 -auth        include     login
 +auth        include     unix-selfauth
  
+--- src/core/Password.cpp.orig	2024-04-08 14:39:01 UTC
++++ src/core/Password.cpp
+@@ -70,7 +70,7 @@ std::shared_ptr<CPassword::SVerificationResult> CPassw
+             return true;
+         };
+ 
+-        result->realized = auth("hyprlock") || auth("su") || true;
++        result->realized = auth("hyprlock") || true;
+         g_pHyprlock->addTimer(std::chrono::milliseconds(1), passwordCheckTimerCallback, nullptr);
+     }).detach();
+