rpm/monitoring-plugins
SHA256
1
0
Fork 0
forked from pool/monitoring-plugins
Code Pull Requests Activity

Accepting request 835369 from home:dstoecker:oldos

Browse Source 
- Drop check_ping_fix_ip4.patch (obsolete, conflicts with upstream fix)

Upstream used another approach to fix this issue and now these two conflict. Drop my fix...

OBS-URL: https://build.opensuse.org/request/show/835369
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=80
This commit is contained in:
Dirk Stoecker 2020-09-19 10:42:34 +00:00 committed by Git OBS Bridge
parent 8ff1572ff9
commit 3183ea96ca
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
check_ping_fix_ip4.patch
View File

@ -1,15 +0,0 @@
diff -ur monitoring-plugins-2.2/plugins/check_ping.c monitoring-plugins-2.2_fix/plugins/check_ping.c
--- monitoring-plugins-2.2/plugins/check_ping.c 2016-11-29 09:45:08.000000000 +0100
+++ monitoring-plugins-2.2_fix/plugins/check_ping.c 2019-04-09 14:09:57.574380368 +0200
@@ -128,6 +128,11 @@
#else
xasprintf (&cmd, rawcmd, addresses[i], max_packets);
#endif
+ if (address_family == AF_INET) {
+ free(rawcmd);
+ rawcmd = cmd;
+ xasprintf (&cmd, "%s -4", rawcmd);
+ }
if (verbose >= 2)
printf ("CMD: %s\n", cmd);

5
monitoring-plugins.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 18 08:19:35 UTC 2020 - Dirk Stoecker <opensuse@dstoecker.de>
- Drop check_ping_fix_ip4.patch (obsolete, conflicts with upstream fix)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 14 13:39:18 CEST 2020 - ro@suse.de Mon Sep 14 13:39:18 CEST 2020 - ro@suse.de

5
monitoring-plugins.spec
View File

@ -63,8 +63,6 @@ Source60: nrpe-check_ups
# PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces) # PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces)
Patch1: %{name}-2.1.1-check_logfile.patch Patch1: %{name}-2.1.1-check_logfile.patch
# PATCH-FIX-UPSTREAM Allow to ping IPv4 with check_ping again for dual stack hosts: https://github.com/monitoring-plugins/monitoring-plugins/issues/1550 # PATCH-FIX-UPSTREAM Allow to ping IPv4 with check_ping again for dual stack hosts: https://github.com/monitoring-plugins/monitoring-plugins/issues/1550
Patch2: check_ping_fix_ip4.patch
# PATCH-FIX-OPENSUSE do not use chown in Makefile (not possible when building as normal user)
Patch6: %{name}-1.4.6-no_chown.patch Patch6: %{name}-1.4.6-no_chown.patch
# PATCH-FIX-UPSTREAM Use correct pointer # PATCH-FIX-UPSTREAM Use correct pointer
Patch11: %{name}.check_snmp.arrayaddress.patch Patch11: %{name}.check_snmp.arrayaddress.patch
@ -1120,9 +1118,6 @@ EOF
done done
%patch1 -p1 %patch1 -p1
%if 0%{?suse_version} >= 1500
%patch2 -p1
%endif
%patch6 -p1 %patch6 -p1
%patch11 -p1 %patch11 -p1
%patch15 -p1 %patch15 -p1