diff --git a/monitoring-plugins-wrong_return_in_check_swap.patch b/monitoring-plugins-wrong_return_in_check_swap.patch deleted file mode 100644 index 9fd9203..0000000 --- a/monitoring-plugins-wrong_return_in_check_swap.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f3e6c9663369d011b241c6fb2c8fd5312f98cacf Mon Sep 17 00:00:00 2001 -From: Jan ONDREJ -Date: Thu, 7 Oct 2010 17:28:48 +0400 -Subject: [PATCH 6/6] Prevent check_swap from returning OK, if no swap activated - -My swap was not activated on boot for unknown reason and nagios does not -report this as a problem. Here is an example: - -[root@kecom ~]# rpm -q nagios-plugins -nagios-plugins-1.4.13-11.fc10.i386 -[root@kecom ~]# /usr/lib/nagios/plugins/check_swap -w 80% -c 40% -c 1 -w 2 -SWAP CRITICAL - 100% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0 - -If there is no swap and users is trying to test percentage of free swap, -consider 0 MB free swap space as problem, or of free/total raises division -by zero, then set percentage to 0%, not to 100%. - -Steps to Reproduce: -1. make sure, your swap is empty or it's usage is not large -2. swapoff -a -3. /usr/lib/nagios/plugins/check_swap -w 80% -c 40% - -Actual results: -SWAP OK - 100% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0 - -Expected results: -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.3.1/plugins/check_swap.c -=================================================================== ---- monitoring-plugins-2.3.1.orig/plugins/check_swap.c -+++ monitoring-plugins-2.3.1/plugins/check_swap.c -@@ -125,7 +125,7 @@ main (int argc, char **argv) - free_swap_mb += dskfree_mb; - if (allswaps) { - if (dsktotal_mb == 0) -- percent=100.0; -+ percent = 0.0; - else - percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb)); - result = max_state (result, check_swap (percent, dskfree_mb, dsktotal_mb)); diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index 5eec613..8e7cc6d 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 30 18:19:23 CET 2023 - ro@suse.de + +- drop unused patches + monitoring-plugins-wrong_return_in_check_swap.patch + monitoring-plugins.check_snmp.arrayaddress.patch + ------------------------------------------------------------------- Tue Oct 24 18:42:59 CEST 2023 - ro@suse.de diff --git a/monitoring-plugins.check_snmp.arrayaddress.patch b/monitoring-plugins.check_snmp.arrayaddress.patch deleted file mode 100644 index 705f11b..0000000 --- a/monitoring-plugins.check_snmp.arrayaddress.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: monitoring-plugins-2.3.1/plugins/check_snmp.c -=================================================================== ---- monitoring-plugins-2.3.1.orig/plugins/check_snmp.c -+++ monitoring-plugins-2.3.1/plugins/check_snmp.c -@@ -576,7 +576,7 @@ main (int argc, char **argv) - len = sizeof(perfstr)-strlen(perfstr)-1; - strncat(perfstr, show, len>ptr-show ? ptr-show : len); - -- if (type) -+ if (type[0]) - strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1); - - if (warning_thresholds) {