From e2498233f15adf4f067b299a342152c7d3f84ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fiala?= <temp.xanomes@volny.cz>
Date: Sun, 8 Nov 2020 18:26:29 +0100
Subject: [PATCH] cage: disable SUID
---
srcpkgs/cage/INSTALL.msg | 6 ++++++
srcpkgs/cage/template | 10 +++-------
2 files changed, 9 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/cage/INSTALL.msg
diff --git a/srcpkgs/cage/INSTALL.msg b/srcpkgs/cage/INSTALL.msg
new file mode 100644
index 00000000000..05274ffcc3a
--- /dev/null
+++ b/srcpkgs/cage/INSTALL.msg
@@ -0,0 +1,6 @@
+Setting the SUID bit after install has been retired for all Wayland
+compositors. It is recommended that users use a session management daemon
+such as elogind or seatd and do not rely on compositors dropping privileges.
+
+All users who require this functionality will need to set the SUID bit manually
+after each update going forward.
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index a4085ac8483..960ccfac215 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,12 +1,12 @@
# Template file for 'cage'
pkgname=cage
version=0.1.2.1
-revision=2
+revision=3
build_style=meson
configure_args="$(vopt_bool xwayland xwayland)"
hostmakedepends="pkg-config wayland-devel scdoc"
makedepends="wlroots-devel"
-depends="$(vopt_if xwayland xorg-server-xwayland) $(vopt_if elogind elogind)"
+depends="$(vopt_if xwayland xorg-server-xwayland)"
short_desc="Kiosk compositor for Wayland"
maintainer="Illia Shestakov <ishestakov@airmail.cc>"
license="MIT"
@@ -14,14 +14,10 @@ homepage="https://www.hjdskes.nl/projects/cage/"
distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz"
checksum=38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac
-build_options="elogind xwayland"
+build_options="xwayland"
build_options_default="xwayland"
desc_option_xwayland="Enable Xwayland support in cage"
post_install() {
- if [ -z "$build_option_elogind" ]; then
- # must be setuid without logind!
- chmod u+s ${DESTDIR}/usr/bin/cage
- fi
vlicense LICENSE
}