Hello community, here is the log from the commit of package monitoring-plugins for openSUSE:Factory checked in at 2020-09-21 17:42:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monitoring-plugins (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins" Mon Sep 21 17:42:29 2020 rev:17 rq:835552 version:2.3~alpha.20200520T233014.cadac85e Changes: -------- --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins.changes 2019-07-16 08:41:47.775027178 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.4249/monitoring-plugins.changes 2020-09-21 17:44:38.584981997 +0200 @@ -1,0 +2,77 @@ +Fri Sep 18 08:19:35 UTC 2020 - Dirk Stoecker <opens...@dstoecker.de> + +- Drop check_ping_fix_ip4.patch (obsolete, conflicts with upstream fix) + +------------------------------------------------------------------- +Mon Sep 14 13:39:18 CEST 2020 - r...@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 +- drop explicit attr in filelist for check_host and check_rta_multi + as they are symlinks to check_icmp +- add new subpackage monitoring-plugins-uptime + +------------------------------------------------------------------- +Mon Sep 14 10:57:53 CEST 2020 - r...@suse.de + +- 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 + +------------------------------------------------------------------- Old: ---- check_ping_fix_ip4.patch monitoring-plugins-2.2.tar.bz2 New: ---- _service monitoring-plugins-2.3~alpha.20200520T233014.cadac85e.obscpio monitoring-plugins-2.3~alpha.20200520T233014.cadac85e.tar.xz monitoring-plugins.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monitoring-plugins.spec ++++++ --- /var/tmp/diff_new_pack.s8U53f/_old 2020-09-21 17:44:45.328988352 +0200 +++ /var/tmp/diff_new_pack.s8U53f/_new 2020-09-21 17:44:45.332988356 +0200 @@ -1,7 +1,7 @@ # # spec file for package monitoring-plugins # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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 +URL: http://monitoring-plugins.org/ +Source0: %{name}-%{version}.tar.xz Source1: %{name}-rpmlintrc Source11: %{name}-permissions Source12: %{name}-README.SUSE @@ -63,19 +63,17 @@ # PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces) 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 -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 # PATCH-FIX-UPSTREAM Use correct pointer Patch11: %{name}.check_snmp.arrayaddress.patch # PATCH-FIX-UPSTREAM print out all arguments out a Group if in verbose mode Patch15: %{name}-too_few_arguments_for_check_disk.patch -# PATCH-FIX-UPSTREAM see https://bugzilla.redhat.com/512559 -Patch116: %{name}-wrong_return_in_check_swap.patch # PATCH-FIX-UPSTREAM port should be integer, not character Patch118: %{name}.check_hpjd.c-64bit-portability-issue.patch # PATCH-FIX-UPSTREAM kstreit...@suse.com -- fix build with MariaDB 10.2 Patch119: monitoring-plugins-2.2-mariadb_102_build_fix.patch +# PATCH-FIX-UPSTREAM see https://bugzilla.redhat.com/512559 +Patch121: %{name}-wrong_return_in_check_swap.patch BuildRequires: bind-utils BuildRequires: dhcp-devel BuildRequires: fping @@ -83,9 +81,12 @@ PreReq: permissions %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake BuildRequires: iputils BuildRequires: libdbi-devel BuildRequires: libsmbclient-devel +BuildRequires: libtool BuildRequires: mysql-devel BuildRequires: nagios-rpm-macros BuildRequires: net-snmp-devel @@ -292,6 +293,7 @@ Recommends: %{name}-time Recommends: %{name}-ups Recommends: %{name}-ups_alarm +Recommends: %{name}-uptime Recommends: %{name}-users Recommends: %{name}-wave Recommends: %{name}-zypper @@ -1045,6 +1047,15 @@ Network UPS Tools from www.networkupstools.org must be running for this plugin to work. +%package uptime +Summary: Test the uptime of the system +Group: System/Monitoring +Provides: nagios-plugins-ups = %{version} +Obsoletes: nagios-plugins-ups <= 1.5 + +%description uptime +This plugin tests the uptime on the system using /proc/uptime + %package users Summary: Check number of users currently logged in Group: System/Monitoring @@ -1107,20 +1118,20 @@ done %patch1 -p1 -%if 0%{?suse_version} >= 1500 -%patch2 -p1 -%endif %patch6 -p1 %patch11 -p1 %patch15 -p1 # Debian patches -%patch116 -p1 %patch118 -p1 %patch119 -p1 +%patch121 -p1 find -type f -exec chmod 644 {} + %build export CFLAGS="%{optflags} -fno-strict-aliasing -DLDAP_DEPRECATED" +gettextize -f +autoreconf -fi +chmod a+x NP-VERSION-GEN chmod +x configure # needed as configure script is not executable in 1.5.. %configure \ --enable-static=no \ @@ -1277,7 +1288,7 @@ %files %defattr(-,root,root) %doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING FAQ -%doc NEWS README REQUIREMENTS SUPPORT THANKS README.SUSE +%doc NEWS README REQUIREMENTS SUPPORT README.SUSE %if 0%{?suse_version} >= 1500 %license COPYING %else @@ -1316,7 +1327,7 @@ %files common -f %{name}.lang %defattr(-,root,root) %doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING FAQ -%doc NEWS README REQUIREMENTS SUPPORT THANKS README.SUSE +%doc NEWS README REQUIREMENTS SUPPORT README.SUSE %if 0%{?suse_version} >= 1500 %license COPYING %else @@ -1430,8 +1441,8 @@ %dir %{nagios_plugindir} %attr(0755,root,root) %{nagios_plugindir}/check_icmp %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_icmp -%attr(0755,root,root) %{nagios_plugindir}/check_host -%attr(0755,root,root) %{nagios_plugindir}/check_rta_multi +%{nagios_plugindir}/check_host +%{nagios_plugindir}/check_rta_multi %files ifoperstatus %defattr(0755,root,root) @@ -1634,6 +1645,11 @@ %{nagios_plugindir}/check_ups %attr(0644,root,root) %config(noreplace) %{nrpe_sysconfdir}/check_ups.cfg +%files uptime +%defattr(0755,root,root) +%dir %{nagios_plugindir} +%{nagios_plugindir}/check_uptime + %files users %defattr(0755,root,root) %dir %{nagios_plugindir} ++++++ _service ++++++ <?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 ++++++ --- /var/tmp/diff_new_pack.s8U53f/_old 2020-09-21 17:44:45.424988443 +0200 +++ /var/tmp/diff_new_pack.s8U53f/_new 2020-09-21 17:44:45.428988446 +0200 @@ -10,7 +10,7 @@ echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \ chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ done -@@ -66,11 +65,12 @@ install-exec-local: $(noinst_PROGRAMS) +@@ -66,11 +65,11 @@ install-exec-local: $(noinst_PROGRAMS) && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ && can_create_suid_root_executable=yes; \ rm -f $$TMPFILE; \ @@ -18,7 +18,7 @@ - $(INSTALL_SUID); \ + $(INSTALL_SUID); \ + if test $$can_create_suid_root_executable != yes; then \ - else \ +- else \ - echo "WARNING: insufficient access; not installing setuid plugins"; \ + echo "WARNING: insufficient access; not installing plugins as setuid"; \ echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ @@ -26,31 +26,3 @@ 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-wrong_return_in_check_swap.patch ++++++ --- /var/tmp/diff_new_pack.s8U53f/_old 2020-09-21 17:44:45.612988620 +0200 +++ /var/tmp/diff_new_pack.s8U53f/_new 2020-09-21 17:44:45.612988620 +0200 @@ -33,12 +33,12 @@ =================================================================== --- monitoring-plugins-2.2.orig/plugins/check_swap.c +++ monitoring-plugins-2.2/plugins/check_swap.c -@@ -125,7 +125,7 @@ main (int argc, char **argv) +@@ -125,7 +125,7 @@ free_swap_mb += dskfree_mb; if (allswaps) { if (dsktotal_mb == 0) - percent=100.0; -+ percent= 0.0; ++ percent = 0.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)); ++++++ monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch ++++++ --- /var/tmp/diff_new_pack.s8U53f/_old 2020-09-21 17:44:45.632988639 +0200 +++ /var/tmp/diff_new_pack.s8U53f/_new 2020-09-21 17:44:45.632988639 +0200 @@ -2,12 +2,12 @@ =================================================================== --- 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 ++++++ name: monitoring-plugins version: 2.3~alpha.20200520T233014.cadac85e mtime: 1590010214 commit: cadac85e12d48d662ff39bfc9f5feb5601af1485
