From dc147de420f76c614ad2efa532480eb59bcb6de2 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Jan 18 2017 01:22:56 +0000
Subject: Merge branch 'master' into el6


---

diff --git a/nagios-plugins-0009-Fix-file-age-from-git.patch b/nagios-plugins-0009-Fix-file-age-from-git.patch
new file mode 100644
index 0000000..17a8493
--- /dev/null
+++ b/nagios-plugins-0009-Fix-file-age-from-git.patch
@@ -0,0 +1,12 @@
+diff -up ./plugins-scripts/check_file_age.pl.fixes_from_git_20170117 ./plugins-scripts/check_file_age.pl
+--- ./plugins-scripts/check_file_age.pl.fixes_from_git_20170117	2016-11-17 12:23:52.000000000 -0500
++++ ./plugins-scripts/check_file_age.pl	2017-01-17 19:06:18.166531948 -0500
+@@ -77,7 +77,7 @@ if (! $opt_f) {
+ 	exit $ERRORS{'UNKNOWN'};
+ }
+ 
+-$opt_f = '"' . $opt_f . '"';
++$opt_f = '"' . $opt_f . '"' if $opt_f =~ / /;
+ 
+ # Check that file(s) exists (can be directory or link)
+ $perfdata = "";
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index 9258ba3..34ff045 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -2,7 +2,7 @@
 
 Name: nagios-plugins
 Version: 2.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -14,6 +14,8 @@ Patch2: nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch
 # https://bugzilla.redhat.com/512559
 Patch5: nagios-plugins-0005-Prevent-check_swap-from-returning-OK-if-no-swap-acti.patch
 Patch7: nagios-plugins-0007-Fix-the-use-lib-statement-and-the-external-ntp-comma.patch
+# Patch 8 no longer needed
+Patch9: nagios-plugins-0009-Fix-file-age-from-git.patch
 
 BuildRequires: openldap-devel
 BuildRequires: mysql-devel
@@ -556,6 +558,7 @@ Provides check_wave support for Nagios.
 %patch2 -p1 -b .not_parsed
 %patch5 -p1 -b .fix_missing_swap
 %patch7 -p1 -b .ext_ntp_cmds
+%patch9 -p1 -b .fixes_from_git_20170117
 
 %build
 %configure \
@@ -797,6 +800,9 @@ chmod 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm
 %{_libdir}/nagios/plugins/check_wave
 
 %changelog
+* Wed Jan 18 2017 Stephen Smoogen <smooge@redhat.com> - 2.1.4-3
+- Put in patch to fix check_file_age
+
 * Fri Dec 16 2016 Scott Wilkerson <swilkerson@nagios.com> 2.1.4-1
 - Updated to 2.1.4