From 47131dde93200ccbac99cfb379f02a4ba4ec3df1 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Nov 21 2017 03:18:49 +0000 Subject: remove git from the release as it isn't standard Fix BZ#1512892 Fix BZ#1512380 Fix BZ#1500028 Fix BZ#1494080 Fix BZ#1478721 --- diff --git a/.gitignore b/.gitignore index e0ca0bd..b921793 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ nagios-plugins-1.4.15.tar.gz /nagios-plugins-2.1.4.tar.gz /nagios-plugins-2.2.0.tar.gz /nagios-plugins-2.2.1.tar.gz +/nagios-plugins-5c7eb5b.tar.gz diff --git a/nagios-plugins-0001-Fix-mysql-f27.patch b/nagios-plugins-0001-Fix-mysql-f27.patch new file mode 100644 index 0000000..34926a7 --- /dev/null +++ b/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 ++#include + #include + #include + +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 ++#include + #include + + char *db_user = NULL; diff --git a/nagios-plugins.spec b/nagios-plugins.spec index 81e28da..09b0533 100644 --- a/nagios-plugins.spec +++ b/nagios-plugins.spec @@ -1,27 +1,34 @@ %global _hardened_build 1 +%global commit 5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: nagios-plugins Version: 2.2.1 -Release: 7git%{?dist} +Release: 8%{?dist} Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System License: GPLv2+ URL: https://www.nagios-plugins.org/ -Source0: https://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz + +Source0: https://github.com/nagios-plugins/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source1: nagios-plugins.README.Fedora -Patch0: nagios-plugins-0000-git20170703.patch +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 - BuildRequires: %{_bindir}/mailq BuildRequires: %{_bindir}/ping BuildRequires: %{_bindir}/ps BuildRequires: %{_bindir}/ssh BuildRequires: %{_bindir}/uptime BuildRequires: %{_sbindir}/fping +# Needed for the git code +BuildRequires: automake +BuildRequires: autoconf +# BuildRequires: bind-utils BuildRequires: gettext BuildRequires: libdbi-devel @@ -34,14 +41,24 @@ BuildRequires: perl-generators BuildRequires: postgresql-devel BuildRequires: qstat BuildRequires: samba-client + +%if 0%{?fedora} > 28 +BuildRequires: mariadb-connector-c-devel +%else BuildRequires: mysql-devel +%endif + %if 0%{?rhel} BuildRequires: radiusclient-ng-devel %else BuildRequires: freeradius-client-devel %endif - +%if 0%{?fedora} >25 +BuildRequires: %{_bindir}/uptime +BuildRequires: %{_bindir}/ping +BuildRequires: %{_bindir}/ps +%endif Requires: nagios-common >= 3.3.1-1 Requires: openssl @@ -291,8 +308,8 @@ Provides check_load support for Nagios. Summary: Nagios Plugin - check_log Group: Applications/System Requires: nagios-plugins = %{version}-%{release} -Requires: /bin/egrep -Requires: /bin/mktemp +Requires: %{_bindir}/egrep +Requires: %{_bindir}/mktemp %description log Provides check_log support for Nagios. @@ -397,6 +414,7 @@ Requires: nagios-plugins = %{version}-%{release} Perl dep for nagios plugins. This is *NOT* an actual plugin it simply provides utils.pm + %package pgsql Summary: Nagios Plugin - check_pgsql Group: Applications/System @@ -409,8 +427,8 @@ Provides check_pgsql (PostgreSQL) support for Nagios. Summary: Nagios Plugin - check_ping Group: Applications/System Requires: nagios-plugins = %{version}-%{release} -Requires: /bin/ping -Requires: /bin/ping6 +Requires: %{_bindir}/ping +Requires: %{_bindir}/ping6 %description ping Provides check_ping support for Nagios. @@ -439,6 +457,14 @@ Requires: nagios-plugins = %{version}-%{release} %description real Provides check_real (rtsp) support for Nagios. +%package remove_perfdata +Summary: Nagios plugin tool to remove perf data +Group: Applications/System +Requires: nagios-plugins = %{version}-%{release} + +%description remove_perfdata +Removes perfdata from specified plugin's output + %package rpc Summary: Nagios Plugin - check_rpc Group: Applications/System @@ -453,7 +479,7 @@ Provides check_rpc support for Nagios. Summary: Nagios Plugin - check_sensors Group: Applications/System Requires: nagios-plugins = %{version}-%{release} -Requires: /bin/egrep +Requires: %{_bindir}/egrep Requires: %{_bindir}/sensors %description sensors @@ -557,16 +583,12 @@ Requires: nagios-plugins = %{version}-%{release} Provides check_wave support for Nagios. %prep -%setup -q - - -%patch0 -p1 -b .git201706 -%patch2 -p1 -b .not_parsed -%patch7 -p1 -b .ext_ntp_cmds - +#%setup -q +%autosetup -n %{name}-%{commit} -p1 %build +./tools/setup %configure \ --libexecdir=%{_libdir}/nagios/plugins \ --with-dbi \ @@ -584,6 +606,8 @@ Provides check_wave support for Nagios. --with-ps-varlist='procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos' make %{?_smp_mflags} +make THANKS + cd plugins make check_ide_smart make check_ldap @@ -615,7 +639,7 @@ chmod 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm %find_lang %{name} %files -f %{name}.lang -%doc ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING COPYING FAQ LEGAL NEWS README REQUIREMENTS SUPPORT THANKS README.Fedora +%doc ACKNOWLEDGEMENTS AUTHORS po/ChangeLog CODING COPYING FAQ LEGAL NEWS README REQUIREMENTS SUPPORT THANKS README.Fedora %{_libdir}/nagios/plugins/negate %{_libdir}/nagios/plugins/urlize %{_libdir}/nagios/plugins/utils.sh @@ -756,6 +780,9 @@ chmod 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm %files real %{_libdir}/nagios/plugins/check_real +%files remove_perfdata +%{_libdir}/nagios/plugins/remove_perfdata + %files rpc %{_libdir}/nagios/plugins/check_rpc @@ -806,6 +833,14 @@ chmod 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm %{_libdir}/nagios/plugins/check_wave %changelog +* Tue Nov 21 2017 Stephen Smoogen - 2.2.1-8 +- remove git from the release as it isn't standard +- Fix BZ#1512892 +- Fix BZ#1512380 +- Fix BZ#1500028 +- Fix BZ#1494080 +- Fix BZ#1478721 + * Thu Aug 03 2017 Fedora Release Engineering - 2.2.1-7git - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index cffe9d9..91da44c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nagios-plugins-2.2.1.tar.gz) = 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 +SHA512 (nagios-plugins-5c7eb5b.tar.gz) = b2ded7fe48595aaf2ba35ab46c652f2a57de8a7b0381503f01ac5631bd21df26df761db63c6b231ef1b0bd1ea095296003e610ba86bed205f5935c815872819d