From: Karel Zak <kzak@redhat.com>
Date: Wed, 21 Jun 2017 09:12:04 +0000 (+0200)
Subject: build-sys: make chown usage more robust
X-Git-Tag: v2.31-rc1~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a65041b5ae9de5dc52d37a43367d64ab554964c0;p=thirdparty%2Futil-linux.git

build-sys: make chown usage more robust

* add --disable-makeinstall-chown to travis non-root mode

* use "if MAKEINSTALL_DO_SETUID" for chown root:root

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/.travis-functions.sh b/.travis-functions.sh
index ece05d409c..7b20e886c2 100755
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -42,6 +42,7 @@ function check_nonroot
 
 	xconfigure \
 		--disable-use-tty-group \
+		--disable-makeinstall-chown \
 		--enable-all-programs \
 		|| return
 	$MAKE || return
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index ac9819f808..67a0c98ecb 100644
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -229,8 +229,10 @@ test_logindefs_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS)
 
 install-exec-hook:
 if BUILD_SU
-if MAKEINSTALL_DO_SETUID
+if MAKEINSTALL_DO_CHOWN
 	chown root:root $(DESTDIR)$(bindir)/su
+endif
+if MAKEINSTALL_DO_SETUID
 	chmod 4755 $(DESTDIR)$(bindir)/su
 endif
 endif
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 6fbc517d24..754f1f44dc 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -289,15 +289,21 @@ umount_static_LDFLAGS = $(umount_LDFLAGS) -all-static
 umount_static_LDADD = $(umount_LDADD)
 endif
 
-if MAKEINSTALL_DO_SETUID
 install-exec-hook-mount:
+if MAKEINSTALL_DO_CHOWN
 	chown root:root $(DESTDIR)$(bindir)/mount
+endif
+if MAKEINSTALL_DO_SETUID
 	chmod 4755 $(DESTDIR)$(bindir)/mount
+endif
+if MAKEINSTALL_DO_CHOWN
 	chown root:root $(DESTDIR)$(bindir)/umount
+endif
+if MAKEINSTALL_DO_SETUID
 	chmod 4755 $(DESTDIR)$(bindir)/umount
+endif
 
 INSTALL_EXEC_HOOKS += install-exec-hook-mount
-endif
 endif # BUILD_MOUNT