From nobody Sat Jul 6 10:43:35 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WGRnN0wLkz5QCxC; Sat, 06 Jul 2024 10:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WGRnM56hrz4JTC; Sat, 6 Jul 2024 10:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720262615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wgkqug+mOAAkaWor/FDrOJq1oLEXL2NHjcqWOBebZKc=; b=m/VpvuvsjDnxAK28pJ22TZCD/imjoa5GX1UwGUJ4dw88XDcqwKyHG5li1pBOW2M9Qxa9cj k3/37xIXOK6KrxwHkL+oWz8eMXk9SOqmxaBhlozzpHMHIUIsmPTRl0rQWDOhllFjFTxtHF pV97iAqEaqKFR6t9kmZioloNLCNvM2/AfycJIqTYWmwXSPLfcLufL1nHrot2wY2Rs52c6O Q0NAD3nxgvuX/2R6pmcuB96Ya0c/UGVKBJdny4DAF+g6JsfxW3w5izm2Mb74OBwJbygXfE 2Nuf5fwkaRub8YSupnYy6w4487ef0s1Wl47wGQauawABCqAzEXo2HhYSFGrS5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720262615; a=rsa-sha256; cv=none; b=ohGe3W5JUZZmXfBrn6Iib9q6ZlkjJh+z6O8QNO9BzFYbK/ynuW8GnhWJg/CXEepMuen44F HlDFYuhZIfZJTJOp+vDdmeNKMhi7ibHD9bzz0CwXYeyDTH5dTJXBSEyqz+703R4neE6f0b Qfjc+LNEyyACRx6fT5DU6qFKg5rdhfnGLdk6rBPKkleVaH1+iosTo1GJwis/uuoM7WM7hG Rkt6hbGKy/W29c0EjAU1WWCBF1T4461KV7zxWo26l/KuxSFsoiF2LnfxsnH2PVcMhv0O0S YzWQ+/4HfCWXLCxn5hnDTaZt7NLiSC+J46trTOkFrYE18rmBwCPny0xcY+zLLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720262615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wgkqug+mOAAkaWor/FDrOJq1oLEXL2NHjcqWOBebZKc=; b=XLeCqv9jry0E5CXg7DZJOZLuZ48Jrj9jRcSniH705HflMeBHegAydNl1RVFkFQZ2SQRRFR RFVzBm0bzu6ab3rJBfNp8+r2aLxcNr+cddeWuzFFsIe1lvA5Ei8gaMrT0kxmoyAS1arvFN 9UvAf2Dn65TAhYpFbFXMuYR4fCVoI6akBWofZN8GxbSf0GsA+P5JV5HVsn+YKPYcDL52aW DHg6NhiziWXeCzdgH7ejn9OlhFcy7mNp3TJ3zv++WsBHaFFcysvU5qFis2Hh8+LI6E0ThE 83Kgx3V16Rlr5jtcHbQlT7tEnVnt2XN2ntLFZRNw8LXW0FRca8VKHq7WqopW+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WGRnM4kBxzcdw; Sat, 6 Jul 2024 10:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 466AhZwC078393; Sat, 6 Jul 2024 10:43:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 466AhZv9078390; Sat, 6 Jul 2024 10:43:35 GMT (envelope-from git) Date: Sat, 6 Jul 2024 10:43:35 GMT Message-Id: <202407061043.466AhZv9078390@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: a351889cffbc - 2024Q3 - x11/hyprlock: update to 0.4.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: a351889cffbc48b1b861c871e902668844e2d4b8 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a351889cffbc48b1b861c871e902668844e2d4b8 commit a351889cffbc48b1b861c871e902668844e2d4b8 Author: Jan Beich AuthorDate: 2024-07-05 20:58:45 +0000 Commit: Jan Beich CommitDate: 2024-07-06 10:43:19 +0000 x11/hyprlock: update to 0.4.0 Changes: https://github.com/hyprwm/hyprlock/releases/tag/v0.4.0 Reported by: GitHub (watch releases) (cherry picked from commit e96bf8752a2225eecae38acc1694aa654c681339) --- x11/hyprlock/Makefile | 9 +++++---- x11/hyprlock/distinfo | 12 +++++------- x11/hyprlock/files/patch-pam_hyprlock | 23 +++++++++++++---------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/x11/hyprlock/Makefile b/x11/hyprlock/Makefile index 5e9bfdc49e85..0030a047a9d8 100644 --- a/x11/hyprlock/Makefile +++ b/x11/hyprlock/Makefile @@ -1,11 +1,10 @@ PORTNAME= hyprlock DISTVERSIONPREFIX= v -DISTVERSION= 0.3.0 +DISTVERSION= 0.4.0 CATEGORIES= x11 wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= d9a6229434fb.patch:-p1 # -G Ninja -PATCHFILES+= 8658386f212f.patch:-p1 # https://github.com/hyprwm/hyprlock/issues/289 +PATCHFILES+= 7fb3c0350076.patch:-p1 # https://github.com/hyprwm/hyprlock/pull/404 MAINTAINER= jbeich@FreeBSD.org COMMENT= Hyprland's GPU-accelerated screen locking utility #' @@ -16,12 +15,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ + libhyprutils.so:devel/hyprutils \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ + libwebp.so:graphics/webp \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper -USES= compiler:c++11-lib cmake gl gnome pkgconfig +USES= cmake compiler:c++11-lib gl gnome jpeg pkgconfig USE_GITHUB= yes USE_GL= egl gbm USE_GNOME= cairo pango diff --git a/x11/hyprlock/distinfo b/x11/hyprlock/distinfo index c0d6df0daf68..0ab6a75dbb22 100644 --- a/x11/hyprlock/distinfo +++ b/x11/hyprlock/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1715283979 -SHA256 (hyprwm-hyprlock-v0.3.0_GH0.tar.gz) = 5e84ac3223ea340bb3d39c22db4edefbb8364da8c3b6b3d0da1dfa45d8cc945f -SIZE (hyprwm-hyprlock-v0.3.0_GH0.tar.gz) = 61599 -SHA256 (d9a6229434fb.patch) = c50bfa1b1d69d95a6fe0ae9ab9c023ee220f8b9b535a54f1271782e33b198941 -SIZE (d9a6229434fb.patch) = 852 -SHA256 (8658386f212f.patch) = 36d0de05ba6897dc77ad2ad86ad7ffd0aae6d665dc588b931e0f86243818906d -SIZE (8658386f212f.patch) = 984 +TIMESTAMP = 1720213125 +SHA256 (hyprwm-hyprlock-v0.4.0_GH0.tar.gz) = 1da2a9e55e3f174a7c10d3c71b54bba1b55dbbbd1ef3a94783b43c40f3b0c83d +SIZE (hyprwm-hyprlock-v0.4.0_GH0.tar.gz) = 63230 +SHA256 (7fb3c0350076.patch) = 69891ef9be8a2510062b91972cda662614096918879de730ad93f256dd34309c +SIZE (7fb3c0350076.patch) = 1208 diff --git a/x11/hyprlock/files/patch-pam_hyprlock b/x11/hyprlock/files/patch-pam_hyprlock index 57460c064b18..864ba47ea5b2 100644 --- a/x11/hyprlock/files/patch-pam_hyprlock +++ b/x11/hyprlock/files/patch-pam_hyprlock @@ -14,14 +14,17 @@ 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 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(); +--- src/core/Auth.cpp.orig 2024-07-05 20:58:45 UTC ++++ src/core/Auth.cpp +@@ -56,11 +56,6 @@ CAuth::CAuth() { + CAuth::CAuth() { + static auto* const PPAMMODULE = (Hyprlang::STRING*)(g_pConfigManager->getValuePtr("general:pam_module")); + m_sPamModule = *PPAMMODULE; +- +- if (!std::filesystem::exists(std::filesystem::path("/etc/pam.d/") / m_sPamModule)) { +- Debug::log(ERR, "Pam module \"/etc/pam.d/{}\" does not exist! Falling back to \"/etc/pam.d/su\"", m_sPamModule); +- m_sPamModule = "su"; +- } + } + static void passwordCheckTimerCallback(std::shared_ptr self, void* data) {