From 2fc871a63dc6e2d8c3e954d8be8929d40abf68e953280ce8cc1175f96ada0b43 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Mon, 26 Oct 2015 16:38:39 +0000 Subject: [PATCH] - remove monitoring-plugins-postgresql.patch : fixed upstream - 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 --- monitoring-plugins-1.4.6-no_chown.patch | 12 +++---- monitoring-plugins-2.1.1-check_logfile.patch | 6 ++-- monitoring-plugins-2.1.2.tar.bz2 | 3 ++ monitoring-plugins-postgresql.patch | 12 ------- ...ins-too_few_arguments_for_check_disk.patch | 6 ++-- ...g-plugins-wrong_return_in_check_swap.patch | 6 ++-- monitoring-plugins.changes | 33 +++++++++++++++++-- ...check_hpjd.c-64bit-portability-issue.patch | 6 ++-- ...ring-plugins.check_snmp.arrayaddress.patch | 8 ++--- ...ng-plugins.check_snmp.snmpv3-context.patch | 26 +++++++-------- monitoring-plugins.spec | 25 +++++++------- 11 files changed, 80 insertions(+), 63 deletions(-) create mode 100644 monitoring-plugins-2.1.2.tar.bz2 delete mode 100644 monitoring-plugins-postgresql.patch diff --git a/monitoring-plugins-1.4.6-no_chown.patch b/monitoring-plugins-1.4.6-no_chown.patch index 63913e4..f3bba19 100644 --- a/monitoring-plugins-1.4.6-no_chown.patch +++ b/monitoring-plugins-1.4.6-no_chown.patch @@ -1,7 +1,7 @@ -Index: plugins-root/Makefile.am +Index: monitoring-plugins-2.1.2/plugins-root/Makefile.am =================================================================== ---- plugins-root/Makefile.am.orig -+++ 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; \ @@ -26,10 +26,10 @@ Index: plugins-root/Makefile.am fi # /* Author Coreutils team sub-citation */ -Index: plugins-root/Makefile.in +Index: monitoring-plugins-2.1.2/plugins-root/Makefile.in =================================================================== ---- plugins-root/Makefile.in.orig -+++ 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; \ diff --git a/monitoring-plugins-2.1.1-check_logfile.patch b/monitoring-plugins-2.1.1-check_logfile.patch index cf5559d..ef46958 100644 --- a/monitoring-plugins-2.1.1-check_logfile.patch +++ b/monitoring-plugins-2.1.1-check_logfile.patch @@ -1,7 +1,7 @@ -Index: monitoring-plugins-2.1.1/plugins-scripts/check_log.sh +Index: monitoring-plugins-2.1.2/plugins-scripts/check_log.sh =================================================================== ---- monitoring-plugins-2.1.1.orig/plugins-scripts/check_log.sh -+++ monitoring-plugins-2.1.1/plugins-scripts/check_log.sh +--- monitoring-plugins-2.1.2.orig/plugins-scripts/check_log.sh ++++ monitoring-plugins-2.1.2/plugins-scripts/check_log.sh @@ -115,27 +115,27 @@ while test -n "$1"; do exit $STATE_OK ;; diff --git a/monitoring-plugins-2.1.2.tar.bz2 b/monitoring-plugins-2.1.2.tar.bz2 new file mode 100644 index 0000000..21f0f94 --- /dev/null +++ b/monitoring-plugins-2.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8b369f901c4442d890ff2650b76c7ff7e3aa9de93359f01abdc6d881227c765 +size 2207739 diff --git a/monitoring-plugins-postgresql.patch b/monitoring-plugins-postgresql.patch deleted file mode 100644 index a700cd3..0000000 --- a/monitoring-plugins-postgresql.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: plugins/check_pgsql.c -=================================================================== ---- plugins/check_pgsql.c.orig -+++ plugins/check_pgsql.c -@@ -36,6 +36,7 @@ const char *email = "devel@monitoring-pl - #include "utils.h" - - #include "netutils.h" -+#include - #include - #include - diff --git a/monitoring-plugins-too_few_arguments_for_check_disk.patch b/monitoring-plugins-too_few_arguments_for_check_disk.patch index 2a29c0e..22654e4 100644 --- a/monitoring-plugins-too_few_arguments_for_check_disk.patch +++ b/monitoring-plugins-too_few_arguments_for_check_disk.patch @@ -1,7 +1,7 @@ -Index: plugins/check_disk.c +Index: monitoring-plugins-2.1.2/plugins/check_disk.c =================================================================== ---- plugins/check_disk.c.orig -+++ plugins/check_disk.c +--- monitoring-plugins-2.1.2.orig/plugins/check_disk.c ++++ monitoring-plugins-2.1.2/plugins/check_disk.c @@ -1002,7 +1002,7 @@ get_stats (struct parameter_list *p, str if (verbose >= 3) printf("Group %s: adding %llu blocks sized %llu, (%s) used_units=%g free_units=%g total_units=%g fsu_blocksize=%llu mult=%llu\n", diff --git a/monitoring-plugins-wrong_return_in_check_swap.patch b/monitoring-plugins-wrong_return_in_check_swap.patch index 03c5537..1179cc0 100644 --- a/monitoring-plugins-wrong_return_in_check_swap.patch +++ b/monitoring-plugins-wrong_return_in_check_swap.patch @@ -29,10 +29,10 @@ SWAP CRITICAL - 0% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0 Additional info: https://bugzilla.redhat.com/512559 -Index: monitoring-plugins-2.1.1/plugins/check_swap.c +Index: monitoring-plugins-2.1.2/plugins/check_swap.c =================================================================== ---- monitoring-plugins-2.1.1.orig/plugins/check_swap.c -+++ monitoring-plugins-2.1.1/plugins/check_swap.c +--- monitoring-plugins-2.1.2.orig/plugins/check_swap.c ++++ monitoring-plugins-2.1.2/plugins/check_swap.c @@ -125,7 +125,7 @@ main (int argc, char **argv) free_swap_mb += dskfree_mb; if (allswaps) { diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index a4b7fef..d8b2e2b 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -1,11 +1,39 @@ +------------------------------------------------------------------- +Mon Oct 26 15:57:49 UTC 2015 - lars@linux-schulserver.de + +- remove monitoring-plugins-postgresql.patch : fixed upstream +- add patch comments to spec file as requested by rpmlint +- rebase all patches to current code stream + ------------------------------------------------------------------- Fri Oct 16 18:09:24 UTC 2015 - mardnh@gmx.de - update to 2.1.2: + 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 FIXES + + 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 + Fix incorrect performance data thresholds emitted by check_ups - + Fix check_dhcp's option parsing to not crash with certain arguments - + Fix check_snmp using correct timeout + 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 - use source url ------------------------------------------------------------------- @@ -66,6 +94,7 @@ Sat Dec 27 12:41:01 UTC 2014 - lars@linux-schulserver.de + Add performance data to check_file_age - removed upstreamed patches: + monitoring-plugins-1.4.14-ntpd.patch + + plugins.negate.validate_arguments.patch + monitoring-plugins.check_ntp.c-64bit-portability-issue.patch - adapted monitoring-plugins-1.4.14-check_log.patch to new version: + monitoring-plugins-2.1.1-check_logfile.patch diff --git a/monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch b/monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch index c54478f..3b5414d 100644 --- a/monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch +++ b/monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch @@ -1,7 +1,7 @@ -Index: monitoring-plugins-2.1.1/plugins/check_hpjd.c +Index: monitoring-plugins-2.1.2/plugins/check_hpjd.c =================================================================== ---- monitoring-plugins-2.1.1.orig/plugins/check_hpjd.c -+++ monitoring-plugins-2.1.1/plugins/check_hpjd.c +--- monitoring-plugins-2.1.2.orig/plugins/check_hpjd.c ++++ monitoring-plugins-2.1.2/plugins/check_hpjd.c @@ -66,7 +66,7 @@ void print_usage (void); char *community = NULL; diff --git a/monitoring-plugins.check_snmp.arrayaddress.patch b/monitoring-plugins.check_snmp.arrayaddress.patch index 24f257f..a8dc7c7 100644 --- a/monitoring-plugins.check_snmp.arrayaddress.patch +++ b/monitoring-plugins.check_snmp.arrayaddress.patch @@ -1,8 +1,8 @@ -Index: plugins/check_snmp.c +Index: monitoring-plugins-2.1.2/plugins/check_snmp.c =================================================================== ---- plugins/check_snmp.c.orig -+++ plugins/check_snmp.c -@@ -567,7 +567,7 @@ main (int argc, char **argv) +--- monitoring-plugins-2.1.2.orig/plugins/check_snmp.c ++++ monitoring-plugins-2.1.2/plugins/check_snmp.c +@@ -566,7 +566,7 @@ main (int argc, char **argv) len = sizeof(perfstr)-strlen(perfstr)-1; strncat(perfstr, show, len>ptr-show ? ptr-show : len); diff --git a/monitoring-plugins.check_snmp.snmpv3-context.patch b/monitoring-plugins.check_snmp.snmpv3-context.patch index c8136cc..00f690e 100644 --- a/monitoring-plugins.check_snmp.snmpv3-context.patch +++ b/monitoring-plugins.check_snmp.snmpv3-context.patch @@ -1,8 +1,8 @@ -Index: monitoring-plugins-2.1.1/plugins/check_snmp.c +Index: monitoring-plugins-2.1.2/plugins/check_snmp.c =================================================================== ---- monitoring-plugins-2.1.1.orig/plugins/check_snmp.c -+++ monitoring-plugins-2.1.1/plugins/check_snmp.c -@@ -104,6 +104,8 @@ int errcode, excode; +--- monitoring-plugins-2.1.2.orig/plugins/check_snmp.c ++++ monitoring-plugins-2.1.2/plugins/check_snmp.c +@@ -103,6 +103,8 @@ int errcode, excode; char *server_address = NULL; char *community = NULL; @@ -11,7 +11,7 @@ Index: monitoring-plugins-2.1.1/plugins/check_snmp.c char **authpriv = NULL; char *proto = NULL; char *seclevel = NULL; -@@ -128,6 +130,7 @@ size_t nunits = 0; +@@ -127,6 +129,7 @@ size_t nunits = 0; size_t unitv_size = OID_COUNT_STEP; int numoids = 0; int numauthpriv = 0; @@ -19,7 +19,7 @@ Index: monitoring-plugins-2.1.1/plugins/check_snmp.c int verbose = 0; int usesnmpgetnext = FALSE; char *warning_thresholds = NULL; -@@ -297,8 +300,8 @@ main (int argc, char **argv) +@@ -296,8 +299,8 @@ main (int argc, char **argv) snmpcmd = strdup (PATH_TO_SNMPGET); } @@ -30,7 +30,7 @@ Index: monitoring-plugins-2.1.1/plugins/check_snmp.c command_line[0] = snmpcmd; command_line[1] = strdup ("-Le"); command_line[2] = strdup ("-t"); -@@ -310,23 +313,27 @@ main (int argc, char **argv) +@@ -309,23 +312,27 @@ main (int argc, char **argv) command_line[8] = "-v"; command_line[9] = strdup (proto); @@ -64,7 +64,7 @@ Index: monitoring-plugins-2.1.1/plugins/check_snmp.c if (verbose) printf ("%s\n", cl_hidden_auth); -@@ -646,6 +653,7 @@ process_arguments (int argc, char **argv +@@ -645,6 +652,7 @@ process_arguments (int argc, char **argv {"retries", required_argument, 0, 'e'}, {"miblist", required_argument, 0, 'm'}, {"protocol", required_argument, 0, 'P'}, @@ -72,7 +72,7 @@ Index: monitoring-plugins-2.1.1/plugins/check_snmp.c {"seclevel", required_argument, 0, 'L'}, {"secname", required_argument, 0, 'U'}, {"authproto", required_argument, 0, 'a'}, -@@ -675,7 +683,7 @@ process_arguments (int argc, char **argv +@@ -674,7 +682,7 @@ process_arguments (int argc, char **argv } while (1) { @@ -81,7 +81,7 @@ Index: monitoring-plugins-2.1.1/plugins/check_snmp.c longopts, &option); if (c == -1 || c == EOF) -@@ -713,6 +721,9 @@ process_arguments (int argc, char **argv +@@ -712,6 +720,9 @@ process_arguments (int argc, char **argv case 'P': /* SNMP protocol version */ proto = optarg; break; @@ -91,7 +91,7 @@ Index: monitoring-plugins-2.1.1/plugins/check_snmp.c case 'L': /* security level */ seclevel = optarg; break; -@@ -960,6 +971,13 @@ validate_arguments () +@@ -959,6 +970,13 @@ validate_arguments () authpriv[1] = strdup (community); } else if ( strcmp (proto, "3") == 0 ) { /* snmpv3 args */ @@ -105,7 +105,7 @@ Index: monitoring-plugins-2.1.1/plugins/check_snmp.c if (seclevel == NULL) xasprintf(&seclevel, "noAuthNoPriv"); -@@ -1103,6 +1121,8 @@ print_help (void) +@@ -1102,6 +1120,8 @@ print_help (void) printf (" %s\n", _("Use SNMP GETNEXT instead of SNMP GET")); printf (" %s\n", "-P, --protocol=[1|2c|3]"); printf (" %s\n", _("SNMP protocol version")); @@ -114,7 +114,7 @@ Index: monitoring-plugins-2.1.1/plugins/check_snmp.c printf (" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]"); printf (" %s\n", _("SNMPv3 securityLevel")); printf (" %s\n", "-a, --authproto=[MD5|SHA]"); -@@ -1210,6 +1230,6 @@ print_usage (void) +@@ -1209,6 +1229,6 @@ print_usage (void) printf ("%s -H -o [-w warn_range] [-c crit_range]\n",progname); printf ("[-C community] [-s string] [-r regex] [-R regexi] [-t timeout] [-e retries]\n"); printf ("[-l label] [-u units] [-p port-number] [-d delimiter] [-D output-delimiter]\n"); diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec index 439921e..723a637 100644 --- a/monitoring-plugins.spec +++ b/monitoring-plugins.spec @@ -23,7 +23,7 @@ Summary: The Monitoring Plug-Ins License: GPL-2.0+ and GPL-3.0 Group: System/Monitoring Url: http://monitoring-plugins.org/ -Source0: https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Source11: %{name}-permissions Source12: %{name}-README.SUSE @@ -48,21 +48,19 @@ Source31: usr.lib.nagios.plugins.check_load Source32: usr.lib.nagios.plugins.check_procs Source33: usr.lib.nagios.plugins.check_swap Source34: usr.lib.nagios.plugins.check_users -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +# PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces) Patch1: %{name}-2.1.1-check_logfile.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +# PATCH-FIX-OPENSUSE do not use chown in Makefile (not possible when building as normal user) Patch6: %{name}-1.4.6-no_chown.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +# PATCH-FIX-UPSTREAM Use correct pointer Patch11: %{name}.check_snmp.arrayaddress.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches -Patch12: %{name}-postgresql.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +# PATCH-FIX-UPSTREAM print out all arguments out a Group if in verbose mode Patch15: %{name}-too_few_arguments_for_check_disk.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +# PATCH-FIX-UPSTREAM see https://bugzilla.redhat.com/512559 Patch116: %{name}-wrong_return_in_check_swap.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +# PATCH-FIX-UPSTREAM pass correct arguments before context and authpriv options Patch117: %{name}.check_snmp.snmpv3-context.patch -# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +# PATCH-FIX-UPSTREAM port should be integer, not character Patch118: %{name}.check_hpjd.c-64bit-portability-issue.patch BuildRequires: bind-utils BuildRequires: dhcp-devel @@ -1061,10 +1059,9 @@ EOF done %patch1 -p1 -%patch6 -%patch11 -%patch12 -%patch15 -p0 +%patch6 -p1 +%patch11 -p1 +%patch15 -p1 # Debian patches %patch116 -p1 %patch117 -p1