1 |
commit: 92cc7c28132dd325318abd0f1150e96a9e631036 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 2 05:25:17 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 2 05:27:32 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92cc7c28 |
7 |
|
8 |
x11-base/xorg-server: Readd IUSE=suid |
9 |
|
10 |
Users are particularly unhappy about the inability to control whether |
11 |
the Xserver is installed with setuid or not. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/669648 |
14 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
15 |
|
16 |
x11-base/xorg-server/xorg-server-1.20.3.ebuild | 4 ++-- |
17 |
x11-base/xorg-server/xorg-server-9999.ebuild | 4 ++-- |
18 |
2 files changed, 4 insertions(+), 4 deletions(-) |
19 |
|
20 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild b/x11-base/xorg-server/xorg-server-1.20.3.ebuild |
21 |
index bd82494b526..b3a10716dcf 100644 |
22 |
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild |
23 |
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild |
24 |
@@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then |
25 |
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
26 |
fi |
27 |
|
28 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
29 |
+IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb" |
30 |
IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" |
31 |
|
32 |
CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
33 |
@@ -164,7 +164,7 @@ src_configure() { |
34 |
$(use_with systemd systemd-daemon) |
35 |
$(use_enable systemd systemd-logind) |
36 |
$(use_enable systemd suid-wrapper) |
37 |
- $(use_enable !systemd install-setuid) |
38 |
+ $(use_enable suid install-setuid) |
39 |
--enable-libdrm |
40 |
--sysconfdir="${EPREFIX}"/etc/X11 |
41 |
--localstatedir="${EPREFIX}"/var |
42 |
|
43 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
44 |
index 0baf77843d4..3c10d062348 100644 |
45 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
46 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
47 |
@@ -13,7 +13,7 @@ if [[ ${PV} != 9999* ]]; then |
48 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
49 |
fi |
50 |
|
51 |
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
52 |
+IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb" |
53 |
IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" |
54 |
|
55 |
CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
56 |
@@ -164,7 +164,7 @@ src_configure() { |
57 |
$(use_with systemd systemd-daemon) |
58 |
$(use_enable systemd systemd-logind) |
59 |
$(use_enable systemd suid-wrapper) |
60 |
- $(use_enable !systemd install-setuid) |
61 |
+ $(use_enable suid install-setuid) |
62 |
--enable-libdrm |
63 |
--sysconfdir="${EPREFIX}"/etc/X11 |
64 |
--localstatedir="${EPREFIX}"/var |