| 1 |
commit: 07d1aac432064957ea5b8e62b911811ae32bd3be |
| 2 |
Author: Nick Sarnie <commendsarnex <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Sep 23 21:51:24 2017 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 21 01:09:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d1aac4 |
| 7 |
|
| 8 |
x11-base/xorg-server: Add support for suid-wrapper, fix bug #556834 |
| 9 |
|
| 10 |
Signed-off-by: Nick Sarnie <commendsarnex <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/5780 |
| 12 |
|
| 13 |
x11-base/xorg-server/metadata.xml | 1 + |
| 14 |
...{xorg-server-9999.ebuild => xorg-server-1.19.5-r1.ebuild} | 12 ++++++++++-- |
| 15 |
x11-base/xorg-server/xorg-server-9999.ebuild | 4 +++- |
| 16 |
3 files changed, 14 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml |
| 19 |
index 8c8c243082e..b4fe8ce9df4 100644 |
| 20 |
--- a/x11-base/xorg-server/metadata.xml |
| 21 |
+++ b/x11-base/xorg-server/metadata.xml |
| 22 |
@@ -9,6 +9,7 @@ |
| 23 |
<flag name="dmx">Build the Distributed Multiheaded X server</flag> |
| 24 |
<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag> |
| 25 |
<flag name="kdrive">Build the kdrive X servers</flag> |
| 26 |
+ <flag name="suid-wrapper">Build suid-root wrapper for legacy driver support on rootless xserver systems</flag> |
| 27 |
<flag name="tslib">Build with tslib support for touchscreen devices</flag> |
| 28 |
<flag name="unwind">Enable libunwind usage for backtraces</flag> |
| 29 |
<flag name="xcsecurity">Build Security extension</flag> |
| 30 |
|
| 31 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild |
| 32 |
similarity index 92% |
| 33 |
copy from x11-base/xorg-server/xorg-server-9999.ebuild |
| 34 |
copy to x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild |
| 35 |
index 90f6ef88dff..345e15587d8 100644 |
| 36 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 37 |
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild |
| 38 |
@@ -9,10 +9,10 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" |
| 39 |
|
| 40 |
DESCRIPTION="X.Org X servers" |
| 41 |
SLOT="0/${PV}" |
| 42 |
-KEYWORDS="" |
| 43 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 44 |
|
| 45 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 46 |
-IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" |
| 47 |
+IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid suid-wrapper systemd tslib +udev unwind xcsecurity" |
| 48 |
|
| 49 |
CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
| 50 |
!libressl? ( dev-libs/openssl:0= ) |
| 51 |
@@ -67,6 +67,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
| 52 |
>=x11-libs/libXext-1.0.5 |
| 53 |
>=media-libs/mesa-10.3.4-r1 |
| 54 |
) |
| 55 |
+ tslib? ( >=x11-libs/tslib-1.0 ) |
| 56 |
udev? ( >=virtual/udev-150 ) |
| 57 |
unwind? ( sys-libs/libunwind ) |
| 58 |
wayland? ( |
| 59 |
@@ -132,6 +133,7 @@ PDEPEND=" |
| 60 |
REQUIRED_USE="!minimal? ( |
| 61 |
|| ( ${IUSE_SERVERS} ) |
| 62 |
) |
| 63 |
+ ^^ ( suid suid-wrapper ) |
| 64 |
xephyr? ( kdrive )" |
| 65 |
|
| 66 |
#UPSTREAMED_PATCHES=( |
| 67 |
@@ -143,6 +145,7 @@ PATCHES=( |
| 68 |
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 69 |
# needed for new eselect-opengl, bug #541232 |
| 70 |
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
| 71 |
+ "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 |
| 72 |
) |
| 73 |
|
| 74 |
pkg_pretend() { |
| 75 |
@@ -170,7 +173,12 @@ src_configure() { |
| 76 |
$(use_enable dmx) |
| 77 |
$(use_enable glamor) |
| 78 |
$(use_enable kdrive) |
| 79 |
+ $(use_enable kdrive kdrive-kbd) |
| 80 |
+ $(use_enable kdrive kdrive-mouse) |
| 81 |
+ $(use_enable kdrive kdrive-evdev) |
| 82 |
$(use_enable suid install-setuid) |
| 83 |
+ $(use_enable suid-wrapper) |
| 84 |
+ $(use_enable tslib) |
| 85 |
$(use_enable unwind libunwind) |
| 86 |
$(use_enable wayland xwayland) |
| 87 |
$(use_enable !minimal record) |
| 88 |
|
| 89 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 90 |
index 90f6ef88dff..fcd0924e2e2 100644 |
| 91 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 92 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 93 |
@@ -12,7 +12,7 @@ SLOT="0/${PV}" |
| 94 |
KEYWORDS="" |
| 95 |
|
| 96 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 97 |
-IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" |
| 98 |
+IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid suid-wrapper systemd +udev unwind xcsecurity" |
| 99 |
|
| 100 |
CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
| 101 |
!libressl? ( dev-libs/openssl:0= ) |
| 102 |
@@ -132,6 +132,7 @@ PDEPEND=" |
| 103 |
REQUIRED_USE="!minimal? ( |
| 104 |
|| ( ${IUSE_SERVERS} ) |
| 105 |
) |
| 106 |
+ ^^ ( suid suid-wrapper ) |
| 107 |
xephyr? ( kdrive )" |
| 108 |
|
| 109 |
#UPSTREAMED_PATCHES=( |
| 110 |
@@ -171,6 +172,7 @@ src_configure() { |
| 111 |
$(use_enable glamor) |
| 112 |
$(use_enable kdrive) |
| 113 |
$(use_enable suid install-setuid) |
| 114 |
+ $(use_enable suid-wrapper) |
| 115 |
$(use_enable unwind libunwind) |
| 116 |
$(use_enable wayland xwayland) |
| 117 |
$(use_enable !minimal record) |
Archives