diff --git a/x11/hyprlock/Makefile b/x11/hyprlock/Makefile index 79b5fb72c064..917b4b8483d9 100644 --- a/x11/hyprlock/Makefile +++ b/x11/hyprlock/Makefile @@ -1,50 +1,46 @@ PORTNAME= hyprlock DISTVERSIONPREFIX= v -DISTVERSION= 0.6.2 -PORTREVISION= 2 +DISTVERSION= 0.7.0 CATEGORIES= x11 wayland -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 8495a20a6a78.patch:-p1 # https://github.com/hyprwm/hyprlock/pull/659 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Hyprland's GPU-accelerated screen locking utility #' WWW= https://github.com/hyprwm/hyprlock LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= hyprwayland-scanner>=0.4.4:devel/hyprwayland-scanner \ wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libhyprutils.so:devel/hyprutils \ libsdbus-c++.so:devel/sdbus-cpp \ libhyprgraphics.so:graphics/hyprgraphics \ 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= cmake compiler:c++11-lib gl gnome jpeg pkgconfig USE_GITHUB= yes USE_GL= egl gbm USE_GNOME= cairo pango GH_ACCOUNT= hyprwm LDFLAGS+= -Wl,--as-needed # pango deps PLIST_FILES= bin/${PORTNAME} \ etc/pam.d/${PORTNAME} \ share/hypr/${PORTNAME}.conf # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282377 .if exists(/usr/lib/libc++.so) LIB_DEPENDS+= libdate-tz.so:devel/date USES+= localbase:ldflags post-patch: libcxx-post-patch libcxx-post-patch: @${REINPLACE_CMD} '/_LIBCPP_VERSION/s/$$/ || defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE)/' \ ${WRKSRC}/src/renderer/widgets/IWidget.cpp .endif .include diff --git a/x11/hyprlock/distinfo b/x11/hyprlock/distinfo index d007e204123b..e0b2efb8cd0c 100644 --- a/x11/hyprlock/distinfo +++ b/x11/hyprlock/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1737652318 -SHA256 (hyprwm-hyprlock-v0.6.2_GH0.tar.gz) = d62f692d09a990f5e1aea756792942cfd91e9ab72af4ce97fcb93e8f0b2b9c01 -SIZE (hyprwm-hyprlock-v0.6.2_GH0.tar.gz) = 72716 -SHA256 (8495a20a6a78.patch) = fb456ad32770f11e3f6fe45d4e2d54f7bd462456a8c3d7bc31fb353f00c872c2 -SIZE (8495a20a6a78.patch) = 1307 +TIMESTAMP = 1740265014 +SHA256 (hyprwm-hyprlock-v0.7.0_GH0.tar.gz) = 0ee8d363cfe84bbca9b32062e34926aa713b9505927117593cc595d6e1e67cbe +SIZE (hyprwm-hyprlock-v0.7.0_GH0.tar.gz) = 79446 diff --git a/x11/hyprlock/files/patch-pam_hyprlock b/x11/hyprlock/files/patch-pam_hyprlock index dea75ca52d17..a9f6e9b4e605 100644 --- a/x11/hyprlock/files/patch-pam_hyprlock +++ b/x11/hyprlock/files/patch-pam_hyprlock @@ -1,30 +1,30 @@ "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. --- pam/hyprlock.orig 2024-03-01 23:49:44 UTC +++ pam/hyprlock @@ -1,5 +1,4 @@ -# PAM configuration file for hyprlock -# the 'login' configuration file (see /etc/pam.d/login) +# PAM configuration for hyprlock. Only uses auth facilities. -auth include login +auth include unix-selfauth ---- src/auth/Pam.cpp.orig 2024-12-18 15:03:04 UTC +--- src/auth/Pam.cpp.orig 2025-02-22 22:56:54 UTC +++ src/auth/Pam.cpp @@ -64,11 +64,6 @@ CPam::CPam() { - static auto* const PPAMMODULE = (Hyprlang::STRING*)(g_pConfigManager->getValuePtr("auth:pam:module")); - m_sPamModule = *PPAMMODULE; + static const auto PAMMODULE = g_pConfigManager->getValue("auth:pam:module"); + m_sPamModule = *PAMMODULE; - 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); +- Debug::log(ERR, R"(Pam module "/etc/pam.d/{}" does not exist! Falling back to "/etc/pam.d/su")", m_sPamModule); - m_sPamModule = "su"; - } - m_sConversationState.waitForInput = [this]() { this->waitForInput(); }; }