sysutils/seatd: drop SUID option after b8a20cd29e54

It's not possible to restrict setuid bit to "video" group without also
breaking compositor nesting (e.g., hikari on sway). So, leave setuid
handling to a dedicated executable. seatd-launch works similar to
ck-launch-session by starting the daemon on demand.

8 files changed, 22 insertions, 35 deletions

diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile
index 54a1c57aad12..e3ea9352b70a 100644
--- a/x11-wm/cage/Makefile
+++ b/x11-wm/cage/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	cage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -23,18 +24,15 @@ USES=		compiler:c11 meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
 GH_ACCOUNT=	Hjdskes
-PLIST_FILES=	"${MAYBE_SUID}bin/${PORTNAME}"
+PLIST_FILES=	bin/${PORTNAME}
 
-OPTIONS_DEFINE=	MANPAGES SUID X11
-OPTIONS_DEFAULT=MANPAGES SUID X11
+OPTIONS_DEFINE=	MANPAGES X11
+OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc>=1.9.2:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
-SUID_DESC=	setuid bit on "${PORTNAME}" binary (to claim DRM without seatd/console-kit-daemon)
-SUID_VARS=	MAYBE_SUID="@(,,4755) "
-
 X11_MESON_TRUE=	xwayland
 
 post-patch:
diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
index c830b9d8154c..20ff7980580e 100644
--- a/x11-wm/hikari/Makefile
+++ b/x11-wm/hikari/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	hikari
 DISTVERSION=	2.3.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://hikari.acmelabs.space/releases/
 
@@ -22,23 +23,19 @@ USES=		compiler:c11 gnome pkgconfig xorg
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 
-MAKE_ARGS+=	${WITH_DEBUG:DDEBUG=YES} \
-		WITHOUT_SUID=YES
+MAKE_ARGS+=	${WITH_DEBUG:DDEBUG=YES}
 
-OPTIONS_DEFINE=		GAMMA LAYERSHELL SCREENCOPY SUID VIRTUALINPUT X11
-OPTIONS_DEFAULT=	GAMMA LAYERSHELL SCREENCOPY SUID VIRTUALINPUT X11
+OPTIONS_DEFINE=		GAMMA LAYERSHELL SCREENCOPY VIRTUALINPUT X11
+OPTIONS_DEFAULT=	GAMMA LAYERSHELL SCREENCOPY VIRTUALINPUT X11
 
 GAMMA_DESC=		Include gammacontrol protocol (required by, e.g., Redshift)
 LAYERSHELL_DESC=	Include layer_shell protocol (required by, e.g., waybar)
 SCREENCOPY_DESC=	Include screenshot protocol (required by, e.g., grim)
-SUID_DESC=		Setuid bit on binaries (required for DRM and PAM)
 VIRTUALINPUT_DESC=	needed for VNC support (requiered by e.g. wayvnc)
 
 GAMMA_MAKE_ARGS=	WITH_GAMMACONTROL=YES
 LAYERSHELL_MAKE_ARGS=	WITH_LAYERSHELL=YES
 SCREENCOPY_MAKE_ARGS=	WITH_SCREENCOPY=YES
-SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
-SUID_PLIST_SUB_OFF=	MAYBE_SUID=""
 VIRTUALINPUT_MAKE_ARGS=	WITH_VIRTUAL_INPUT=YES
 X11_MAKE_ARGS=		WITH_XWAYLAND=YES
 
diff --git a/x11-wm/hikari/pkg-plist b/x11-wm/hikari/pkg-plist
index 0e9bb8321e63..db696af0e930 100644
--- a/x11-wm/hikari/pkg-plist
+++ b/x11-wm/hikari/pkg-plist
@@ -1,5 +1,5 @@
-%%MAYBE_SUID%%bin/hikari
-%%MAYBE_SUID%%bin/hikari-unlocker
+bin/hikari
+@(,,4755) bin/hikari-unlocker
 etc/pam.d/hikari-unlocker
 @sample %%ETCDIR%%/hikari.conf.sample
 share/backgrounds/hikari/hikari_wallpaper.png
diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile
index 30d805eebd43..b20b5e4a21aa 100644
--- a/x11-wm/labwc/Makefile
+++ b/x11-wm/labwc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	labwc
 DISTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -19,10 +20,10 @@ USE_GITHUB=	yes
 USE_GNOME=	cairo libxml2 pango
 USE_XORG=	pixman
 GH_ACCOUNT=	johanmalm
-PLIST_FILES=	"${MAYBE_SUID}bin/${PORTNAME}"
+PLIST_FILES=	bin/${PORTNAME}
 
-OPTIONS_DEFINE=	MANPAGES SUID X11
-OPTIONS_DEFAULT=MANPAGES SUID X11
+OPTIONS_DEFINE=	MANPAGES X11
+OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
@@ -33,9 +34,6 @@ MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
 			man/man5/${PORTNAME}-menu.5.gz \
 			man/man5/${PORTNAME}-theme.5.gz
 
-SUID_DESC=		setuid bit on "${PORTNAME}" binary (to claim DRM without seatd/console-kit-daemon)
-SUID_VARS=		MAYBE_SUID="@(,,4755) "
-
 X11_MESON_ENABLED=	xwayland
 
 post-extract:
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index f301292721da..7729ddce8125 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sway
 DISTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -34,8 +35,8 @@ USE_XORG=	pixman
 GH_ACCOUNT=	swaywm
 MESON_ARGS=	-Dsd-bus-provider=basu
 
-OPTIONS_DEFINE=	BASU MANPAGES PIXBUF SUID X11
-OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SUID X11
+OPTIONS_DEFINE=	BASU MANPAGES PIXBUF X11
+OPTIONS_DEFAULT=BASU MANPAGES PIXBUF X11
 OPTIONS_SUB=	yes
 
 BASU_DESC=		Tray in swaybar via basu
@@ -48,10 +49,6 @@ MANPAGES_MESON_ENABLED=	man-pages
 PIXBUF_USE=		GNOME=gdkpixbuf2
 PIXBUF_MESON_ENABLED=	gdk-pixbuf
 
-SUID_DESC=		setuid bit on "sway" binary (to claim DRM without seatd/console-kit-daemon)
-SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
-SUID_PLIST_SUB_OFF=	MAYBE_SUID=""
-
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
diff --git a/x11-wm/sway/pkg-plist b/x11-wm/sway/pkg-plist
index 1a26bc1425f5..9192fd8c56b9 100644
--- a/x11-wm/sway/pkg-plist
+++ b/x11-wm/sway/pkg-plist
@@ -1,4 +1,4 @@
-%%MAYBE_SUID%%bin/sway
+bin/sway
 bin/swaybar
 bin/swaymsg
 bin/swaynag
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index 8890701c59ff..bb001929462a 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	wayfire
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -35,12 +36,8 @@ GH_ACCOUNT=	WayfireWM
 GH_TUPLE=	WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \
 		WayfireWM:wf-utils:889fdaf:wfutils/subprojects/wf-utils
 
-OPTIONS_DEFINE=	SUID X11
-OPTIONS_DEFAULT=SUID X11
-
-SUID_DESC=		setuid bit on "${PORTNAME}" binary (to claim DRM without seatd/console-kit-daemon)
-SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
-SUID_PLIST_SUB_OFF=	MAYBE_SUID=""
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=X11
 
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
diff --git a/x11-wm/wayfire/pkg-plist b/x11-wm/wayfire/pkg-plist
index ed8b002fb6ea..5e14791a9f39 100644
--- a/x11-wm/wayfire/pkg-plist
+++ b/x11-wm/wayfire/pkg-plist
@@ -1,4 +1,4 @@
-%%MAYBE_SUID%%bin/wayfire
+bin/wayfire
 include/wayfire/bindings.hpp
 include/wayfire/compositor-surface.hpp
 include/wayfire/compositor-view.hpp