Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package monitoring-plugins for openSUSE:Factory checked in at 2024-12-03 20:46:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monitoring-plugins (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins" Tue Dec 3 20:46:09 2024 rev:33 rq:1227828 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins.changes 2024-04-09 16:53:35.526156469 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.28523/monitoring-plugins.changes 2024-12-03 20:47:09.358907009 +0100 @@ -1,0 +2,85 @@ +Mon Dec 2 17:52:44 CET 2024 - [email protected] + +- add patch monitoring-plugins-2.4.0-check_dbi-type_mismatch.patch + to fix compilation with gcc-14 + passing argument 2 of âdbi_driver_open_râ from incompatible pointer type +- change mode to "manual" in service file + +------------------------------------------------------------------- +Mon Jul 29 08:06:37 UTC 2024 - Lars Vogdt <[email protected]> + +- update to 2.4.0 + General + + Use C99 booleans @RincewindsHat + + Improve negate plugin helptext @euniceremoquillo + + Add new test function for percentage expressions @RincewindsHat + Single Plugins + + check_mailq: remove trailing whitespaces @sni + + check_mailq: unify tabs/spaces @sni + + check_oracle: Shellcheck fixes @RincewindsHat + + check_ups: output ups.realpower if supported @sbraz + + check_disk: add -n short option for --ignore-missing @sni + + check_procs: Improve help text, mentioning excluded processes @shartge + + check_procs: Generalise wording, remove mentioning of nrpe @shartge + + check_curl: add haproxy protocol option @emriver + + check_disk: increase alert precision @sni + + check_ircd: IPv6 support @oxzi + + check_nwstat: adds percentage used space + + check_swap: Possibility to run check_swap without thresholds @Napsty + + check_ups: additional alarm conditions @RincewindsHat + + check_http/check_curl: added a --regex-state option to change the state of a regex check @andreasbaumann + General Fixes + + Fixes for -Wsign-compare @RincewindsHat + + Fix logic in is_uint64_t to fix type-limit warning @RincewindsHat + + Prevent -lcrypto from showing up in Makefile dependencies @EricFromCanada + + Change irritating NULL assignment @RincewindsHat + Single Plugin Fixes + + check_dbi: Compiler warning for uninitialized variable @RincewindsHat + + check_curl: Initialize pointer before usage @RincewindsHat + + check_ntp: Initialize intermediate results in any case @RincewindsHat + + check_tcp: Fixes an error with using the wrong type for a variable @RincewindsHat + + check_mailq: exit on empty strings and exit early @sni + + check_users: Change option for sanity checking arguments to avoid segfault @RincewindsHat + + check_users: Update help to properly show that thresholds are ranges @RincewindsHat + + check_users: fix segfault @RincewindsHat + + check_dbi: Fix compiler warning for uninitialized variable @RincewindsHat + + check_curl: Initialize pointer before usage @RincewindsHat + + check_ntp: Initialize intermediate results in any case @RincewindsHat + + check_ntp_peer: Fixes for Wmaybe-unitialized and some restructuring @RincewindsHat + + check_dns: Remove unused variable @RincewindsHat + + check_disk: fix ignore-missing in combination with includes @sni + + check_procs: ignore our own children @shartge + + check_http: Remove self assignment of a variable and add some comments @RincewindsHat + + check_snmp: Remove unused variable @RincewindsHat + + check_dhcp: Make implicit conversion explicit to dismiss warning @RincewindsHat + + Ini Parser: Avoid freeing symbols from text section @RincewindsHat + + check_icmp: keep performance data order in case of none-reachable hosts @sni + + check_swap: Change another fake boolean to a real one @RincewindsHat + + check_swap: Rename type since *_t is reserved for C standard types @RincewindsHat + + check_ssh: Fix a typo in "remote-protocol parameter + + check_ssh: Handle non-alpha software versions + + check_ssh: properly parse a delayed version control string + + check_disk: Fail on missing arguments for --warning and --critical and fix a test case @RincewindsHat + + check_disk: Use new test function for percentage expressions @RincewindsHat + + check_load: remove unused code @RincewindsHat + + check_curl/check_http: clarified format of POST data @andreasbaumann +- introduce _service +- refresh patches: + + monitoring-plugins-2.3.5-check_http-proxy.patch + -> monitoring-plugins-2.4.0-check_http-proxy.patch + + monitoring-plugins-2.3.5-check_log_-_quoting.patch + -> monitoring-plugins-2.4.0-check_log_-_quoting.patch + + monitoring-plugins-2.3.5-check_ntp_perf_absolute.patch + -> monitoring-plugins-2.4.0-check_ntp_perf_absolute.patch + + monitoring-plugins-2.3.5-check_swap_wrong_percent.patch + -> monitoring-plugins-2.4.0-check_swap_wrong_percent.patch + + monitoring-plugins-2.3.5-plugins-root-Makefile_-_no_chown.patch + -> monitoring-plugins-2.4.0-plugins-root-Makefile_-_no_chown.patch +- dropped patches: + + monitoring-plugins-2.3.5-check_ssh.patch + + monitoring-plugins-2.3.5-check_ssh.t_-_improve_testing.patch +- remove old distribution flags and following subpackages: + + monitoring-plugins-apt + + monitoring-plugins-game + +------------------------------------------------------------------- Old: ---- monitoring-plugins-2.3.5-check_http-proxy.patch monitoring-plugins-2.3.5-check_log_-_quoting.patch monitoring-plugins-2.3.5-check_ntp_perf_absolute.patch monitoring-plugins-2.3.5-check_ssh.patch monitoring-plugins-2.3.5-check_ssh.t_-_improve_testing.patch monitoring-plugins-2.3.5-check_swap_wrong_percent.patch monitoring-plugins-2.3.5-plugins-root-Makefile_-_no_chown.patch monitoring-plugins-2.3.5.tar.gz monitoring-plugins-2.3.5.tar.gz.sha1 New: ---- _service monitoring-plugins-2.4.0-check_dbi-type_mismatch.patch monitoring-plugins-2.4.0-check_http-proxy.patch monitoring-plugins-2.4.0-check_log_-_quoting.patch monitoring-plugins-2.4.0-check_ntp_perf_absolute.patch monitoring-plugins-2.4.0-check_swap_wrong_percent.patch monitoring-plugins-2.4.0-plugins-root-Makefile_-_no_chown.patch monitoring-plugins-2.4.0.tar.gz monitoring-plugins-2.4.0.tar.gz.sha1 BETA DEBUG BEGIN: Old:- refresh patches: + monitoring-plugins-2.3.5-check_http-proxy.patch -> monitoring-plugins-2.4.0-check_http-proxy.patch Old: -> monitoring-plugins-2.4.0-check_http-proxy.patch + monitoring-plugins-2.3.5-check_log_-_quoting.patch -> monitoring-plugins-2.4.0-check_log_-_quoting.patch Old: -> monitoring-plugins-2.4.0-check_log_-_quoting.patch + monitoring-plugins-2.3.5-check_ntp_perf_absolute.patch -> monitoring-plugins-2.4.0-check_ntp_perf_absolute.patch Old:- dropped patches: + monitoring-plugins-2.3.5-check_ssh.patch + monitoring-plugins-2.3.5-check_ssh.t_-_improve_testing.patch Old: + monitoring-plugins-2.3.5-check_ssh.patch + monitoring-plugins-2.3.5-check_ssh.t_-_improve_testing.patch - remove old distribution flags and following subpackages: Old: -> monitoring-plugins-2.4.0-check_ntp_perf_absolute.patch + monitoring-plugins-2.3.5-check_swap_wrong_percent.patch -> monitoring-plugins-2.4.0-check_swap_wrong_percent.patch Old: -> monitoring-plugins-2.4.0-check_swap_wrong_percent.patch + monitoring-plugins-2.3.5-plugins-root-Makefile_-_no_chown.patch -> monitoring-plugins-2.4.0-plugins-root-Makefile_-_no_chown.patch BETA DEBUG END: BETA DEBUG BEGIN: New: - add patch monitoring-plugins-2.4.0-check_dbi-type_mismatch.patch to fix compilation with gcc-14 New: + monitoring-plugins-2.3.5-check_http-proxy.patch -> monitoring-plugins-2.4.0-check_http-proxy.patch + monitoring-plugins-2.3.5-check_log_-_quoting.patch New: + monitoring-plugins-2.3.5-check_log_-_quoting.patch -> monitoring-plugins-2.4.0-check_log_-_quoting.patch + monitoring-plugins-2.3.5-check_ntp_perf_absolute.patch New: + monitoring-plugins-2.3.5-check_ntp_perf_absolute.patch -> monitoring-plugins-2.4.0-check_ntp_perf_absolute.patch + monitoring-plugins-2.3.5-check_swap_wrong_percent.patch New: + monitoring-plugins-2.3.5-check_swap_wrong_percent.patch -> monitoring-plugins-2.4.0-check_swap_wrong_percent.patch + monitoring-plugins-2.3.5-plugins-root-Makefile_-_no_chown.patch New: + monitoring-plugins-2.3.5-plugins-root-Makefile_-_no_chown.patch -> monitoring-plugins-2.4.0-plugins-root-Makefile_-_no_chown.patch - dropped patches: BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monitoring-plugins.spec ++++++ --- /var/tmp/diff_new_pack.iHvP14/_old 2024-12-03 20:47:10.358948836 +0100 +++ /var/tmp/diff_new_pack.iHvP14/_new 2024-12-03 20:47:10.358948836 +0100 @@ -18,7 +18,7 @@ %bcond_with mssql Name: monitoring-plugins -Version: 2.3.5 +Version: 2.4.0 Release: 0 Summary: The Monitoring Plug-Ins License: GPL-2.0-or-later AND GPL-3.0-only @@ -63,18 +63,16 @@ Source59: nrpe-check_mysql Source60: nrpe-check_ups # PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces) -Patch1: %{name}-2.3.5-check_log_-_quoting.patch +Patch1: %{name}-2.4.0-check_log_-_quoting.patch # PATH-FIX-openSUSE - do not use/run chown in Makefile: we use RPM for this -Patch6: %{name}-2.3.5-plugins-root-Makefile_-_no_chown.patch +Patch6: %{name}-2.4.0-plugins-root-Makefile_-_no_chown.patch # PATCH-FIX-UPSTREAM see https://bugzilla.redhat.com/512559 -Patch121: %{name}-2.3.5-check_swap_wrong_percent.patch +Patch121: %{name}-2.4.0-check_swap_wrong_percent.patch # PATCH-FIX-UPSTREAM - return ntp offset absolute (as positive value) in performance data since warn and crit are also positive values -Patch122: %{name}-2.3.5-check_ntp_perf_absolute.patch -# PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/pull/1322 -Patch125: %{name}-2.3.5-check_ssh.patch -Patch126: %{name}-2.3.5-check_ssh.t_-_improve_testing.patch -# PATCH-FIX-UPSTREAM - see https://github.com/monitoring-plugins/monitoring-plugins/pull/1862 -Patch130: %{name}-2.3.5-check_http-proxy.patch +Patch122: %{name}-2.4.0-check_ntp_perf_absolute.patch +Patch130: %{name}-2.4.0-check_http-proxy.patch +Patch131: %{name}-2.4.0-check_dbi-type_mismatch.patch +BuildRequires: automake BuildRequires: bind-utils BuildRequires: dhcp-devel BuildRequires: fping @@ -115,22 +113,9 @@ %endif BuildRequires: samba-client %if 0%{?suse_version} -%if 0%{?suse_version} > 1020 BuildRequires: freeradius-client-devel BuildRequires: rpcbind -%else -BuildRequires: portmap -BuildRequires: radiusclient -%endif -%if 0%{?suse_version} > 910 BuildRequires: krb5-devel -%else -BuildRequires: heimdal-devel -%endif -%else -BuildRequires: krb5-devel -%endif -%if 0%{?suse_version} > 1315 BuildRequires: libcurl-devel BuildRequires: uriparser-devel %endif @@ -321,20 +306,6 @@ Monitoring plugins and additional packages that are available in https://build.opensuse.org/project/show/server:monitoring -%if 0%{?suse_version} < 01310 -%package apt -Summary: Check for software updates via apt-get -Group: System/Monitoring -Requires: %{apt_get_command} -Provides: nagios-plugins-apt = %{version} -Obsoletes: nagios-plugins-apt <= 1.5 - -%description apt -This plugin checks for software updates on systems that use package management -systems based on the apt-get command found in Debian GNU/Linux or Ubuntu for -example. -%endif - %package breeze Summary: Monitor Breezecom wireless equipment Group: System/Monitoring @@ -390,7 +361,6 @@ This package includes the libraries (scripts) that are included by many of the standard checks. -%if 0%{?suse_version} > 1315 %package curl Summary: Test the HTTP service on the specified host, via libcurl Group: System/Monitoring @@ -405,7 +375,6 @@ It makes use of libcurl to do so. It tries to be as compatible to check_http as possible. -%endif %package dbi Summary: Check databases using DBI @@ -480,9 +449,6 @@ %if 0%{?suse_version} Recommends: apparmor-parser Recommends: apparmor-profiles -%else -#Requires: apparmor-parser -#Requires: apparmor-profiles %endif %description dhcp @@ -584,19 +550,6 @@ This plugin will use the fping command to ping the specified host for a fast check. Note that it is necessary to set the suid flag on fping. -%if 0%{?suse_version} < 01310 -%package game -Summary: Gameserver check -Group: System/Monitoring -Requires: %{qstat_command} -Provides: nagios-plugins-game = %{version} -Obsoletes: nagios-plugins-game <= 1.5 - -%description game -Check connections to game servers. This plugin uses the 'qstat' command, the -popular game server status query tool. -%endif - %package hpjd Summary: Check status of an HP printer Group: System/Monitoring @@ -852,9 +805,6 @@ %if 0%{?suse_version} Recommends: apparmor-parser Recommends: apparmor-profiles -%else -#Requires: apparmor-parser -#Requires: apparmor-profiles %endif %description ntp_time @@ -1148,7 +1098,7 @@ it will provide the size of the queue of age of queue. %prep -%setup -q +%autosetup -p1 %if 0%{?suse_version} mkdir -p example/permissions.d cp %{S:11} example/permissions.d/%{name} @@ -1174,17 +1124,9 @@ EOF done -%patch -P 1 -p1 -%patch -P 6 -p1 -# Debian patches -%patch -P 121 -p1 -%patch -P 122 -p1 -# Github patches -%patch -P 125 -p1 -%patch -P 126 -p1 -%patch -P 130 -p1 %build +autoreconf -v --force --install export CFLAGS="%{optflags} -fno-strict-aliasing -DLDAP_DEPRECATED" # Translations were (temporarily?) removed upstream: # https://github.com/monitoring-plugins/monitoring-plugins/pull/1947 @@ -1207,18 +1149,15 @@ --with-ps-format='%s %d %d %d %d %d %f %s %s %n' \ --with-ps-cols=10 \ --with-ps-varlist='procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos' \ -%if 0%{?suse_version} > 1300 --with-rpcinfo-command=/sbin/rpcinfo \ -%else - --with-rpcinfo-command=%{_sbindir}/rpcinfo \ -%endif --with-qstat-command=%{qstat_command} \ --with-mysql=%{_prefix} \ --disable-rpath + make all %{?_smp_mflags} %install -sed -i 's,^MKINSTALLDIRS.*,MKINSTALLDIRS = ../mkinstalldirs,' po/Makefile +# sed -i 's,^MKINSTALLDIRS.*,MKINSTALLDIRS = ../mkinstalldirs,' po/Makefile %make_install install-root install -m 0755 %{S:18} %{buildroot}%{nagios_plugindir}/check_cups # provide check_host and check_rta_multi as on Debian @@ -1229,10 +1168,8 @@ ln -s %{nagios_plugindir}/check_icmp %{buildroot}%{nagios_plugindir}/check_rta_multi ; fi # Factory maintainers do not want packages requiring software not in Factory: remove the checks -%if 0%{?suse_version} >= 01310 rm %{buildroot}%{nagios_plugindir}/check_apt rm %{buildroot}%{nagios_plugindir}/check_game -%endif # mssql plugin is not installable due to missing package DBD::Sybase - Do not ship until built --with=mssql %if %{without mssql} @@ -1304,41 +1241,31 @@ install -Dm 644 %{SOURCE27} %{buildroot}%{_sysconfdir}/%{name}/README touch %{buildroot}%{_sysconfdir}/%{name}/%{name}.ini -# find locale files -%find_lang %{name} + +%check +# + %if 0%{?suse_version} %post dhcp # in case somebody uses the permissions file we provide # in docdir, run permission here if [ -f %{_sysconfdir}/permissions.d/monitoring-plugins ]; then -%if 0%{?suse_version} < 1210 -%run_permissions -%else %set_permissions monitoring-plugins -%endif fi %post icmp if [ -f %{_sysconfdir}/permissions.d/monitoring-plugins ]; then # in case somebody uses the permissions file we provide # in docdir, run permission here -%if 0%{?suse_version} < 1210 -%run_permissions -%else %set_permissions monitoring-plugins -%endif fi %post ide_smart if [ -f %{_sysconfdir}/permissions.d/monitoring-plugins ]; then # in case somebody uses the permissions file we provide # in docdir, run permission here -%if 0%{?suse_version} < 1210 -%run_permissions -%else %set_permissions monitoring-plugins -%endif fi %endif @@ -1381,7 +1308,7 @@ %dir %{nagios_plugindir} %{nagios_plugindir}/check_cluster -%files common -f %{name}.lang +%files common %defattr(-,root,root) %doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING FAQ %doc NEWS README REQUIREMENTS SUPPORT README.SUSE @@ -1404,12 +1331,10 @@ %{nagios_plugindir}/utils.sh %attr(0644,root,root) %{nagios_plugindir}/utils.pm -%if 0%{?suse_version} > 1315 %files curl %defattr(0755,root,root) %dir %{nagios_plugindir} %{nagios_plugindir}/check_curl -%endif %files dbi %defattr(-,root,root) @@ -1482,13 +1407,6 @@ %dir %{nagios_plugindir} %{nagios_plugindir}/check_fping -%if 0%{?suse_version} < 01310 -%files game -%defattr(0755,root,root) -%dir %{nagios_plugindir} -%{nagios_plugindir}/check_game -%endif - %files hpjd %defattr(0755,root,root) %dir %{nagios_plugindir} ++++++ _service ++++++ <services> <service name="download_url" mode="manual"> <param name="host">www.monitoring-plugins.org</param> <param name="protocol">https</param> <param name="path">/download/monitoring-plugins-2.4.0.tar.gz</param> <param name="filename">monitoring-plugins-2.4.0.tar.gz</param> </service> <service name="download_url" mode="manual"> <param name="host">www.monitoring-plugins.org</param> <param name="protocol">https</param> <param name="path">/download/monitoring-plugins-2.4.0.tar.gz.sha1</param> <param name="filename">monitoring-plugins-2.4.0.tar.gz.sha1</param> </service> <service name="verify_file" mode="manual"> <param name="verifier">sha1</param> <param name="checksum">595fcfe92a5273031e8ad7f294ba683c27078a1a</param> <!-- <param name="file">monitoring-plugins-2.4.0.tar.gz</param> --> <param name="file">_service:download_url:monitoring-plugins-2.4.0.tar.gz</param> </service> </services> ++++++ monitoring-plugins-2.4.0-check_dbi-type_mismatch.patch ++++++ --- monitoring-plugins-2.4.0/plugins/check_dbi.c 2024/12/02 16:16:03 1.1 +++ monitoring-plugins-2.4.0/plugins/check_dbi.c 2024/12/02 17:02:44 @@ -141,9 +141,9 @@ if (verbose > 2) printf ("Initializing DBI\n"); - dbi_inst *instance_p = { 0 }; + dbi_inst instance_p = { 0 }; - if (dbi_initialize_r(NULL, instance_p) < 0) { + if (dbi_initialize_r(NULL, &instance_p) < 0) { printf ("UNKNOWN - failed to initialize DBI; possibly you don't have any drivers installed.\n"); return STATE_UNKNOWN; } ++++++ monitoring-plugins-2.3.5-check_http-proxy.patch -> monitoring-plugins-2.4.0-check_http-proxy.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.5-check_http-proxy.patch 2024-02-27 22:50:08.478416236 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.28523/monitoring-plugins-2.4.0-check_http-proxy.patch 2024-12-03 20:47:09.154898476 +0100 @@ -1,5 +1,5 @@ diff --git a/plugins/check_http.c b/plugins/check_http.c -index 8dda046f..2ab6a7a3 100644 +index 425ce86bb..e460e11ac 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -126,6 +126,9 @@ int sd; @@ -20,7 +20,7 @@ bool server_type_check(const char *type); int server_port_check(int ssl_flag); char *perfd_time (double microsec); -@@ -609,6 +613,17 @@ bool process_arguments (int argc, char **argv) +@@ -608,6 +612,17 @@ bool process_arguments (int argc, char **argv) if (virtual_port == 0) virtual_port = server_port; @@ -38,7 +38,7 @@ return true; } -@@ -940,18 +955,18 @@ check_http (void) +@@ -939,18 +954,18 @@ check_http (void) /* try to connect to the host at the given port number */ gettimeofday (&tv_temp, NULL); @@ -65,7 +65,7 @@ asprintf (&buf, "%s %s:%d HTTP/1.1\r\n%s\r\n", http_method, host_name, HTTPS_PORT, user_agent); if (strlen(proxy_auth)) { base64_encode_alloc (proxy_auth, strlen (proxy_auth), &auth); -@@ -986,7 +1001,7 @@ check_http (void) +@@ -985,7 +1000,7 @@ check_http (void) if (use_ssl == true) { gettimeofday (&tv_temp, NULL); result = np_net_ssl_init_with_hostname_version_and_cert(sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey); @@ -74,7 +74,7 @@ if (result != STATE_OK) die (STATE_CRITICAL, NULL); microsec_ssl = deltime (tv_temp); -@@ -1002,9 +1017,8 @@ check_http (void) +@@ -1001,9 +1016,8 @@ check_http (void) } #endif /* HAVE_SSL */ @@ -86,7 +86,7 @@ else asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent); -@@ -1033,8 +1047,7 @@ check_http (void) +@@ -1032,8 +1046,7 @@ check_http (void) */ if ((use_ssl == false && virtual_port == HTTP_PORT) || (use_ssl == true && virtual_port == HTTPS_PORT) || @@ -96,7 +96,7 @@ xasprintf (&buf, "%sHost: %s\r\n", buf, host_name); else xasprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, virtual_port); -@@ -1138,10 +1151,17 @@ check_http (void) +@@ -1137,10 +1150,17 @@ check_http (void) /* leave full_page untouched so we can free it later */ page = full_page; @@ -118,7 +118,7 @@ /* find status line and null-terminate it */ status_line = page; -@@ -1301,7 +1321,12 @@ check_http (void) +@@ -1300,7 +1320,12 @@ check_http (void) bcopy("...", &output_string_search[sizeof(output_string_search) - 4], 4); } @@ -132,7 +132,7 @@ result = STATE_CRITICAL; } } -@@ -1642,6 +1667,25 @@ redir (char *pos, char *status_line) +@@ -1641,6 +1666,25 @@ redir (char *pos, char *status_line) check_http (); } @@ -158,7 +158,7 @@ bool server_type_check (const char *type) -@@ -1861,7 +1905,7 @@ print_help (void) +@@ -1860,7 +1904,7 @@ print_help (void) printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than")); printf (" %s\n", _("30 days, but more than 14 days, a STATE_WARNING is returned.")); printf (" %s\n", _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days")); ++++++ monitoring-plugins-2.3.5-check_log_-_quoting.patch -> monitoring-plugins-2.4.0-check_log_-_quoting.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.5-check_log_-_quoting.patch 2024-02-27 22:50:08.490416671 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.28523/monitoring-plugins-2.4.0-check_log_-_quoting.patch 2024-12-03 20:47:09.182899648 +0100 @@ -1,7 +1,7 @@ -Index: monitoring-plugins-2.3.3/plugins-scripts/check_log.sh +Index: monitoring-plugins-2.4.0/plugins-scripts/check_log.sh =================================================================== ---- monitoring-plugins-2.3.3.orig/plugins-scripts/check_log.sh -+++ monitoring-plugins-2.3.3/plugins-scripts/check_log.sh +--- monitoring-plugins-2.4.0.orig/plugins-scripts/check_log.sh ++++ monitoring-plugins-2.4.0/plugins-scripts/check_log.sh @@ -112,23 +112,23 @@ while test -n "$1"; do exit "$STATE_UNKNOWN" ;; ++++++ monitoring-plugins-2.3.5-check_ntp_perf_absolute.patch -> monitoring-plugins-2.4.0-check_ntp_perf_absolute.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.5-check_ntp_perf_absolute.patch 2024-02-27 22:50:08.506417250 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.28523/monitoring-plugins-2.4.0-check_ntp_perf_absolute.patch 2024-12-03 20:47:09.230901656 +0100 @@ -1,13 +1,13 @@ -Index: monitoring-plugins-2.3.3/plugins/check_ntp_time.c +Index: monitoring-plugins-2.4.0/plugins/check_ntp_time.c =================================================================== ---- monitoring-plugins-2.3.3.orig/plugins/check_ntp_time.c -+++ monitoring-plugins-2.3.3/plugins/check_ntp_time.c -@@ -533,7 +533,7 @@ int process_arguments(int argc, char **a +--- monitoring-plugins-2.4.0.orig/plugins/check_ntp_time.c ++++ monitoring-plugins-2.4.0/plugins/check_ntp_time.c +@@ -532,7 +532,7 @@ int process_arguments(int argc, char **a + } - char *perfd_offset (double offset) - { + char *perfd_offset (double offset) { - return fperfdata ("offset", offset, "s", + return fperfdata ("offset", fabs(offset), "s", - TRUE, offset_thresholds->warning->end, - TRUE, offset_thresholds->critical->end, - FALSE, 0, FALSE, 0); + true, offset_thresholds->warning->end, + true, offset_thresholds->critical->end, + false, 0, false, 0); ++++++ monitoring-plugins-2.3.5-check_swap_wrong_percent.patch -> monitoring-plugins-2.4.0-check_swap_wrong_percent.patch ++++++ ++++++ monitoring-plugins-2.3.5-plugins-root-Makefile_-_no_chown.patch -> monitoring-plugins-2.4.0-plugins-root-Makefile_-_no_chown.patch ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.5-plugins-root-Makefile_-_no_chown.patch 2024-02-27 22:50:08.670423195 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.28523/monitoring-plugins-2.4.0-plugins-root-Makefile_-_no_chown.patch 2024-12-03 20:47:09.254902659 +0100 @@ -1,6 +1,8 @@ ---- monitoring-plugins-2.3.5/plugins-root/Makefile.in.orig 2023-11-28 17:23:06.400019507 -0600 -+++ monitoring-plugins-2.3.5/plugins-root/Makefile.in 2023-11-28 17:49:03.832492223 -0600 -@@ -1960,8 +1960,6 @@ +Index: monitoring-plugins-2.4.0/plugins-root/Makefile.am +=================================================================== +--- monitoring-plugins-2.4.0.orig/plugins-root/Makefile.am ++++ monitoring-plugins-2.4.0/plugins-root/Makefile.am +@@ -49,8 +49,6 @@ INSTALL_SUID = \ p=$$f; \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ @@ -9,12 +11,13 @@ echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \ chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ done -@@ -2484,7 +2482,7 @@ - @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \ - rm -f $$TMPFILE; \ - echo > $$TMPFILE; \ -- can_create_suid_root_executable=no; \ -+ can_create_suid_root_executable=yes; \ - chown root $$TMPFILE > /dev/null 2>&1 \ - && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ +@@ -65,8 +63,7 @@ install-exec-local: $(noinst_PROGRAMS) + ## See if we can create a setuid root executable in $(libexecdir). + ## If not, then don't even try to install setuid plugins. + can_create_suid_root_executable=no; \ +- chown root $$TMPFILE > /dev/null 2>&1 \ +- && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ ++ 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 \ ++++++ monitoring-plugins-2.3.5.tar.gz -> monitoring-plugins-2.4.0.tar.gz ++++++ ++++ 73523 lines of diff (skipped) ++++++ monitoring-plugins-2.3.5.tar.gz.sha1 -> monitoring-plugins-2.4.0.tar.gz.sha1 ++++++ --- /work/SRC/openSUSE:Factory/monitoring-plugins/monitoring-plugins-2.3.5.tar.gz.sha1 2024-02-05 22:02:23.545599765 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins.new.28523/monitoring-plugins-2.4.0.tar.gz.sha1 2024-12-03 20:47:09.346906507 +0100 @@ -1 +1 @@ -fcbe2068cb55aeaca3ebe67b619cb345a6705184 *monitoring-plugins-2.3.5.tar.gz +595fcfe92a5273031e8ad7f294ba683c27078a1a *monitoring-plugins-2.4.0.tar.gz
