summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Karbowski <slashbeast@gentoo.org>2022-01-01 22:48:43 +0100
committerPiotr Karbowski <slashbeast@gentoo.org>2022-01-01 22:51:01 +0100
commit3d3570528f161a3f1086b351137d88f46c6a138a (patch)
tree198a4332021fa77003843d2f195c860e10c4cfb4
parentdev-lang/gnat-gpl: fix cet detection (diff)
downloadgentoo-3d3570528f161a3f1086b351137d88f46c6a138a.tar.gz
gentoo-3d3570528f161a3f1086b351137d88f46c6a138a.tar.bz2
gentoo-3d3570528f161a3f1086b351137d88f46c6a138a.zip
x11-base/xorg-server: fix suid for installations without logind provider.
Closes: https://bugs.gentoo.org/830251 Signed-off-by: Piotr Karbowski <slashbeast@gentoo.org>
-rw-r--r--x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild)4
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild4
2 files changed, 4 insertions, 4 deletions
diff --git a/x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild b/x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild
index 3f1a181bcf83..b68bfec9fdd3 100644
--- a/x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -159,7 +159,7 @@ src_install() {
meson_src_install
# The meson build system does not support install-setuid
- if ! use systemd || ! use elogind; then
+ if ! use systemd && ! use elogind; then
if use suid; then
chmod u+s "${ED}"/usr/bin/Xorg
fi
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 05df79d40fe4..79b9ff4ad7a3 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -158,7 +158,7 @@ src_install() {
meson_src_install
# The meson build system does not support install-setuid
- if ! use systemd || ! use elogind; then
+ if ! use systemd && ! use elogind; then
if use suid; then
chmod u+s "${ED}"/usr/bin/Xorg
fi