From: Matt Turner Date: Fri, 2 Nov 2018 05:25:17 +0000 (-0700) Subject: x11-base/xorg-server: Readd IUSE=suid X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=92cc7c28132dd325318abd0f1150e96a9e631036;p=gentoo.git x11-base/xorg-server: Readd IUSE=suid Users are particularly unhappy about the inability to control whether the Xserver is installed with setuid or not. Closes: https://bugs.gentoo.org/669648 Signed-off-by: Matt Turner --- diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild b/x11-base/xorg-server/xorg-server-1.20.3.ebuild index bd82494b526a..b3a10716dcff 100644 --- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" fi -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb" IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 @@ -164,7 +164,7 @@ src_configure() { $(use_with systemd systemd-daemon) $(use_enable systemd systemd-logind) $(use_enable systemd suid-wrapper) - $(use_enable !systemd install-setuid) + $(use_enable suid install-setuid) --enable-libdrm --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 0baf77843d4d..3c10d062348c 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} != 9999* ]]; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" fi -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb" IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" CDEPEND=">=app-eselect/eselect-opengl-1.3.0 @@ -164,7 +164,7 @@ src_configure() { $(use_with systemd systemd-daemon) $(use_enable systemd systemd-logind) $(use_enable systemd suid-wrapper) - $(use_enable !systemd install-setuid) + $(use_enable suid install-setuid) --enable-libdrm --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var