1 |
commit: 3d3570528f161a3f1086b351137d88f46c6a138a |
2 |
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 1 21:48:43 2022 +0000 |
4 |
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 1 21:51:01 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d357052 |
7 |
|
8 |
x11-base/xorg-server: fix suid for installations without logind provider. |
9 |
|
10 |
Closes: https://bugs.gentoo.org/830251 |
11 |
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> |
12 |
|
13 |
.../{xorg-server-21.1.2-r3.ebuild => xorg-server-21.1.2-r4.ebuild} | 4 ++-- |
14 |
x11-base/xorg-server/xorg-server-9999.ebuild | 4 ++-- |
15 |
2 files changed, 4 insertions(+), 4 deletions(-) |
16 |
|
17 |
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 |
18 |
similarity index 98% |
19 |
rename from x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild |
20 |
rename to x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild |
21 |
index 3f1a181bcf83..b68bfec9fdd3 100644 |
22 |
--- a/x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild |
23 |
+++ b/x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2021 Gentoo Authors |
26 |
+# Copyright 1999-2022 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
EAPI=7 |
30 |
@@ -159,7 +159,7 @@ src_install() { |
31 |
meson_src_install |
32 |
|
33 |
# The meson build system does not support install-setuid |
34 |
- if ! use systemd || ! use elogind; then |
35 |
+ if ! use systemd && ! use elogind; then |
36 |
if use suid; then |
37 |
chmod u+s "${ED}"/usr/bin/Xorg |
38 |
fi |
39 |
|
40 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
41 |
index 05df79d40fe4..79b9ff4ad7a3 100644 |
42 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
43 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
44 |
@@ -1,4 +1,4 @@ |
45 |
-# Copyright 1999-2021 Gentoo Authors |
46 |
+# Copyright 1999-2022 Gentoo Authors |
47 |
# Distributed under the terms of the GNU General Public License v2 |
48 |
|
49 |
EAPI=7 |
50 |
@@ -158,7 +158,7 @@ src_install() { |
51 |
meson_src_install |
52 |
|
53 |
# The meson build system does not support install-setuid |
54 |
- if ! use systemd || ! use elogind; then |
55 |
+ if ! use systemd && ! use elogind; then |
56 |
if use suid; then |
57 |
chmod u+s "${ED}"/usr/bin/Xorg |
58 |
fi |