From 867171ad0a2a85b41a7f83e6ec5d6c2db73e8605 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Mon, 1 Sep 2025 14:56:53 -0500 Subject: [PATCH] Fix uutils install incompatibility The install binary provided by uutils-coreutils does not permit the mode to be specified twice. `$(INSTALL_DATA)` resolves to `/usr/bin/install -c -m 644` on my system, which causes the `install-tmpfiles` target to run `/usr/bin/install -c -m 644 -m 640` which causes `install` to throw an error. As there is no security benefit to removing the read permission from all for tmpfiles configs just remove the `-m 640` to fix that. While we're at it also use `$(INSTALL_DATA)` in a couple other places that could use it. --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 74a08cb7..e0e07c84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,7 +87,7 @@ BUILT_SOURCES+=\ $(top_builddir)/%.roff: %.adoc $(MKDIR_P) $$(dirname $@) $(A2X) -v -f manpage $^ -D $(top_builddir)/$$(dirname $@) - $(INSTALL) -m 644 $(top_builddir)/$(@:.roff=) $(top_builddir)/$@ + $(INSTALL_DATA) $(top_builddir)/$(@:.roff=) $(top_builddir)/$@ endif install-data-hook: install-daemon-conf install-systemd-service install-data-dbus install-tmpfiles @@ -110,7 +110,7 @@ EXTRA_DIST+=usbguard-tmpfiles.conf install-tmpfiles: mkdir -p ${DESTDIR}$(prefix)/lib/tmpfiles.d/ - $(INSTALL_DATA) -m 640 ${srcdir}/usbguard-tmpfiles.conf ${DESTDIR}$(prefix)/lib/tmpfiles.d/usbguard.conf + $(INSTALL_DATA) ${srcdir}/usbguard-tmpfiles.conf ${DESTDIR}$(prefix)/lib/tmpfiles.d/usbguard.conf uninstall-tmpfiles: rm ${DESTDIR}$(prefix)/lib/tmpfiles.d/usbguard.conf @@ -142,7 +142,7 @@ usbguard.service: $(top_srcdir)/usbguard.service.in install-systemd-service: $(top_builddir)/usbguard.service $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL) -m 644 $(top_builddir)/usbguard.service \ + $(INSTALL_DATA) $(top_builddir)/usbguard.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/usbguard.service uninstall-systemd-service: