packages: nagios-nrpe/nagios-nrpe.spec, nagios-nrpe/nrpe_check_control.patc...

[glen]

Author: glen                         Date: Wed Jan  4 16:18:56 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build contrib/nrpe_check_control.c, however it seems to parse nagios 1.x config only

---- Files affected:
packages/nagios-nrpe:
   nagios-nrpe.spec (1.56 -> 1.57) , nrpe_check_control.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-nrpe/nagios-nrpe.spec
diff -u packages/nagios-nrpe/nagios-nrpe.spec:1.56 packages/nagios-nrpe/nagios-nrpe.spec:1.57
--- packages/nagios-nrpe/nagios-nrpe.spec:1.56	Wed Jan  4 17:07:49 2012
+++ packages/nagios-nrpe/nagios-nrpe.spec	Wed Jan  4 17:18:51 2012
@@ -11,6 +11,7 @@
 Source1:	nrpe.init
 Source2:	nrpe-command.cfg
 Patch0:		%{name}-config.patch
+Patch1:		nrpe_check_control.patch
 URL:		http://www.nagios.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -67,12 +68,13 @@
 
 %prep
 %setup -q -n nrpe-%{version}
+%undos contrib/nrpe_check_control.c
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
-
 %configure \
 	--with-nrpe-port=%{nsport} \
 	--with-nrpe-user=nagios \
@@ -82,6 +84,8 @@
 
 %{__make} all
 
+%{__cc} %{rpmcppflags} %{rpmcflags} %{rpmldflags} contrib/nrpe_check_control.c -o contrib/nrpe_check_control
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/{plugins,nrpe.d},%{_libdir}/nagios/plugins,%{_sbindir}} \
@@ -136,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2012/01/04 16:18:51  glen
+- build contrib/nrpe_check_control.c, however it seems to parse nagios 1.x config only
+
 Revision 1.56  2012/01/04 16:07:49  glen
 - up to 2.13, add /etc/nagios/nrpe.d for nrpe config fragments
 

================================================================
Index: packages/nagios-nrpe/nrpe_check_control.patch
diff -u /dev/null packages/nagios-nrpe/nrpe_check_control.patch:1.1
--- /dev/null	Wed Jan  4 17:18:57 2012
+++ packages/nagios-nrpe/nrpe_check_control.patch	Wed Jan  4 17:18:51 2012
@@ -0,0 +1,13 @@
+--- nrpe-2.13/contrib/nrpe_check_control.c~	2002-02-22 03:15:34.000000000 +0200
++++ nrpe-2.13/contrib/nrpe_check_control.c	2012-01-04 18:15:51.491252922 +0200
+@@ -5,8 +5,8 @@
+ #define MAX_CHARS	1024
+ #define SERVICE_COUNT	12
+ 
+-#define COMMAND_FILE	"/usr/local/nagios/var/rw/nagios.cmd"
+-#define SERVICES_FILE	"/usr/local/nagios/etc/services.cfg"
++#define COMMAND_FILE	"/var/lib/nagios/rw/nagios.cmd"
++#define SERVICES_FILE	"/var/lib/nagios/status.dat"
+ 
+ int main(int argc, char *argv[])
+ {
================================================================

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