commit: 07d1aac432064957ea5b8e62b911811ae32bd3be Author: Nick Sarnie <commendsarnex <AT> gmail <DOT> com> AuthorDate: Sat Sep 23 21:51:24 2017 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Oct 21 01:09:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d1aac4
x11-base/xorg-server: Add support for suid-wrapper, fix bug #556834 Signed-off-by: Nick Sarnie <commendsarnex <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/5780 x11-base/xorg-server/metadata.xml | 1 + ...{xorg-server-9999.ebuild => xorg-server-1.19.5-r1.ebuild} | 12 ++++++++++-- x11-base/xorg-server/xorg-server-9999.ebuild | 4 +++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index 8c8c243082e..b4fe8ce9df4 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -9,6 +9,7 @@ <flag name="dmx">Build the Distributed Multiheaded X server</flag> <flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag> <flag name="kdrive">Build the kdrive X servers</flag> + <flag name="suid-wrapper">Build suid-root wrapper for legacy driver support on rootless xserver systems</flag> <flag name="tslib">Build with tslib support for touchscreen devices</flag> <flag name="unwind">Enable libunwind usage for backtraces</flag> <flag name="xcsecurity">Build Security extension</flag> diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild similarity index 92% copy from x11-base/xorg-server/xorg-server-9999.ebuild copy to x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild index 90f6ef88dff..345e15587d8 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild @@ -9,10 +9,10 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"; DESCRIPTION="X.Org X servers" SLOT="0/${PV}" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid suid-wrapper systemd tslib +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) @@ -67,6 +67,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-10.3.4-r1 ) + tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) unwind? ( sys-libs/libunwind ) wayland? ( @@ -132,6 +133,7 @@ PDEPEND=" REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) + ^^ ( suid suid-wrapper ) xephyr? ( kdrive )" #UPSTREAMED_PATCHES=( @@ -143,6 +145,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch # needed for new eselect-opengl, bug #541232 "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch + "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 ) pkg_pretend() { @@ -170,7 +173,12 @@ src_configure() { $(use_enable dmx) $(use_enable glamor) $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) $(use_enable suid install-setuid) + $(use_enable suid-wrapper) + $(use_enable tslib) $(use_enable unwind libunwind) $(use_enable wayland xwayland) $(use_enable !minimal record) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 90f6ef88dff..fcd0924e2e2 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -12,7 +12,7 @@ SLOT="0/${PV}" KEYWORDS="" IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid suid-wrapper systemd +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) @@ -132,6 +132,7 @@ PDEPEND=" REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) + ^^ ( suid suid-wrapper ) xephyr? ( kdrive )" #UPSTREAMED_PATCHES=( @@ -171,6 +172,7 @@ src_configure() { $(use_enable glamor) $(use_enable kdrive) $(use_enable suid install-setuid) + $(use_enable suid-wrapper) $(use_enable unwind libunwind) $(use_enable wayland xwayland) $(use_enable !minimal record)
