[PATCH xserver] xfree86: Makefile shouldn't rely on superuser being named 'root'

Peter Hutterer peter.hutterer at who-t.net
Tue Jun 12 06:23:20 UTC 2018


On Mon, Jun 11, 2018 at 05:17:31PM -0400, Adam Jackson wrote:
> From: Michał Górny <gentoo at mgorny.alt.pl>
> 
> 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>

Cheers,
   Peter

>  hw/xfree86/Makefile.am | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
> index 57c8b8dd45..9aeaea1a66 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:
> -- 
> 2.17.0
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list