forked from pool/monitoring-plugins
2fc871a63d
- add patch comments to spec file as requested by rpmlint
- rebase all patches to current code stream
ENHANCEMENTS
+ check_snmp's performance data now also includes warning/critical
thresholds
+ New check_snmp "-N" option to specify SNMPv3 context name
+ New check_nt "-l" parameters: seconds|minutes|hours|days
+ New check_mailq -s option which tells the plugin to use sudo(8)
+ New -W/-C option for check_ldap to check number of entries (Gerhard Lausser)
+ The check_http -S/--ssl option now accepts the arguments "1.1" and "1.2"
to force TLSv1.1 and TLSv1.2 connections, respectively
+ The check_http -S/--ssl option now allows for specifying the desired
protocol with a "+" suffix to also accept newer versions
+ Let check_real terminate lines with CRLF when talking to the server, as
mandated by 2326
+ Fix check_procs on HP-UX
+ check_smtp's -e/--expect option can now be combined with -S/--starttls
WARNINGS
+ The format of the performance data emitted by check_mrtgtraf has been
changed to comply with the development guidelines
+ check_ssh now returns CRITICAL for protocol/version errors
+ If a plugin is invoked with -h/--help or -V/--version, the exit status
is now UNKNOWN
+ The superseded check_ntp.pl was removed, please use check_ntp_peer or
check_ntp_time instead
+ plugins.negate.validate_arguments.patch
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=21
57 lines
2.6 KiB
Diff
57 lines
2.6 KiB
Diff
Index: monitoring-plugins-2.1.2/plugins-root/Makefile.am
|
|
===================================================================
|
|
--- monitoring-plugins-2.1.2.orig/plugins-root/Makefile.am
|
|
+++ monitoring-plugins-2.1.2/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: monitoring-plugins-2.1.2/plugins-root/Makefile.in
|
|
===================================================================
|
|
--- monitoring-plugins-2.1.2.orig/plugins-root/Makefile.in
|
|
+++ monitoring-plugins-2.1.2/plugins-root/Makefile.in
|
|
@@ -1341,7 +1341,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
|
|
@@ -1782,11 +1781,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:
|