Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] wayland-compositors: use elogind
@ 2020-04-22  2:44 travankor
  2020-04-22 17:25 ` ericonr
                   ` (33 more replies)
  0 siblings, 34 replies; 35+ messages in thread
From: travankor @ 2020-04-22  2:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

There is a new pull request by travankor against master on the void-packages repository

https://github.com/travankor/void-packages wayland
https://github.com/void-linux/void-packages/pull/21233

wayland-compositors: use elogind
Hopefully fixes #20930

A patch file from https://github.com/void-linux/void-packages/pull/21233.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wayland-21233.patch --]
[-- Type: text/x-diff, Size: 4442 bytes --]

From 1758bf127d8a1349810cf742d419fd36b9699347 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
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 964702f3948..1bd914ce0ef 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 edb143abd7b55479c2fa9d3445e36bd62f09d25e Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Tue, 21 Apr 2020 19:40:00 -0700
Subject: [PATCH 2/4] wayfire: add and enable elogind build option by default.

---
 srcpkgs/wayfire/template | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 4f7aabbef14..adfb0f55160 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -5,6 +5,7 @@ revision=1
 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 $(vopt_if elogind elogind)"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
@@ -12,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
@@ -19,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 6c23ae19eec85304615075ec773c868a0a91cebd Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
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 <ishestakov@airmail.cc>"
 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 c3b7a9ad131a5d549c135e53e2dc42912ffcda19 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
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

^ permalink raw reply	[flat|nested] 35+ messages in thread

end of thread, other threads:[~2020-08-14  2:31 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-22  2:44 [PR PATCH] wayland-compositors: use elogind travankor
2020-04-22 17:25 ` ericonr
2020-04-23  1:12 ` ericonr
2020-04-23  1:12 ` ericonr
2020-04-23  7:08 ` travankor
2020-04-23  7:09 ` travankor
2020-04-23  7:10 ` travankor
2020-04-23 20:21 ` ericonr
2020-04-23 20:22 ` ericonr
2020-04-24  6:59 ` travankor
2020-04-25 18:22 ` ShinyRice
2020-04-25 18:23 ` ShinyRice
2020-04-25 19:43 ` hippi777
2020-04-25 19:48 ` hippi777
2020-04-27 14:44 ` ericonr
2020-04-27 20:56 ` [PR PATCH] [Updated] " travankor
2020-04-27 20:57 ` travankor
2020-05-06  4:04 ` ericonr
2020-05-06  8:44 ` travankor
2020-05-06  8:47 ` travankor
2020-05-06  8:47 ` travankor
2020-05-06  8:49 ` travankor
2020-05-06 12:35 ` [PR PATCH] [Updated] " travankor
2020-05-06 19:15 ` ericonr
2020-05-06 21:51 ` ericonr
2020-05-28 21:08 ` ericonr
2020-05-29  7:30 ` travankor
2020-05-30 19:23 ` [nomerge] " ericonr
2020-05-31 18:36 ` travankor
2020-05-31 18:51 ` travankor
2020-05-31 21:29 ` ericonr
2020-05-31 21:30 ` ericonr
2020-08-04 20:30 ` ericonr
2020-08-14  2:31 ` travankor
2020-08-14  2:31 ` [PR PATCH] [Closed]: " travankor

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).