File nagios-plugins-1.4.6-no_chown.patch of Package nagios-plugins

Overview Repositories Revisions Requests Users Attributes Meta

File nagios-plugins-1.4.6-no_chown.patch of Package nagios-plugins (Revision 40bdb60959bbf89fdb9351add7aa4dd3)

Currently displaying revision 40bdb60959bbf89fdb9351add7aa4dd3 , Show latest

Index: plugins-root/Makefile.am
===================================================================
--- plugins-root/Makefile.am.orig
+++ plugins-root/Makefile.am
@@ -47,7 +47,6 @@ INSTALL_SUID = \
 	echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
 	$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
 	echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
-	chown root $(DESTDIR)$(libexecdir)/$$p; \
 	echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
 	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
 	done
@@ -66,11 +65,12 @@ install-exec-local: $(noinst_PROGRAMS)
 	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
 	  && can_create_suid_root_executable=yes; \
 	rm -f $$TMPFILE; \
-	if test $$can_create_suid_root_executable = yes; then \
-	  $(INSTALL_SUID); \
+	$(INSTALL_SUID); \
+	if test $$can_create_suid_root_executable != yes; then \
 	else \
-	  echo "WARNING: insufficient access; not installing setuid plugins"; \
+	  echo "WARNING: insufficient access; not installing plugins as setuid"; \
 	  echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
+	  echo "NOTE: or fix this in your packaging (like the specfile)"; \
 	fi
 
 # /* Author Coreutils team sub-citation */
Index: plugins-root/Makefile.in
===================================================================
--- plugins-root/Makefile.in.orig
+++ plugins-root/Makefile.in
@@ -1015,7 +1015,6 @@ INSTALL_SUID = \
 	echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
 	$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
 	echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
-	chown root $(DESTDIR)$(libexecdir)/$$p; \
 	echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
 	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
 	done
@@ -1450,11 +1449,11 @@ install-exec-local: $(noinst_PROGRAMS)
 	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
 	  && can_create_suid_root_executable=yes; \
 	rm -f $$TMPFILE; \
-	if test $$can_create_suid_root_executable = yes; then \
-	  $(INSTALL_SUID); \
-	else \
-	  echo "WARNING: insufficient access; not installing setuid plugins"; \
+	$(INSTALL_SUID); \
+	if test $$can_create_suid_root_executable != yes; then \
+	  echo "WARNING: insufficient access; not installing plugins as setuid"; \
 	  echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
+	  echo "NOTE: or fix this in your packaging (specfile or alike)"; \
 	fi
 
 clean-local:

Places

File nagios-plugins-1.4.6-no_chown.patch of Package nagios-plugins (Revision 40bdb60959bbf89fdb9351add7aa4dd3)

Places