diff --git a/.gitignore b/.gitignore index b921793..a51f681 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ nagios-plugins-1.4.15.tar.gz /nagios-plugins-2.2.0.tar.gz /nagios-plugins-2.2.1.tar.gz /nagios-plugins-5c7eb5b.tar.gz +/nagios-plugins-3429dad.tar.gz diff --git a/nagios-plugins.spec b/nagios-plugins.spec index 9e1b9f7..88967e4 100644 --- a/nagios-plugins.spec +++ b/nagios-plugins.spec @@ -1,11 +1,11 @@ %global _hardened_build 1 -%global commit 5c7eb5b9d5a7ed20ce27dcd81f23ecdb6720c2d6 +%global commit 3429dad68f97bc692a72623f46b3247e6bc62aba %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: nagios-plugins Version: 2.2.1 -Release: 13%{?dist} +Release: 14.20180725git3429dad%{?dist} Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System @@ -31,6 +31,7 @@ BuildRequires: automake BuildRequires: autoconf # BuildRequires: bind-utils +BuildRequires: gcc BuildRequires: gettext BuildRequires: libdbi-devel BuildRequires: iputils @@ -46,6 +47,8 @@ BuildRequires: samba-client %if 0%{?fedora} > 28 BuildRequires: mariadb-connector-c-devel +BuildRequires: mariadb-connector-c +BuildRequires: mariadb-devel %else BuildRequires: mysql-devel %endif @@ -63,7 +66,6 @@ BuildRequires: %{_bindir}/ps %endif Requires: nagios-common >= 3.3.1-1 -Requires: openssl Obsoletes: nagios-plugins-linux_raid < 1.4.16-11 @@ -242,6 +244,7 @@ Provides check_hpjd support for Nagios. Summary: Nagios Plugin - check_http Group: Applications/System Requires: nagios-plugins = %{version}-%{release} +Requires: openssl %description http Provides check_http support for Nagios. @@ -294,6 +297,7 @@ Provides check_ircd support for Nagios. Summary: Nagios Plugin - check_ldap Group: Applications/System Requires: nagios-plugins = %{version}-%{release} +Requires: openssl %description ldap Provides check_ldap support for Nagios. @@ -345,6 +349,7 @@ Provides check_mrtgtraf support for Nagios. Summary: Nagios Plugin - check_mysql Group: Applications/System Requires: nagios-plugins = %{version}-%{release} +Requires: openssl %description mysql Provides check_mysql and check_mysql_query support for Nagios. @@ -492,6 +497,7 @@ Provides check_sensors support for Nagios. Summary: Nagios Plugin - check_smtp Group: Applications/System Requires: nagios-plugins = %{version}-%{release} +Requires: openssl %description smtp Provides check_smtp support for Nagios. @@ -538,6 +544,7 @@ Provides: nagios-plugins-ssmtp = %{version}-%{release} Provides: nagios-plugins-udp = %{version}-%{release} Provides: nagios-plugins-udp2 = %{version}-%{release} Obsoletes: nagios-plugins-udp < 1.4.15-2 +Requires: openssl %description tcp Provides check_tcp, check_ftp, check_imap, check_jabber, check_nntp, @@ -595,9 +602,9 @@ Provides check_wave support for Nagios. %if 0%{?rhel} > 7 %patch10 -p1 -b .mysqlversionh %endif -%if 0%{?fedora} >27 || 0%{?rhel} > 7 +#%if 0%{?fedora} >27 || 0%{?rhel} > 7 %patch11 -p1 -b .fix_perl_shebang -%endif +#%endif %build @@ -846,6 +853,15 @@ chmod 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm %{_libdir}/nagios/plugins/check_wave %changelog +* Wed Jul 25 2018 Stephen Smoogen - 2.2.1-14.20180725git3429dad +- Update to latest git and fix release string to match +- Fix BZ#1604915 +- Fix BZ#1579292 +- Possibly fix BZ#1525609 +- Possibly fix BZ#1518811 +- Possibly fix BZ#1470823 + + * Fri Jul 13 2018 Fedora Release Engineering - 2.2.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 91da44c..0f6875e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nagios-plugins-5c7eb5b.tar.gz) = b2ded7fe48595aaf2ba35ab46c652f2a57de8a7b0381503f01ac5631bd21df26df761db63c6b231ef1b0bd1ea095296003e610ba86bed205f5935c815872819d +SHA512 (nagios-plugins-3429dad.tar.gz) = a4e53846dc564a7c3cede1438d3c13d1396985d93aa1de1a54b7f44c2d932a74d7a207381492a42dbcae4b234b69831dc3af8ebd2c4c49c4640c24680967568e