forked from pool/xorg-x11-server
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
From: Egbert Eich <eich@suse.de>
|
||
|
|
Date: Tue Apr 12 09:22:40 2016 +0200
|
||
|
|
Subject: [PATCH]Install: Avoid failure on wrapper installation
|
||
|
|
Patch-mainline: never
|
||
|
|
References:
|
||
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
||
|
|
|
||
|
|
- Check for SUID_WRAPPER_DIR being identical to bindir
|
||
|
|
before copying script.
|
||
|
|
- Check whether user is root before doing a chmod/chown
|
||
|
|
|
||
|
|
Signed-off-by: Egbert Eich <eich@suse.de>
|
||
|
|
---
|
||
|
|
hw/xfree86/Makefile.am | 7 ++++---
|
||
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
|
||
|
|
index 85bd0be..461e818 100644
|
||
|
|
--- a/hw/xfree86/Makefile.am
|
||
|
|
+++ b/hw/xfree86/Makefile.am
|
||
|
|
@@ -108,9 +108,10 @@ if INSTALL_SETUID
|
||
|
|
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
|
||
|
|
+ mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg 2>/dev/null && target=Xorg; \
|
||
|
|
+ ${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/$${target}
|
||
|
|
+ -test "x$UID" = "x0" -o "x$EUID" = "x0" && \
|
||
|
|
+ chown root $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap
|
||
|
|
endif
|
||
|
|
|
||
|
|
uninstall-local:
|