- change version to 2.3~alpha.$date.$commit

update to current git as of 20200520T233014.cadac85e
  changes summarized
  * detect unreachable dns service in nslookup output
  * check_curl: host_name may be null
  * update test parameter according to check_http
  * check_curl: use CURLOPT_RESOLVE to fix connecting to the right ip
  * workaround for issue #1550 - better use "ping -4" instead
    of "ping" if supported
  * Use size_t instead of int when calling sysctl(3)
  * check_tcp: add --sni
  * Fix timeout_interval declarations
  * check_curl: NSS, parse more date formats from certificate (in
    -C cert check)
  * check_curl: more tolerant CN= parsing when checking
    certificates (hit on Centos 8)
  * setting no_body to TRUE when we have a HEAD request
  * some LIBCURL_VERSION checks around HTTP/2 feature
  * added --http-version option to check_curl to choose HTTP
  * improved curlhelp_parse_statusline to handle both HTTP/1.x
    and HTTP/2
  * check_curl: updates embedded picohttpparser to newest git
    version
  * setting progname of check_curl plugin to check_curl (at least
    for now)
  * Allow mariadbclient to be used for check_mysql
  * fix maxfd being zero
  * include -P switch in help
  * check_swap: repaired "-n" behaviour
  * improve command examples for 'at least' processes

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=72

_service

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="disabled">
+    <param name="versionformat">2.3~alpha.%ci.%h</param>
+    <param name="url">https://github.com/monitoring-plugins/monitoring-plugins.git</param>
+    <param name="scm">git</param>
+    <param name="revision">master</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+  <service name="tar" mode="disabled"/>
+  <service name="recompress" mode="disabled">
+    <param name="compression">xz</param>
+    <param name="file">*.tar</param>
+  </service>
+</services>
+

monitoring-plugins-1.4.6-no_chown.patch

@@ -26,31 +26,3 @@ Index: monitoring-plugins-2.2/plugins-root/Makefile.am
  	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:

monitoring-plugins-2.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:070c2a1bd29a3280c16c7f0c52df6f8dbb0fce3a0e495f31eabe06b04f6fde78
-size 2140102

monitoring-plugins-2.3~alpha.20200520T233014.cadac85e.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34e90e390323dc545d3b86664695b99d04d520db68dd5d5e89937b3375856350
+size 6768653

monitoring-plugins-2.3~alpha.20200520T233014.cadac85e.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d6d2a56cd2c638504263215c10d19ed1db3ef8746704741919bc8221c9c88b0
+size 1797632

monitoring-plugins-check_swap-fix-n.patch

