- build contrib/nrpe_check_control.c, however it seems to parse nagios 1.x config...

Changed files:
    nagios-nrpe.spec -> 1.57
    nrpe_check_control.patch -> 1.1

diff --git a/nagios-nrpe.spec b/nagios-nrpe.spec
index fe6a9d5c4003cb547768a2aaae86ec976e64c597..6d14a57700af6d44d840ce3ff41216a3ead8c324 100644 (file)
--- a/nagios-nrpe.spec
+++ b/nagios-nrpe.spec
@@ -10,6 +10,7 @@ Source0:      http://downloads.sourceforge.net/nagios/nrpe-%{version}.tar.gz
 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
@@ -66,12 +67,13 @@ na innych komputerach za pomocą demona nrpe.
 
 %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 \
@@ -81,6 +83,8 @@ na innych komputerach za pomocą demona nrpe.
 
 %{__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}} \

diff --git a/nrpe_check_control.patch b/nrpe_check_control.patch
new file mode 100644 (file)
index 0000000..c388d98
--- /dev/null
+++ b/nrpe_check_control.patch
@@ -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[])
+ {