packages: nagios-nrpe/nagios-nrpe-config.patch, nagios-nrpe/nagios-nrpe.spe...

Wed Jan 4 17:07:54 CET 2012

Author: glen                         Date: Wed Jan  4 16:07:54 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.13, add /etc/nagios/nrpe.d for nrpe config fragments

---- Files affected:
packages/nagios-nrpe:
   nagios-nrpe-config.patch (1.3 -> 1.4) , nagios-nrpe.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: packages/nagios-nrpe/nagios-nrpe-config.patch
diff -u packages/nagios-nrpe/nagios-nrpe-config.patch:1.3 packages/nagios-nrpe/nagios-nrpe-config.patch:1.4

--- packages/nagios-nrpe/nagios-nrpe-config.patch:1.3	Thu Mar 27 10:09:13 2008
+++ packages/nagios-nrpe/nagios-nrpe-config.patch	Wed Jan  4 17:07:49 2012
@@ -1,6 +1,5 @@
-diff -ur nrpe-2.12/sample-config/nrpe.cfg.in nrpe-2.12.new/sample-config/nrpe.cfg.in
---- nrpe-2.12/sample-config/nrpe.cfg.in	2007-11-23 18:31:23.000000000 +0100
-+++ nrpe-2.12.new/sample-config/nrpe.cfg.in	2008-03-27 09:47:26.682398787 +0100
+--- nrpe-2.12.new/sample-config/nrpe.cfg.in	2008-03-27 09:47:26.682398787 +0100
++++ nrpe-2.12/sample-config/nrpe.cfg.in	2012-01-04 17:57:22.907296034 +0200
 @@ -23,7 +23,7 @@
  # number.  The file is only written if the NRPE daemon is started by the root
  # user and is running in standalone mode.
@@ -10,7 +9,17 @@
  
  
  
-@@ -196,11 +196,11 @@
+@@ -169,8 +169,7 @@
+ # This directive allows you to include definitions from config files (with a
+ # .cfg extension) in one or more directories (with recursion).
+ 
+-#include_dir=<somedirectory>
+-#include_dir=<someotherdirectory>
++include_dir=/etc/nagios/nrpe.d
+ 
+ 
+ 
+@@ -196,11 +195,11 @@
  
  # The following examples use hardcoded command arguments...
  
@@ -27,4 +36,3 @@
  
  
  # The following examples allow user-supplied arguments and can
-Tylko w nrpe-2.12.new/sample-config: nrpe.cfg.in~

================================================================
Index: packages/nagios-nrpe/nagios-nrpe.spec
diff -u packages/nagios-nrpe/nagios-nrpe.spec:1.55 packages/nagios-nrpe/nagios-nrpe.spec:1.56
--- packages/nagios-nrpe/nagios-nrpe.spec:1.55	Sat Nov 13 13:08:22 2010
+++ packages/nagios-nrpe/nagios-nrpe.spec	Wed Jan  4 17:07:49 2012
@@ -2,12 +2,12 @@
 Summary:	Nagios remote plugin execution service/plugin
 Summary(pl.UTF-8):	Demon i wtyczka zdalnego wywoływania wtyczek Nagios
 Name:		nagios-nrpe
-Version:	2.12
-Release:	15
+Version:	2.13
+Release:	1
 License:	GPL v2
 Group:		Networking
-Source0:	http://dl.sourceforge.net/nagios/nrpe-%{version}.tar.gz
-# Source0-md5:	b2d75e2962f1e3151ef58794d60c9e97
+Source0:	http://downloads.sourceforge.net/nagios/nrpe-%{version}.tar.gz
+# Source0-md5:	e5176d9b258123ce9cf5872e33a77c1a
 Source1:	nrpe.init
 Source2:	nrpe-command.cfg
 Patch0:		%{name}-config.patch
@@ -55,7 +55,7 @@
 Group:		Networking
 Requires:	nagios-common
 Provides:	%{name}-plugin = %{version}-%{release}
-Obsoletes:	%{name}-plugin < 2.12-6
+Obsoletes:	nagios-nrpe-plugin < 2.12-6
 
 %description -n nagios-plugin-check_nrpe
 check_nrpe plugin for Nagios. This plugin allows running plugins on
@@ -74,10 +74,9 @@
 %{__autoconf}
 
 %configure \
-	--with-init-dir=/etc/rc.d/init.d \
 	--with-nrpe-port=%{nsport} \
 	--with-nrpe-user=nagios \
-	--with-nrpe-grp=nagios \
+	--with-nrpe-group=nagios \
 	--enable-ssl \
 	--enable-command-args
 
@@ -85,14 +84,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/plugins,%{_libdir}/nagios/plugins,%{_sbindir}} \
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/{plugins,nrpe.d},%{_libdir}/nagios/plugins,%{_sbindir}} \
 	$RPM_BUILD_ROOT{%{_localstatedir},/var/run/nrpe}
 
-install sample-config/nrpe.cfg $RPM_BUILD_ROOT%{_sysconfdir}/nrpe.cfg
+cp -p sample-config/nrpe.cfg $RPM_BUILD_ROOT%{_sysconfdir}/nrpe.cfg
 sed -e 's, at plugindir@,%{_plugindir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/plugins/check_nrpe.cfg
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/nrpe
-install src/nrpe $RPM_BUILD_ROOT%{_sbindir}
-install src/check_nrpe $RPM_BUILD_ROOT%{_plugindir}
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/nrpe
+install -p src/nrpe $RPM_BUILD_ROOT%{_sbindir}
+install -p src/check_nrpe $RPM_BUILD_ROOT%{_plugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,6 +120,7 @@
 %defattr(644,root,root,755)
 %doc Changelog LEGAL README* SECURITY
 %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nrpe.cfg
+%attr(750,root,nagios) %dir %{_sysconfdir}/nrpe.d
 %attr(755,root,root) %{_sbindir}/nrpe
 %attr(754,root,root) /etc/rc.d/init.d/nrpe
 %dir %attr(775,root,nagios) /var/run/nrpe
@@ -136,6 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2012/01/04 16:07:49  glen
+- up to 2.13, add /etc/nagios/nrpe.d for nrpe config fragments
+
 Revision 1.55  2010/11/13 12:08:22  pawelz
 - release 15
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nrpe/nagios-nrpe-config.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nrpe/nagios-nrpe.spec?r1=1.55&r2=1.56&f=u