@@ -1,79 +0,0 @@
-From 6995b510759cf531d70745b7d0c6e8a0d9010b06 Mon Sep 17 00:00:00 2001
-From: Christopher Odenbach <odenbach@uni-paderborn.de>
-Date: Wed, 31 May 2017 14:15:47 +0200
-Subject: [PATCH] repaired "-n" behaviour. If run with "-n ok" a host which ran
- completely out of swap space would return "ok" which is not desired. It
- should only return "ok" if there is no swap space configured at all.
-
-
-diff --git a/plugins/check_swap.c b/plugins/check_swap.c
-index 4d5a4071..0ff0c770 100644
---- a/plugins/check_swap.c
-+++ b/plugins/check_swap.c
-@@ -51,7 +51,7 @@ const char *email = "devel@monitoring-plugins.org";
- # define SWAP_CONVERSION 1
- #endif
- 
--int check_swap (int usp, float free_swap_mb);
-+int check_swap (int usp, float free_swap_mb, float total_swap_mb);
- int process_arguments (int argc, char **argv);
- int validate_arguments (void);
- void print_usage (void);
-@@ -128,7 +128,7 @@ main (int argc, char **argv)
- 					percent=100.0;
- 				else
- 					percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
--				result = max_state (result, check_swap (percent, dskfree_mb));
-+				result = max_state (result, check_swap (percent, dskfree_mb, dsktotal_mb));
- 				if (verbose)
- 					xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
- 			}
-@@ -227,7 +227,7 @@ main (int argc, char **argv)
- 			free_swap_mb += dskfree_mb;
- 			if (allswaps) {
- 				percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
--				result = max_state (result, check_swap (percent, dskfree_mb));
-+				result = max_state (result, check_swap (percent, dskfree_mb, dsktotal_mb));
- 				if (verbose)
- 					xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
- 			}
-@@ -289,7 +289,7 @@ main (int argc, char **argv)
- 
- 		if(allswaps && dsktotal_mb > 0){
- 			percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
--			result = max_state (result, check_swap (percent, dskfree_mb));
-+			result = max_state (result, check_swap (percent, dskfree_mb, dsktotal_mb));
- 			if (verbose) {
- 				xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
- 			}
-@@ -328,7 +328,7 @@ main (int argc, char **argv)
- 
- 		if(allswaps && dsktotal_mb > 0){
- 			percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
--			result = max_state (result, check_swap (percent, dskfree_mb));
-+			result = max_state (result, check_swap (percent, dskfree_mb, dsktotal_mb));
- 			if (verbose) {
- 				xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
- 			}
-@@ -355,7 +355,7 @@ main (int argc, char **argv)
- 		status = "- Swap is either disabled, not present, or of zero size. ";
- 	}
- 
--	result = max_state (result, check_swap (percent_used, free_swap_mb));
-+	result = max_state (result, check_swap (percent_used, free_swap_mb, total_swap_mb));
- 	printf (_("SWAP %s - %d%% free (%d MB out of %d MB) %s|"),
- 			state_text (result),
- 			(100 - percent_used), (int) free_swap_mb, (int) total_swap_mb, status);
-@@ -372,10 +372,10 @@ main (int argc, char **argv)
- 
- 
- int
--check_swap (int usp, float free_swap_mb)
-+check_swap (int usp, float free_swap_mb, float total_swap_mb)
- {
- 
--	if (!free_swap_mb) return no_swap_state;
-+	if (!total_swap_mb) return no_swap_state;
- 
- 	int result = STATE_UNKNOWN;
- 	float free_swap = free_swap_mb * (1024 * 1024);		/* Convert back to bytes as warn and crit specified in bytes */

monitoring-plugins.changes

@@ -1,3 +1,62 @@
+-------------------------------------------------------------------
+Mon Sep 14 13:39:18 CEST 2020 - ro@suse.de
+
+- change version to 2.3~alpha.$date.$commit
+  update to current git as of 20200520T233014.cadac85e
+  changes summarized
+  * detect unreachable dns service in nslookup output
+  * check_curl: host_name may be null
+  * update test parameter according to check_http
+  * check_curl: use CURLOPT_RESOLVE to fix connecting to the right ip
+  * workaround for issue #1550 - better use "ping -4" instead
+    of "ping" if supported
+  * Use size_t instead of int when calling sysctl(3)
+  * check_tcp: add --sni
+  * Fix timeout_interval declarations
+  * check_curl: NSS, parse more date formats from certificate (in
+    -C cert check)
+  * check_curl: more tolerant CN= parsing when checking
+    certificates (hit on Centos 8)
+  * setting no_body to TRUE when we have a HEAD request
+  * some LIBCURL_VERSION checks around HTTP/2 feature
+  * added --http-version option to check_curl to choose HTTP
+  * improved curlhelp_parse_statusline to handle both HTTP/1.x
+    and HTTP/2
+  * check_curl: updates embedded picohttpparser to newest git
+    version
+  * setting progname of check_curl plugin to check_curl (at least
+    for now)
+  * Allow mariadbclient to be used for check_mysql
+  * fix maxfd being zero
+  * include -P switch in help
+  * check_swap: repaired "-n" behaviour
+  * improve command examples for 'at least' processes
+  * check_mysql: Allow sockets to be specified to -H
+  * Adding packages-warning option to check_apt plugin
+  * Adding print top consuming processes option to check_load
+  * check_snmp: make calcualtion of timeout value in help output more clear
+  * [check_disk] add support to display inodes usage in perfdata
+  * check_by_ssh: fix child process leak on timeouts
+  * check_icmp: Add IPv6 support
+  * check_dns: fix typo in parameter description
+  * Also support the --show-body/-B flag when --expect is used
+  * check_dns: improve support for checking multiple addresses
+  * check_hpjd: Added -D option to disable warning on 'out of paper'
+  * check_icmp: Do not overwrite -4,-6 on lookup
+  * check_icmp: emit error if multiple protocol version
+  * check_icmp: move opts string into a variable
+  * check_cluster.c: Added data argument validation.
+  * check_icmp: Correctly set address_family on lookup
+  * check_icmp: process protocol version args first
+  * check_icmp: Add IPv6 support
+
+- monitoring-plugins-1.4.6-no_chown.patch
+  drop hunk for Makefile.in (not present in git)
+- monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch
+  update context
+- deleted monitoring-plugins-check_swap-fix-n.patch
+  drop patch, is upstream
+
 -------------------------------------------------------------------
 Mon Sep 14 10:57:53 CEST 2020 - ro@suse.de
 

monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch

@@ -2,12 +2,12 @@ Index: monitoring-plugins-2.2/plugins/check_hpjd.c
 ===================================================================
 --- monitoring-plugins-2.2.orig/plugins/check_hpjd.c
 +++ monitoring-plugins-2.2/plugins/check_hpjd.c
-@@ -66,7 +66,7 @@ void print_usage (void);
+@@ -66,7 +66,7 @@
  
  char *community = NULL;
  char *address = NULL;
 -char *port = NULL;
-+int port = NULL;
++int  port = NULL;
+ int  check_paper_out = 1;
  
  int
- main (int argc, char **argv)

monitoring-plugins.obsinfo

@@ -0,0 +1,5 @@
+name: monitoring-plugins
+version: 2.3~alpha.20200520T233014.cadac85e
+mtime: 1590010214
+commit: cadac85e12d48d662ff39bfc9f5feb5601af1485
+

monitoring-plugins.spec

@@ -17,13 +17,13 @@
 
 
 Name:           monitoring-plugins
-Version:        2.2
+Version:        2.3~alpha.20200520T233014.cadac85e
 Release:        0
 Summary:        The Monitoring Plug-Ins
 License:        GPL-2.0-or-later AND GPL-3.0-only
 Group:          System/Monitoring
 URL:            http://monitoring-plugins.org/
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
 Source11:       %{name}-permissions
 Source12:       %{name}-README.SUSE
@@ -74,8 +74,6 @@ Patch15:        %{name}-too_few_arguments_for_check_disk.patch
 Patch118:       %{name}.check_hpjd.c-64bit-portability-issue.patch
 # PATCH-FIX-UPSTREAM kstreitova@suse.com -- fix build with MariaDB 10.2
 Patch119:       monitoring-plugins-2.2-mariadb_102_build_fix.patch
-# PATCH-FIX-UPSTREAM git 6995b510759cf531d70745b7d0c6e8a0d9010b06
-Patch120:       monitoring-plugins-check_swap-fix-n.patch
 # PATCH-FIX-UPSTREAM see https://bugzilla.redhat.com/512559
 Patch121:       %{name}-wrong_return_in_check_swap.patch
 BuildRequires:  bind-utils
@@ -1118,7 +1116,6 @@ done
 # Debian patches
 %patch118 -p1
 %patch119 -p1
-%patch120 -p1
 %patch121 -p1
 find -type f -exec chmod 644 {} +