From e6aa738b819cfb123dae0bc7740832d9b011e787 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Apr 20 2017 22:05:58 +0000
Subject: update to 3.1.0

put in fix for format-error

---

diff --git a/.gitignore b/.gitignore
index 5578b32..134d221 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ nrpe-2.12.tar.gz
 /nrpe-2.14.tar.gz
 /nrpe-2.15.tar.gz
 /nrpe-3.0.1.tar.gz
+/nrpe-3.1.0.tar.gz
diff --git a/nrpe-0001-nrpe310-format-error.patch b/nrpe-0001-nrpe310-format-error.patch
new file mode 100644
index 0000000..daec6af
--- /dev/null
+++ b/nrpe-0001-nrpe310-format-error.patch
@@ -0,0 +1,12 @@
+diff -up ./src/utils.c.format-error ./src/utils.c
+--- ./src/utils.c.format-error	2017-04-17 10:21:54.000000000 -0400
++++ ./src/utils.c	2017-04-20 17:52:36.012761311 -0400
+@@ -527,7 +527,7 @@ void logit(int priority, const char *for
+ 			fflush(log_fp);
+ 
+ 		} else
+-			syslog(priority, buffer);
++			syslog(priority, "%s", buffer);
+ 
+ 		free(buffer);
+ 	}
diff --git a/nrpe.spec b/nrpe.spec
index 5ab7739..4373f07 100644
--- a/nrpe.spec
+++ b/nrpe.spec
@@ -4,20 +4,21 @@
 %define nsport 5666
 
 Name: nrpe
-Version: 3.0.1
-Release: 6%{?dist}
+Version: 3.1.0
+Release: 1%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
 License: GPLv2
 URL: http://www.nagios.org
-Source0: https://github.com/NagiosEnterprises/nrpe/releases/download/3.0.1/nrpe-3.0.1.tar.gz
+Source0: https://github.com/NagiosEnterprises/nrpe/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1: nrpe.sysconfig
 Source2: nrpe-tmpfiles.conf
 Source3: nrpe.README.SELinux.rst
 Source4: nrpe.te
 Source5: nrpe.fc
-Patch1: nrpe-0001-gitupdates-20170321.patch
+#Patch1: nrpe-0001-gitupdates-20170321.patch
+Patch1: nrpe-0001-nrpe310-format-error.patch
 Patch3: nrpe-0003-Include-etc-npre.d-config-directory.patch
 Patch10: nrpe-0010-opensslv110-strict.patch
 Patch11: nrpe-0011-opensslv110-nosslv2.patch
@@ -95,13 +96,13 @@ SElinux context for %{name}.
 
 %prep
 %setup -q
-%patch1 -p1 -b .git_20170321
+%patch1 -p1 -b .format-error
 %patch3 -p1 -b .include_etc_npre_d
-%patch10 -p1 -b .opensslv110
+
 %if 0%{?fedora} > 25
 %patch11 -p1 -b .opensslv110_nossl2
 %endif
-%patch12 -p1 -b .fix_systemd_reload
+
 %patch13 -p1 -b .fix_service_rhel6
 
 
@@ -191,13 +192,13 @@ fi
 %post selinux
 %if 0%{?el5}%{?el6}
 if [ "$1" -le "1" ]; then # Fist install
-   semodule -i %{_datadir}/selinux/packages/%{name}/.pp 2>/dev/null || :
+   semodule -i %{_datadir}/selinux/packages/%{name}.pp 2>/dev/null || :
    fixfiles -R nrpe restore || :
    /sbin/service nrpe condrestart > /dev/null 2>&1  || :
 fi
 %else
 if [ "$1" -le "1" ]; then # Fist install
-   semodule -i %{_datadir}/selinux/packages/%{name}/.pp 2>/dev/null || :
+   semodule -i %{_datadir}/selinux/packages/%{name}.pp 2>/dev/null || :
    fixfiles -R nrpe restore || :
    %systemd_postun_with_restart nrpe.service
 fi
@@ -208,13 +209,13 @@ fi
 %preun selinux
 %if 0%{?el5}%{?el6}
 if [ "$1" -lt "1" ]; then # Final removal
-    semodule -r pureftpd 2>/dev/null || :
+    semodule -r nrpe 2>/dev/null || :
     fixfiles -R nrpe restore || :
     /sbin/service nrpe condrestart > /dev/null 2>&1 || :
 fi
 %else
 if [ "$1" -lt "1" ]; then # Final removal
-    semodule -r pureftpd 2>/dev/null || :
+    semodule -r nrpe 2>/dev/null || :
     fixfiles -R nrpe restore || :
     %systemd_postun_with_restart nrpe.service
 fi
@@ -225,7 +226,7 @@ fi
 %postun selinux
 if [ "$1" -ge "1" ]; then # Upgrade
     # Replaces the module if it is already loaded
-    semodule -i %{_datadir}/selinux/packages/%{name}/pureftpd.pp 2>/dev/null || :
+    semodule -i %{_datadir}/selinux/packages/%{name}/nagios.pp 2>/dev/null || :
      # no need to restart the daemon
 fi
 %endif	    
@@ -257,6 +258,10 @@ fi
 %endif
 
 %changelog
+* Thu Apr 20 2017 Stephen Smoogen <smooge@fedoraproject.org> - 3.1.0-1
+- update to 3.1.0
+- put in fix for format-error
+
 * Thu Mar 23 2017 Stephen Smoogen <smooge@fedoraproject.org> - 3.0.1-6
 - Redo the nagios policy to lower its all the permissions.
 
diff --git a/sources b/sources
index b3746ff..a27be2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nrpe-3.0.1.tar.gz) = 91d46010776bf1b4a5f1e037b4cc52a8e2e78ea2b5bedaf11847b1446bd509012bfde4ada30566fca623b7eb104a51e670e20139b593e6c9ccd21c317a0fb3a5
+SHA512 (nrpe-3.1.0.tar.gz) = d67ae7cbd7f72fccc341e7da6d8774ee28da93dd14a18e6c6fbce6c9ba3fab19451ededea3cff0945ec1569026ee10f12a44bebbeac12a3b8210ed9aec4b39b8