From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1350047-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0B62B158086
for <garchives@archives.gentoo.org>; Thu, 16 Dec 2021 02:37:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id ED60B2BC007;
Thu, 16 Dec 2021 02:37:45 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 63F362BC007
for <gentoo-commits@lists.gentoo.org>; Thu, 16 Dec 2021 02:37:45 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BAFDF34367E
for <gentoo-commits@lists.gentoo.org>; Thu, 16 Dec 2021 02:37:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E35B024E
for <gentoo-commits@lists.gentoo.org>; Thu, 16 Dec 2021 02:37:41 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1639622242.fefef5fbb829b1b9c0713252713b7a8454766876.mattst88@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-base/xorg-server/xorg-server-9999.ebuild
X-VCS-Directories: x11-base/xorg-server/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: fefef5fbb829b1b9c0713252713b7a8454766876
X-VCS-Branch: master
Date: Thu, 16 Dec 2021 02:37:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e7c2683a-b3a2-4fe0-9e45-63aa396b2190
X-Archives-Hash: eba0ee94f462c08d8d4343c62cc6fa72
commit: fefef5fbb829b1b9c0713252713b7a8454766876
Author: Alan Swanson <reiver <AT> improbability <DOT> net>
AuthorDate: Fri Dec 3 12:25:06 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 02:37:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefef5fb
x11-base/xorg-server: Restore setuid for non-logind meson build
The meson build does not support the autotools build option
install-setuid and when not using systemd or logind the suid_wrapper is
not equivalent as it does not resolve tty or input device permissions
unless /etc/X11/Xwrapper.config is created with;
allowed_users = anybody
needs_root_rights = yes
In which case you can skip the wrapper as this would be the default
preference when using startx or xinit without systemd or logind from the
console or init scripts. So revert to previous autotools build
behaviour.
Closes: https://bugs.gentoo.org/828462
Closes: https://github.com/gentoo/gentoo/pull/23160
Signed-off-by: Alan Swanson <reiver <AT> improbability.net>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-base/xorg-server/xorg-server-9999.ebuild | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index f820f8cdff00..bb014071154e 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -149,7 +149,7 @@ src_configure() {
else
emesonargs+=(
-Dsystemd_logind=false
- $(meson_use suid suid_wrapper)
+ -Dsuid_wrapper=false
)
fi
@@ -162,6 +162,13 @@ src_install() {
#The new meson build system do not leave X symlink
ln -s Xorg "${ED}"/usr/bin/X
+ # The meson build system does not support install-setuid
+ if ! use systemd || ! use elogind; then
+ if use suid; then
+ chmod u+s "${ED}"/usr/bin/Xorg
+ fi
+ fi
+
if ! use xorg; then
rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \