From d2589bb209ab32bc26aac6f22e6f5c4c90b3c232 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Jul 25 2018 22:12:38 +0000 Subject: merge fix --- 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-0010-include-mysql-version-header.patch b/nagios-plugins-0010-include-mysql-version-header.patch new file mode 100644 index 0000000..253b4c5 --- /dev/null +++ b/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 + #include ++#include + #include + + 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 ++#include + #include + + char *db_user = NULL; diff --git a/nagios-plugins-0011-fix-perl-shebang.patch b/nagios-plugins-0011-fix-perl-shebang.patch new file mode 100644 index 0000000..e98132e --- /dev/null +++ b/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 + diff --git a/nagios-plugins.spec b/nagios-plugins.spec index db5defd..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: 9git5c7eb5b9%{?dist} +Release: 14.20180725git3429dad%{?dist} Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System @@ -18,6 +18,8 @@ Source1: nagios-plugins.README.Fedora 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 BuildRequires: %{_bindir}/mailq BuildRequires: %{_bindir}/ps @@ -29,6 +31,7 @@ BuildRequires: automake BuildRequires: autoconf # BuildRequires: bind-utils +BuildRequires: gcc BuildRequires: gettext BuildRequires: libdbi-devel BuildRequires: iputils @@ -44,24 +47,25 @@ BuildRequires: samba-client %if 0%{?fedora} > 28 BuildRequires: mariadb-connector-c-devel +BuildRequires: mariadb-connector-c +BuildRequires: mariadb-devel %else BuildRequires: mysql-devel %endif -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: radiusclient-ng-devel %else BuildRequires: freeradius-client-devel %endif -%if 0%{?fedora} >25 +%if 0%{?fedora} >25 || 0%{?rhel} > 7 BuildRequires: %{_bindir}/uptime BuildRequires: iputils BuildRequires: %{_bindir}/ps %endif Requires: nagios-common >= 3.3.1-1 -Requires: openssl Obsoletes: nagios-plugins-linux_raid < 1.4.16-11 @@ -240,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. @@ -292,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. @@ -343,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. @@ -490,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. @@ -536,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, @@ -590,6 +599,12 @@ Provides check_wave support for Nagios. %endif %patch2 -p1 -b .remove_ntp_jitter %patch7 -p1 -b .fix_ntpcommands +%if 0%{?rhel} > 7 +%patch10 -p1 -b .mysqlversionh +%endif +#%if 0%{?fedora} >27 || 0%{?rhel} > 7 +%patch11 -p1 -b .fix_perl_shebang +#%endif %build @@ -631,7 +646,7 @@ install -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins install -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins install -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins install -m 0755 plugins/check_ldap %{buildroot}/%{_libdir}/nagios/plugins -install -m 0755 plugins-scripts/check_ntp.pl %{buildroot}/%{_libdir}/nagios/plugins +install -m 0755 plugins-scripts/check_ntp %{buildroot}/%{_libdir}/nagios/plugins/check_ntp.pl install -m 0755 plugins/check_radius %{buildroot}/%{_libdir}/nagios/plugins install -m 0755 plugins/check_pgsql %{buildroot}/%{_libdir}/nagios/plugins @@ -838,6 +853,29 @@ 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 + +* Wed Feb 14 2018 Karsten Hopp - 2.2.1-12 +- fix conditionals +- include mysql_version for MYSQL_PORT macro +- fix perl shebang in plugin-scripts/check_ntp + +* Thu Feb 08 2018 Fedora Release Engineering - 2.2.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Jan 20 2018 Björn Esser - 2.2.1-10 +- Rebuilt for switch to libxcrypt + * Tue Nov 21 2017 Stephen Smoogen - 2.2.1-9 - Fix mysql patch problem with