From 07e41dc719080d376f0cc3f61894efe749714ea2 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 21 Apr 2020 19:39:44 -0700 Subject: [PATCH 1/4] sway: enable elogind build option by default. --- srcpkgs/sway/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index ff20221bde8..35d15a1bb54 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -17,6 +17,7 @@ distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz" checksum=e2805291fc01d49e21dda4b273e38170d1fff4e1757215439729edbed880dfbe build_options="elogind" +build_options_default="elogind" desc_option_elogind="Uses elogind instead of setuid for privilege escalation" post_patch() { @@ -26,7 +27,7 @@ post_patch() { post_install() { vlicense LICENSE if [ -z "$build_option_elogind" ]; then - # must be setuid without logind! + # must be setuid without logind chmod u+s ${DESTDIR}/usr/bin/sway fi } From ff2bb3364325265684df9122f37c9738a20782e8 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 21 Apr 2020 19:40:00 -0700 Subject: [PATCH 2/4] wayfire: add and enable elogind build option by default. --- srcpkgs/wayfire/INSTALL.msg | 2 -- srcpkgs/wayfire/template | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wayfire/INSTALL.msg b/srcpkgs/wayfire/INSTALL.msg index 164d23c2b3a..622f1a4a6c4 100644 --- a/srcpkgs/wayfire/INSTALL.msg +++ b/srcpkgs/wayfire/INSTALL.msg @@ -1,5 +1,3 @@ Before running Wayfire, copy the default configuration file to your user: cp /usr/share/examples/wayfire/wayfire.ini ~/.config/wayfire.ini - -You also probably want to install elogind, then restart your computer diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index 0298848a39e..ab633fc3d88 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -5,7 +5,7 @@ revision=2 build_style=meson hostmakedepends="pkg-config wayland-devel" makedepends="xcb-util-wm-devel xcb-util-errors-devel glm cairo-devel wf-config-devel" -depends="xorg-server-xwayland" +depends="xorg-server-xwayland $(vopt_if elogind elogind)" short_desc="3D wayland compositor" maintainer="Young Jin Park " license="MIT" @@ -13,6 +13,10 @@ homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz" checksum=9c009c01bccce97149d0695b5429cf44787fdc1423c58425ba8e8de601019e97 +build_options="elogind" +build_options_default="elogind" +desc_option_elogind="Uses elogind instead of setuid for privilege escalation" + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel" fi @@ -20,4 +24,8 @@ fi post_install() { vlicense LICENSE vsconf wayfire.ini + if [ -z "$build_option_elogind" ]; then + # must be setuid without logind + chmod u+s ${DESTDIR}/usr/bin/wayfire + fi } From 4ebdfe8203c005a50102805d125ed10be2a1993f Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 21 Apr 2020 19:40:21 -0700 Subject: [PATCH 3/4] cage: add and enable elogind build option by default. --- srcpkgs/cage/template | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template index 49342bf81c7..f079f83954f 100644 --- a/srcpkgs/cage/template +++ b/srcpkgs/cage/template @@ -5,6 +5,7 @@ revision=2 build_style=meson hostmakedepends="pkg-config wayland-devel" makedepends="xcb-util-wm-devel xcb-util-errors-devel libxkbcommon-devel pixman-devel wayland-devel wlroots-devel" +depends="$(vopt_if elogind elogind)" short_desc="Kiosk compositor for Wayland" maintainer="Illia Shestakov " license="MIT" @@ -12,7 +13,15 @@ homepage="https://www.hjdskes.nl/projects/cage/" distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz" checksum=63efbe96cf307381f2bedf9b80153343e255970a70d612515da7dc325dd49478 +build_options="elogind" +build_options_default="elogind" +desc_option_elogind="Uses elogind instead of setuid for privilege escalation" + post_install() { vlicense LICENSE vdoc README.md + if [ -z "$build_option_elogind" ]; then + # must be setuid without logind + chmod u+s ${DESTDIR}/usr/bin/cage + fi } From 99d0d71c295ce281803b47f9b6b336f8d7bdd6de Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 21 Apr 2020 19:40:36 -0700 Subject: [PATCH 4/4] weston: enable elogind build option by default. --- srcpkgs/weston/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index 5248a920dd9..ece6fa3ba83 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -23,6 +23,7 @@ lib32disabled=yes # Package build options build_options="elogind vaapi" +build_options_default="elogind" desc_option_elogind="Use elogind for suidless startup" case "$XBPS_TARGET_MACHINE" in