ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Karel Zak 2017-06-21 11:12:04 +02:00
parent 6f1507f135
commit a65041b5ae
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis-functions.sh
View File

@ -42,6 +42,7 @@ function check_nonroot
xconfigure \ xconfigure \
--disable-use-tty-group \ --disable-use-tty-group \
--disable-makeinstall-chown \
--enable-all-programs \ --enable-all-programs \
|| return || return
$MAKE || return $MAKE || return

4
login-utils/Makemodule.am
View File

@ -229,8 +229,10 @@ test_logindefs_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS)
install-exec-hook: install-exec-hook:
if BUILD_SU if BUILD_SU
if MAKEINSTALL_DO_SETUID if MAKEINSTALL_DO_CHOWN
chown root:root $(DESTDIR)$(bindir)/su chown root:root $(DESTDIR)$(bindir)/su
endif
if MAKEINSTALL_DO_SETUID
chmod 4755 $(DESTDIR)$(bindir)/su chmod 4755 $(DESTDIR)$(bindir)/su
endif endif
endif endif

10
sys-utils/Makemodule.am
View File

@ -289,15 +289,21 @@ umount_static_LDFLAGS = $(umount_LDFLAGS) -all-static
umount_static_LDADD = $(umount_LDADD) umount_static_LDADD = $(umount_LDADD)
endif endif
if MAKEINSTALL_DO_SETUID
install-exec-hook-mount: install-exec-hook-mount:
if MAKEINSTALL_DO_CHOWN
chown root:root $(DESTDIR)$(bindir)/mount chown root:root $(DESTDIR)$(bindir)/mount
endif
if MAKEINSTALL_DO_SETUID
chmod 4755 $(DESTDIR)$(bindir)/mount chmod 4755 $(DESTDIR)$(bindir)/mount
endif
if MAKEINSTALL_DO_CHOWN
chown root:root $(DESTDIR)$(bindir)/umount chown root:root $(DESTDIR)$(bindir)/umount
endif
if MAKEINSTALL_DO_SETUID
chmod 4755 $(DESTDIR)$(bindir)/umount chmod 4755 $(DESTDIR)$(bindir)/umount
endif
INSTALL_EXEC_HOOKS += install-exec-hook-mount INSTALL_EXEC_HOOKS += install-exec-hook-mount
endif
endif # BUILD_MOUNT endif # BUILD_MOUNT