Hello community, here is the log from the commit of package nagios-nrpe for openSUSE:Factory checked in at Mon Feb 7 23:50:59 CET 2011. -------- --- nagios-nrpe/nagios-nrpe.changes 2010-12-07 22:42:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/nagios-nrpe/nagios-nrpe.changes 2011-02-07 22:11:26.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 7 21:08:55 UTC 2011 - lars@linux-schulserver.de + +- also package nrpe_check_control from contrib + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nrpe_check_control.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-nrpe.spec ++++++ --- /var/tmp/diff_new_pack.nL4kPB/_old 2011-02-07 23:50:20.000000000 +0100 +++ /var/tmp/diff_new_pack.nL4kPB/_new 2011-02-07 23:50:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package nagios-nrpe (Version 2.12) +# spec file for package nagios-nrpe # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ Name: nagios-nrpe Summary: Nagios Remote Plug-In Executor Version: 2.12 -Release: 16 +Release: 17 License: GPLv2+ Group: System/Monitoring Url: http://www.nagios.org/ @@ -49,6 +49,7 @@ Patch7: nrpe-unused_variable.patch Patch8: nrpe-return_value.patch Patch9: nrpe-uninitialized_variable.patch +Patch10: nrpe_check_control.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: coreutils grep pwdutils sed netcfg @@ -150,6 +151,7 @@ %patch7 -p0 %patch8 -p0 %patch9 -p0 +%patch10 -p0 %{__cp} -a %{S:10} . %build @@ -173,6 +175,8 @@ --enable-ssl make %{?jobs:-j%jobs} all +gcc %{optflags} -o contrib/nrpe_check_control contrib/nrpe_check_control.c + %install %{__make} install-all \ DESTDIR="%buildroot" \ @@ -203,6 +207,16 @@ # create home directory of nagios user mkdir -p %buildroot/var/lib/nagios +# create contrib plugin +install -m0755 contrib/nrpe_check_control %{buildroot}%{_libexecdir}/nrpe_check_control +cat > nrpe_check_control.cfg <<'EOF' +define command { + command_name nrpe_check_control + command_line %{_libexecdir}/nrpe_check_control $SERVICESTATE$ $SERVICESTATETYPE$ $SERVICEATTEMPT$ "$HOSTNAME$" +} +EOF +install -Dm0644 nrpe_check_control.cfg %{buildroot}%{_sysconfdir}/nagios/objects/nrpe_check_control.cfg + %pre # Create user and group on the system if necessary # default group: nagios @@ -267,6 +281,9 @@ %files -n nagios-plugins-nrpe %defattr(-,root,root) +%doc contrib/README.nrpe_check_control %_libexecdir/check_nrpe +%config(noreplace) %{_sysconfdir}/nagios/objects/nrpe_check_control.cfg +%{_libexecdir}/nrpe_check_control %changelog ++++++ nrpe_check_control.diff ++++++ --- contrib/nrpe_check_control.c 2002-02-22 02:15:34.000000000 +0100 +++ contrib/nrpe_check_control.c.oden 2007-04-11 11:33:54.000000000 +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/spool/nagios/nagios.cmd" +#define SERVICES_FILE "/etc/nagios/services.cfg" int main(int argc, char *argv[]) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org