diff options
| author |   Nick Sarnie <commendsarnex@gmail.com> | 2017-10-21 11:27:22 -0400 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2017-10-21 10:12:05 -0700 |
| commit | ca17c5f407cb5264369aafd39ead709e46777dc4 (patch) | |
| tree | 217c32061c8dd14626e65588fcd5a96a48a80794 /x11-base | |
| parent | dev-libs/librelp: stable 1.2.14 for sparc, bug #627718 (thanks to Rolf Eike B... (diff) | |
| download | gentoo-ca17c5f407cb5264369aafd39ead709e46777dc4.tar.gz gentoo-ca17c5f407cb5264369aafd39ead709e46777dc4.tar.bz2 gentoo-ca17c5f407cb5264369aafd39ead709e46777dc4.zip | |
x11-base/xorg-server: Remove suid and suid-wrapper USEs, and build suid-wrapper by default
suid-wrapper does the right thing
Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/5999
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/metadata.xml | 1 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index b4fe8ce9df4f..8c8c243082ed 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -9,7 +9,6 @@ <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-1.19.5-r1.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild index 345e15587d87..596d09b80ce1 100644 --- a/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild @@ -12,7 +12,7 @@ SLOT="0/${PV}" 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 suid-wrapper systemd tslib +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux systemd tslib +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) @@ -133,7 +133,6 @@ PDEPEND=" REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) - ^^ ( suid suid-wrapper ) xephyr? ( kdrive )" #UPSTREAMED_PATCHES=( @@ -176,8 +175,6 @@ src_configure() { $(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) @@ -197,6 +194,7 @@ src_configure() { $(use_with systemd systemd-daemon) $(use_enable systemd systemd-logind) --enable-libdrm + --enable-suid-wrapper --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var --with-fontrootdir="${EPREFIX}"/usr/share/fonts diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index fcd0924e2e25..adbcb3477a04 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 suid-wrapper systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) @@ -132,7 +132,6 @@ PDEPEND=" REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) - ^^ ( suid suid-wrapper ) xephyr? ( kdrive )" #UPSTREAMED_PATCHES=( @@ -171,8 +170,6 @@ src_configure() { $(use_enable dmx) $(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) @@ -191,6 +188,7 @@ src_configure() { $(use_with systemd systemd-daemon) $(use_enable systemd systemd-logind) --enable-libdrm + --enable-suid-wrapper --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var --with-fontrootdir="${EPREFIX}"/usr/share/fonts |