git: 592d2bec114d - main - x11-wm/hikari: drop setuid bit from hikari-unlocker

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=592d2bec114d2ae04e564c22b6a175773c28ab40

commit 592d2bec114d2ae04e564c22b6a175773c28ab40
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-08-10 09:31:47 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-08-11 13:41:28 +0000

    x11-wm/hikari: drop setuid bit from hikari-unlocker
    
    PR:             273042
    Approved by:    ashish (maintainer)
---
 x11-wm/hikari/Makefile                                      | 3 ++-
 x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD | 8 ++++++++
 x11-wm/hikari/pkg-plist                                     | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
index 782bd3a62968..0077486cb809 100644
--- a/x11-wm/hikari/Makefile
+++ b/x11-wm/hikari/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hikari
 DISTVERSION=	2.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm wayland
 MASTER_SITES=	https://hikari.acmelabs.space/releases/
 
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libinput.so:x11/libinput \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
+RUN_DEPENDS=	unix-selfauth-helper>0:security/unix-selfauth-helper
 
 USES=		compiler:c11 gnome pkgconfig xorg
 USE_GNOME=	cairo pango
diff --git a/x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD b/x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD
new file mode 100644
index 000000000000..3b2fdc56f0f9
--- /dev/null
+++ b/x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD
@@ -0,0 +1,8 @@
+pam_unix(8) requires root priveleges to access master.passwd(5),
+so try authenticating via setuid helper first.
+
+--- etc/pam.d/hikari-unlocker.FreeBSD.orig	2020-03-05 21:52:17 UTC
++++ etc/pam.d/hikari-unlocker.FreeBSD
+@@ -1 +1 @@
+-auth include passwd
++auth include unix-selfauth
diff --git a/x11-wm/hikari/pkg-plist b/x11-wm/hikari/pkg-plist
index db696af0e930..20d253a8166b 100644
--- a/x11-wm/hikari/pkg-plist
+++ b/x11-wm/hikari/pkg-plist
@@ -1,5 +1,5 @@
 bin/hikari
-@(,,4755) bin/hikari-unlocker
+bin/hikari-unlocker
 etc/pam.d/hikari-unlocker
 @sample %%ETCDIR%%/hikari.conf.sample
 share/backgrounds/hikari/hikari_wallpaper.png