Changes - j0ke.net Open Build Service

Changes of Revision 67

[-] [+]	Changed	nagios-plugins.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Oct 11 17:59:10 UTC 2019 - Local OBS User <cs@linux-administrator.com> + +- update to pre-release (git) 2.2.2 ported from EPEL + +------------------------------------------------------------------- Fri Jun 30 06:06:28 UTC 2017 - cs@linux-administrator.com - update to release 2.2.1
[-] [+]	Changed	nagios-plugins.spec ^
@@ -1,18 +1,41 @@ #!BuildIgnore: post-build-checks + +%global commit 1b8ad572ea5480f9f611cf7321feb10f176fdb84 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commdate 20190926 + +%global gitbuild 1 + %define pkgname nagios-plugins Name: nagios-plugins -Version: 2.2.1 +Version: 2.2.2 +%if 0%{?gitbuild:1} +Release: 35.%{?commdate}git%{?shortcommit}%{?dist} +%else Release: 35 +%endif Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System License: GPL URL: https://www.nagios-plugins.org/ +%if 0%{?gitbuild:1} +Source0: https://github.com/nagios-plugins/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +%else Source0: %{pkgname}-%{version}.tar.bz2 +%endif + Source1: %{name}-rpmlintrc -#Patch100: nagios-plugins_DISABLE-SMARTENABLE.patch +%if 0%{?gitbuild:1} +Patch1: nagios-plugins-0001-Fix-mysql-f27.patch +Patch2: nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch +Patch7: nagios-plugins-0007-Fix-the-use-lib-statement-and-the-external-ntp-comma.patch +Patch10: nagios-plugins-0010-include-mysql-version-header.patch +Patch11: nagios-plugins-0011-fix-perl-shebang.patch +Patch12: nagios-plugins-0012-fix-perl-ntp-ipv6.patch +%else Patch200: revert-check_mailq-autodetect-2.2.1.diff -#Patch201: nagios-plugins-2.0.2_dnsfix.patch +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -73,6 +96,11 @@ Requires: samba-client %endif +# this is disabled in our build to have other packages require the utils.pm from nagios-plugins +# Do not provide private Perl modules +#%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}\|}^perl\$utils\$ +#%global reqfilt sh -c "%{__perl_requires} \| sed -e 's!perl(utils)!nagios-plugins-perl!'" +#%global __perl_requires %{reqfilt} %description @@ -86,10 +114,22 @@ %prep +%if 0%{?gitbuild:1} +%setup -q -n %{name}-%{commit} +%if 0%{?fedora} >26 +%patch1 -p1 -b .fix_mysql +%endif +%patch2 -p1 -b .remove_ntp_jitter +%patch7 -p1 -b .fix_ntpcommands +%if 0%{?rhel} > 7 +%patch10 -p1 -b .mysqlversionh +%endif +%patch11 -p1 -b .fix_perl_shebang +%patch12 -p1 -b .fix_perl_ntp +%else %setup -q -n %{pkgname}-%{version} -##%patch100 %patch200 -p1 -##%patch201 -p1 +%endif %build ./configure \
[-] [+]	Added	nagios-plugins-0001-Fix-mysql-f27.patch ^
@@ -0,0 +1,24 @@ +diff -up ./plugins/check_mysql.c.fix_mysql_f27 ./plugins/check_mysql.c +--- ./plugins/check_mysql.c.fix_mysql_f27 2017-11-20 21:19:47.597527944 -0500 ++++ ./plugins/check_mysql.c 2017-11-20 21:17:15.715921194 -0500 +@@ -41,7 +41,7 @@ const char email = "devel@nagios-plugin + #include "utils_base.h" + #include "netutils.h" + +-#include <mysql.h> ++#include <server/mysql.h> + #include <mysqld_error.h> + #include <errmsg.h> + +diff -up ./plugins/check_mysql_query.c.fix_mysql_f27 ./plugins/check_mysql_query.c +--- ./plugins/check_mysql_query.c.fix_mysql_f27 2017-11-20 21:20:01.369764323 -0500 ++++ ./plugins/check_mysql_query.c 2017-11-20 21:17:20.378001200 -0500 +@@ -38,7 +38,7 @@ const char email = "devel@nagios-plugin + #include "utils_base.h" + #include "netutils.h" + +-#include <mysql.h> ++#include <server/mysql.h> + #include <errmsg.h> + + char *db_user = NULL;
[-] [+]	Added	nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch ^
@@ -0,0 +1,11 @@ +diff -up ./plugins-scripts/check_ntp.pl.not_parsed ./plugins-scripts/check_ntp.pl +--- ./plugins-scripts/check_ntp.pl.not_parsed 2017-01-16 12:24:03.000000000 -0500 ++++ ./plugins-scripts/check_ntp.pl 2017-07-12 15:29:20.311215673 -0400 +@@ -314,7 +314,6 @@ if ($have_ntpq) { + } + } else { + print "No match!\n" if $verbose; +- $jitter = '(not parsed)'; + } + + }
[-] [+]	Added	nagios-plugins-0007-Fix-the-use-lib-statement-and-the-external-ntp-comma.patch ^
@@ -0,0 +1,13 @@ +diff -up ./plugins-scripts/utils.pm.in.ext_ntp_cmds ./plugins-scripts/utils.pm.in +--- ./plugins-scripts/utils.pm.in.ext_ntp_cmds 2017-01-16 12:24:03.000000000 -0500 ++++ ./plugins-scripts/utils.pm.in 2017-07-12 15:31:06.154120875 -0400 +@@ -23,6 +23,9 @@ $PATH_TO_LMSTAT = "@PATH_TO_LMSTAT@" ; + $PATH_TO_SMBCLIENT = "@PATH_TO_SMBCLIENT@" ; + $PATH_TO_MAILQ = "@PATH_TO_MAILQ@"; + $PATH_TO_QMAIL_QSTAT = "@PATH_TO_QMAIL_QSTAT@"; ++# Hardcoded values (autotools patch will be provided to the uptream project) ++$PATH_TO_NTPDATE = "/usr/sbin/ntpdate"; ++$PATH_TO_NTPQ = "/usr/sbin/ntpq"; + + ## common variables + $TIMEOUT = 15;
[-] [+]	Added	nagios-plugins-0010-include-mysql-version-header.patch ^
@@ -0,0 +1,22 @@ +diff -up nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins/check_mysql.c.kh1 nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins/check_mysql.c +--- nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins/check_mysql.c.kh1 2018-02-14 12:02:07.740364135 +0100 ++++ nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins/check_mysql.c 2018-02-14 12:02:25.604360688 +0100 +@@ -43,6 +43,7 @@ const char email = "devel@nagios-plugin + + #include <mysql.h> + #include <mysqld_error.h> ++#include <mysql_version.h> + #include <errmsg.h> + + char db_user = NULL; +diff -up nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins/check_mysql_query.c.kh1 nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins/check_mysql_query.c +--- nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins/check_mysql_query.c.kh1 2018-02-14 12:06:39.024103239 +0100 ++++ nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins/check_mysql_query.c 2018-02-14 12:07:07.508074303 +0100 +@@ -39,6 +39,7 @@ const char email = "devel@nagios-plugin + #include "netutils.h" + + #include <mysql.h> ++#include <mysql_version.h> + #include <errmsg.h> + + char db_user = NULL;
[-] [+]	Added	nagios-plugins-0011-fix-perl-shebang.patch ^
@@ -0,0 +1,12 @@ +diff -up nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins-scripts/Makefile.am.ntp_pl nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins-scripts/Makefile.am +--- nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins-scripts/Makefile.am.ntp_pl 2018-02-14 13:26:31.059759029 +0100 ++++ nagios-plugins-5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6/plugins-scripts/Makefile.am 2018-02-14 13:26:07.819777787 +0100 +@@ -14,7 +14,7 @@ SUFFIXES = .pl .sh + VPATH=$(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/t + + libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \ +- check_log check_oracle check_rpc check_sensors check_wave \ ++ check_log check_ntp check_oracle check_rpc check_sensors check_wave \ + check_ifstatus check_ifoperstatus check_mailq check_file_age \ + utils.sh utils.pm +
[-] [+]	Added	nagios-plugins-0012-fix-perl-ntp-ipv6.patch ^
@@ -0,0 +1,28 @@ +diff -up ./plugins-scripts/check_ntp.pl.fix_ipv6 ./plugins-scripts/check_ntp.pl +--- ./plugins-scripts/check_ntp.pl.fix_ipv6 2019-08-29 21:07:13.497504795 +0000 ++++ ./plugins-scripts/check_ntp.pl 2019-08-29 21:11:48.626816686 +0000 +@@ -112,13 +112,23 @@ if (defined $opt_j \|\| defined $opt_k ) { + } + + $opt_H = shift unless ($opt_H); +-my $host = $1 if ($opt_H && $opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\|[a-zA-Z][-a-zA-Z0-9]+(\.[a-zA-Z][-a-zA-Z0-9]+))$/); ++ ++## From https://bugzilla.redhat.com/show_bug.cgi?id=1731468 ++my $host = $opt_H if ($opt_H && ++ ($opt_H =~ m/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/ \|\| # IPv4 ++ $opt_H =~ m/^([0-9a-f]{1,4}:){7}([0-9a-f]{1,4})$/i \|\| # IPv6 without :: ++ $opt_H =~ m/^:(:[0-9a-f]{1,4})+$/i \|\| # IPv6 with leading :: ++ $opt_H =~ m/^([0-9a-f]{1,4}:)+:$/i \|\| # IPv6 with trailing :: ++ $opt_H =~ m/^([0-9a-f]{1,4}:)+(:[0-9a-f]{1,4})+$/i \|\| # IPv6 with middle :: ++ $opt_H =~ m/^[a-z0-9][-a-z0-9](\.[a-z0-9][-a-z0-9])$/)); # hostnames ++ + unless ($host) { + print "No target host specified\n"; + print_usage(); + exit $ERRORS{'UNKNOWN'}; + } + ++ + my ($timeout, $owarn, $ocrit, $jwarn, $jcrit); + + $timeout = $TIMEOUT;
	Added	nagios-plugins-1b8ad57.tar.gz ^