Репозитории ALT
| S: | 2.2.1-alt1 |
| 5.1: | 1.4.13-alt2.1 |
| 4.1: | 1.4.12-alt1.M41.1 |
| 4.0: | 1.4.5-alt1.1 |
| 3.0: | 1.4-alt1 |
Группа :: Мониторинг
Пакет: nagios-plugins
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: nagios-plugins-1.4.14-alt-makefile.patch
Скачать
Скачать
diff --git a/nagios-plugins/plugins-root/Makefile.am b/nagios-plugins/plugins-root/Makefile.am
index b5f5519..04e262a 100644
--- a/nagios-plugins/plugins-root/Makefile.am
+++ b/nagios-plugins/plugins-root/Makefile.am
@@ -46,32 +46,13 @@ INSTALL_SUID = \
p=$$f; \
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
install-root: $(noinst_PROGRAMS)
@$(INSTALL_SUID)
install-exec-local: $(noinst_PROGRAMS)
- @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
- rm -f $$TMPFILE; \
- echo > $$TMPFILE; \
- ## See if we can create a setuid root executable in $(libexecdir).
- ## If not, then don't even try to install setuid plugins.
- can_create_suid_root_executable=no; \
- chown root $$TMPFILE > /dev/null 2>&1 \
- && 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"; \
- echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
- fi
+ $(INSTALL_SUID);
# /* Author Coreutils team sub-citation */
diff --git a/nagios-plugins/plugins-root/Makefile.in b/nagios-plugins/plugins-root/Makefile.in
index df2e7c7..0cf9182 100644
--- a/nagios-plugins/plugins-root/Makefile.in
+++ b/nagios-plugins/plugins-root/Makefile.in
@@ -1006,10 +1006,6 @@ INSTALL_SUID = \
p=$$f; \
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
@@ -1391,20 +1387,7 @@ install-root: $(noinst_PROGRAMS)
@$(INSTALL_SUID)
install-exec-local: $(noinst_PROGRAMS)
- @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
- rm -f $$TMPFILE; \
- echo > $$TMPFILE; \
- can_create_suid_root_executable=no; \
- chown root $$TMPFILE > /dev/null 2>&1 \
- && 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"; \
- echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
- fi
+ $(INSTALL_SUID)
clean-local:
rm -f NP-VERSION-FILE