From c6dafb590da1409c06b3aad399f26ab83b29e8f334ee5d87fde528884ff858ef Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Thu, 2 Dec 2021 15:16:38 +0000 Subject: [PATCH 1/5] remove link to Factory OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=93 --- monitoring-plugins.changes | 7 +++++++ monitoring-plugins.spec | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index 443bee3..e22b8de 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 2 14:54:25 UTC 2021 - Lars Vogdt + +- remove monitoring-plugins-2.3.1-check_snmp_hang_on_STDERR_workaround.patch + the patch just reverts the problem, if you get more than 64K on + stdout + ------------------------------------------------------------------- Fri Nov 19 09:35:19 UTC 2021 - Lars Vogdt diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec index 87a9982..30f6b8f 100644 --- a/monitoring-plugins.spec +++ b/monitoring-plugins.spec @@ -86,8 +86,6 @@ Patch125: monitoring-plugins-2.3.1-check_ssh.patch Patch126: monitoring-plugins-2.3.1-check_ssh.t_-_improve_testing.patch # PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/issues/1375 Patch127: monitoring-plugins-2.3.1-check_dhcp_-_detect_rogue_dhcp_servers.patch -# PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/issues/1706 -Patch128: monitoring-plugins-2.3.1-check_snmp_hang_on_STDERR_workaround.patch BuildRequires: bind-utils BuildRequires: dhcp-devel BuildRequires: fping @@ -1141,7 +1139,6 @@ done %patch125 -p1 %patch126 -p1 %patch127 -p1 -%patch128 -p1 find -type f -exec chmod 644 {} + %build From fd8ac840ff6d9d6476bd2c927a942505baa909f7f40094528b8d7f5c8e3a3e80 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Fri, 3 Dec 2021 08:47:04 +0000 Subject: [PATCH 2/5] - removed the following, either upstreamed or integrated in other patches: + monitoring-plugins-wrong_return_in_check_swap.patch + monitoring-plugins-check_swap-fix_comment.patch + monitoring-plugins-check_swap-return_unknown.patch + monitoring-plugins-check_swap-fix-n.patch - include upstream fixes for check_swap - add patch monitoring-plugins-check_swap-fix_comment.patch simply fix the plugin name in the comment - monitoring-plugins-check_swap-fix_zero_output.patch improve the output if the swap has zero size - monitoring-plugins-check_swap-return_unknown.patch use unknown exit code for help/version in plugins - add patch monitoring-plugins-check_swap-fix-n.patch check_swap fix behaviour for "-n" if 0 free swap is left from git commit 6995b510759cf531d70745b7d0c6e8a0d9010b06 (bug#1175828) - updated context in monitoring-plugins-wrong_return_in_check_swap.patch OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=94 --- monitoring-plugins.changes | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index e22b8de..d72025d 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Dec 3 08:37:09 UTC 2021 - Lars Vogdt + +- removed the following, either upstreamed or integrated in other patches: + + monitoring-plugins-wrong_return_in_check_swap.patch + + monitoring-plugins-check_swap-fix_comment.patch + + monitoring-plugins-check_swap-return_unknown.patch + + monitoring-plugins-check_swap-fix-n.patch + ------------------------------------------------------------------- Thu Dec 2 14:54:25 UTC 2021 - Lars Vogdt @@ -505,6 +514,23 @@ Sun Aug 10 17:11:48 UTC 2014 - lars@linux-schulserver.de - remove nagios-devel from BuildRequires +------------------------------------------------------------------- +Mon Sep 14 10:57:53 CEST 2020 - ro@suse.de + +- include upstream fixes for check_swap +- add patch monitoring-plugins-check_swap-fix_comment.patch + simply fix the plugin name in the comment +- monitoring-plugins-check_swap-fix_zero_output.patch + improve the output if the swap has zero size +- monitoring-plugins-check_swap-return_unknown.patch + use unknown exit code for help/version in plugins +- add patch monitoring-plugins-check_swap-fix-n.patch + check_swap fix behaviour for "-n" if 0 free swap is left + from git commit 6995b510759cf531d70745b7d0c6e8a0d9010b06 + (bug#1175828) +- updated context in + monitoring-plugins-wrong_return_in_check_swap.patch + ------------------------------------------------------------------- Tue Jul 22 13:50:10 UTC 2014 - lars@linux-schulserver.de From 46faef6ff19599205a1814e97053511047c0b62e3b4a10fca3f56f3f593a8fa7 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Fri, 3 Dec 2021 09:21:55 +0000 Subject: [PATCH 3/5] - fix changelog order OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=95 --- monitoring-plugins.changes | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index d72025d..2ce7a95 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -509,11 +509,6 @@ Sat Dec 27 12:41:01 UTC 2014 - lars@linux-schulserver.de - newer openSUSE versions use rsyslog: require virtual syslog package for build -------------------------------------------------------------------- -Sun Aug 10 17:11:48 UTC 2014 - lars@linux-schulserver.de - -- remove nagios-devel from BuildRequires - ------------------------------------------------------------------- Mon Sep 14 10:57:53 CEST 2020 - ro@suse.de @@ -531,6 +526,11 @@ Mon Sep 14 10:57:53 CEST 2020 - ro@suse.de - updated context in monitoring-plugins-wrong_return_in_check_swap.patch +------------------------------------------------------------------- +Sun Aug 10 17:11:48 UTC 2014 - lars@linux-schulserver.de + +- remove nagios-devel from BuildRequires + ------------------------------------------------------------------- Tue Jul 22 13:50:10 UTC 2014 - lars@linux-schulserver.de From 6911247b56876fcb23e81f53b2e6b0a0e7ae86970d567f87c2c536bc9f2a02b6 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Thu, 16 Dec 2021 15:29:14 +0000 Subject: [PATCH 4/5] - include upstream fixes for check_swap - add patch monitoring-plugins-check_swap-fix_comment.patch simply fix the plugin name in the comment - monitoring-plugins-check_swap-fix_zero_output.patch improve the output if the swap has zero size - monitoring-plugins-check_swap-return_unknown.patch use unknown exit code for help/version in plugins - updated context in OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=96 --- monitoring-plugins.changes | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index 2ce7a95..8776680 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -234,11 +234,18 @@ Mon Sep 14 13:39:18 CEST 2020 - ro@suse.de ------------------------------------------------------------------- Mon Sep 14 10:57:53 CEST 2020 - ro@suse.de +- include upstream fixes for check_swap +- add patch monitoring-plugins-check_swap-fix_comment.patch + simply fix the plugin name in the comment +- monitoring-plugins-check_swap-fix_zero_output.patch + improve the output if the swap has zero size +- monitoring-plugins-check_swap-return_unknown.patch + use unknown exit code for help/version in plugins - add patch monitoring-plugins-check_swap-fix-n.patch check_swap fix behaviour for "-n" if 0 free swap is left from git commit 6995b510759cf531d70745b7d0c6e8a0d9010b06 (bug#1175828) -- updated context in +- updated context in monitoring-plugins-wrong_return_in_check_swap.patch ------------------------------------------------------------------- @@ -509,23 +516,6 @@ Sat Dec 27 12:41:01 UTC 2014 - lars@linux-schulserver.de - newer openSUSE versions use rsyslog: require virtual syslog package for build -------------------------------------------------------------------- -Mon Sep 14 10:57:53 CEST 2020 - ro@suse.de - -- include upstream fixes for check_swap -- add patch monitoring-plugins-check_swap-fix_comment.patch - simply fix the plugin name in the comment -- monitoring-plugins-check_swap-fix_zero_output.patch - improve the output if the swap has zero size -- monitoring-plugins-check_swap-return_unknown.patch - use unknown exit code for help/version in plugins -- add patch monitoring-plugins-check_swap-fix-n.patch - check_swap fix behaviour for "-n" if 0 free swap is left - from git commit 6995b510759cf531d70745b7d0c6e8a0d9010b06 - (bug#1175828) -- updated context in - monitoring-plugins-wrong_return_in_check_swap.patch - ------------------------------------------------------------------- Sun Aug 10 17:11:48 UTC 2014 - lars@linux-schulserver.de From b4f87ed0edcaf1c9333505c85fb2fb8baa49c4aeef4710e8f3fc5fc6d0b7b9d8 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Thu, 16 Dec 2021 17:51:54 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=97 --- ...1-check_snmp_hang_on_STDERR_workaround.patch | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 monitoring-plugins-2.3.1-check_snmp_hang_on_STDERR_workaround.patch diff --git a/monitoring-plugins-2.3.1-check_snmp_hang_on_STDERR_workaround.patch b/monitoring-plugins-2.3.1-check_snmp_hang_on_STDERR_workaround.patch deleted file mode 100644 index 13a3fc8..0000000 --- a/monitoring-plugins-2.3.1-check_snmp_hang_on_STDERR_workaround.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: monitoring-plugins-2.3.1/lib/utils_cmd.c -=================================================================== ---- monitoring-plugins-2.3.1.orig/lib/utils_cmd.c -+++ monitoring-plugins-2.3.1/lib/utils_cmd.c -@@ -355,10 +355,10 @@ cmd_run_array (char *const *argv, output - if ((fd = _cmd_open (argv, pfd_out, pfd_err)) == -1) - die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), argv[0]); - -- if (out) -- out->lines = _cmd_fetch_output (pfd_out[0], out, flags); - if (err) - err->lines = _cmd_fetch_output (pfd_err[0], err, flags); -+ if (out) -+ out->lines = _cmd_fetch_output (pfd_out[0], out, flags); - - return _cmd_close (fd); - }