diff --git a/x11/hyprlock/Makefile b/x11/hyprlock/Makefile index 3e72adb2fd2b..419705342c48 100644 --- a/x11/hyprlock/Makefile +++ b/x11/hyprlock/Makefile @@ -1,52 +1,51 @@ PORTNAME= hyprlock DISTVERSIONPREFIX= v -DISTVERSION= 0.9.3 -PORTREVISION= 1 +DISTVERSION= 0.9.5 CATEGORIES= x11 wayland MAINTAINER= tagattie@FreeBSD.org COMMENT= Hyprland's GPU-accelerated screen locking utility #' WWW= https://github.com/hyprwm/hyprlock LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ hyprwayland-scanner>=0.4.4:devel/hyprwayland-scanner \ wayland-protocols>=1.35: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 GH_ACCOUNT= hyprwm USE_GL= egl gbm USE_GNOME= cairo pango 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 f5b7d4da4eb8..5dbda4e9208e 100644 --- a/x11/hyprlock/distinfo +++ b/x11/hyprlock/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1774612891 -SHA256 (hyprwm-hyprlock-v0.9.3_GH0.tar.gz) = 22e7346486d0f6a1ab46d9917ae5354de4d3d32350f6947bc7028a9c42859ce8 -SIZE (hyprwm-hyprlock-v0.9.3_GH0.tar.gz) = 83905 +TIMESTAMP = 1776771319 +SHA256 (hyprwm-hyprlock-v0.9.5_GH0.tar.gz) = cbc49fc5553c550131e1a15089847501de42579944814229bfa9f8ea18519f89 +SIZE (hyprwm-hyprlock-v0.9.5_GH0.tar.gz) = 84533 diff --git a/x11/hyprlock/files/patch-pam_hyprlock b/x11/hyprlock/files/patch-pam_hyprlock index a9f6e9b4e605..85d1b92666ac 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.orig 2026-04-18 09:44:05 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 2025-02-22 22:56:54 UTC +--- src/auth/Pam.cpp.orig 2026-04-21 11:41:16 UTC +++ src/auth/Pam.cpp @@ -64,11 +64,6 @@ CPam::CPam() { 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, R"(Pam module "/etc/pam.d/{}" does not exist! Falling back to "/etc/pam.d/su")", m_sPamModule); +- Log::logger->log(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(); }; - } + m_username = getUsernameForCurrentUid(); + m_sConversationState.waitForInput = [this]() { this->waitForInput(); };