forked from pool/monitoring-plugins
0257e1ccd8
Enhancements + 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_http check HTTPS web sites via proxies + check_http: add timeout to performance data as max value + check_http: report certificate expiry date in UTC + check_snmp: add IPv6 support + check_snmp's performance data now also includes warning/ critical thresholds + New check_snmp -N option to specify SNMPv3 context name + Let check_smtp's -D option imply -S + Let check_smtp's -e option match against the full SMTP response + check_dig: expected response is now case-insensitive + New check_mailq -s option which tells the plugin to use sudo(8) + New check_nt -l parameters: seconds|minutes|hours|days + New -W/-C option for check_ldap to check number of entries + check_users: add support for range thresholds + check_fping now auto-detects IPv6 addresses + check_radius now supports the radcli library + Support OpenSSL 1.1 Fixes + check_http: fix host header port handling + Let check_real terminate lines with CRLF when talking to the server, as mandated by RFC 2326 + Fix check_procs on HP-UX + check_smtp's -e/--expect option can now be combined with -S/--starttls + Fix incorrect performance data thresholds emitted by check_ups OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=27
57 lines
2.6 KiB
Diff
57 lines
2.6 KiB
Diff
Index: monitoring-plugins-2.2/plugins-root/Makefile.am
|
|
===================================================================
|
|
--- monitoring-plugins-2.2.orig/plugins-root/Makefile.am
|
|
+++ monitoring-plugins-2.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.2/plugins-root/Makefile.in
|
|
===================================================================
|
|
--- monitoring-plugins-2.2.orig/plugins-root/Makefile.in
|
|
+++ monitoring-plugins-2.2/plugins-root/Makefile.in
|
|
@@ -1344,7 +1344,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
|
|
@@ -1785,11 +1784,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:
|