xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5c95be38e5af28108d8c6c08dfe08d1dfcb7ed42
Author: Michał Górny <gentoo at mgorny.alt.pl>
Date:   Mon Jun 11 17:17:31 2018 -0400

    xfree86: Makefile shouldn't rely on superuser being named 'root'
    
    Change the 'chown' statement in Makefile.am to use the numeric UID
    of superuser instead of relying on the name 'root'.
    
    Bugzilla: https://bugs.freedesktop.org/27726
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Michał Górny <gentoo at mgorny.alt.pl>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 57c8b8dd4..9aeaea1a6 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -108,14 +108,14 @@ endif
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) Xorg$(EXEEXT) X)
 if INSTALL_SETUID
-	chown root $(DESTDIR)$(bindir)/Xorg
+	chown 0 $(DESTDIR)$(bindir)/Xorg
 	chmod u+s $(DESTDIR)$(bindir)/Xorg
 endif
 if SUID_WRAPPER
 	$(MKDIR_P) $(DESTDIR)$(SUID_WRAPPER_DIR)
 	mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg
 	${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/Xorg
-	-chown root $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap
+	-chown 0 $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap
 endif
 
 uninstall-local: