commit: 3d3570528f161a3f1086b351137d88f46c6a138a Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> AuthorDate: Sat Jan 1 21:48:43 2022 +0000 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> CommitDate: Sat Jan 1 21:51:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d357052
x11-base/xorg-server: fix suid for installations without logind provider. Closes: https://bugs.gentoo.org/830251 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> .../{xorg-server-21.1.2-r3.ebuild => xorg-server-21.1.2-r4.ebuild} | 4 ++-- x11-base/xorg-server/xorg-server-9999.ebuild | 4 ++-- 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 similarity index 98% rename from x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild rename to 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
