Hello community,
here is the log from the commit of package nagios-nrpe
checked in at Thu May 17 11:48:31 CEST 2007.
--------
--- nagios-nrpe/nagios-nrpe.changes 2007-03-12 14:18:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/nagios-nrpe/nagios-nrpe.changes 2007-05-16 14:06:09.797824000 +0200
@@ -1,0 +2,10 @@
+Wed May 16 14:05:17 CEST 2007 - tsieden@suse.de
+
+- update to version 2.8.1
+ * Fixed configure script error with user-specified NRPE group
+ * Added support for multiline plugin output (limited to 1KB at the moment) (Matthias Flacke)
+ * Changes to sample config files
+ * Added ';' as an additional prohibited metachar for command arguments
+ * Updated documentation and added easier installation commands
+
+-------------------------------------------------------------------
Old:
----
nrpe-2.7.1.tar.bz2
New:
----
nrpe-2.8.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagios-nrpe.spec ++++++
--- /var/tmp/diff_new_pack.x19609/_old 2007-05-17 11:47:28.000000000 +0200
+++ /var/tmp/diff_new_pack.x19609/_new 2007-05-17 11:47:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package nagios-nrpe (Version 2.7.1)
+# spec file for package nagios-nrpe (Version 2.8.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
Group: System/Monitoring
Requires: nagios-plugins inet-daemon
Autoreqprov: on
-Version: 2.7.1
+Version: 2.8.1
Release: 1
Source0: nrpe-%{version}.tar.bz2
Source1: rcnrpe
@@ -96,6 +96,13 @@
%config(noreplace) /etc/xinetd.d/nagios-nrpe
%changelog
+* Wed May 16 2007 - tsieden@suse.de
+- update to version 2.8.1
+ * Fixed configure script error with user-specified NRPE group
+ * Added support for multiline plugin output (limited to 1KB at the moment) (Matthias Flacke)
+ * Changes to sample config files
+ * Added ';' as an additional prohibited metachar for command arguments
+ * Updated documentation and added easier installation commands
* Mon Mar 12 2007 - tsieden@suse.de
- update to version 2.7.1
* Changed C++ style comment to C style to fix compilation errors on AIX
++++++ nrpe-2.7.1.tar.bz2 -> nrpe-2.8.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/Changelog new/nrpe-2.8.1/Changelog
--- old/nrpe-2.7.1/Changelog 2007-03-08 16:18:34.000000000 +0100
+++ new/nrpe-2.8.1/Changelog 2007-05-10 16:34:20.000000000 +0200
@@ -3,17 +3,40 @@
**************
+
+2.8.1 - 05/10/2007
+-----------------
+- Fixed configure script error with user-specified NRPE group
+
+
+
+2.8 - 05/08/2007
+---------------
+- Added support for multiline plugin output (limited to 1KB at the moment) (Matthias Flacke)
+
+
+
+2.8b1 - 03/14/2007
+-----------------
+- Changes to sample config files
+- Added ';' as an additional prohibited metachar for command arguments
+- Updated documentation and added easier installation commands
+
+
+
2.7.1 - 03/08/2007
------------------
- Changed C++ style comment to C style to fix compilation errors on AIX (Ryan McGarry)
+
2.7 - 02/18/2007
----------------
- Patches for detection SSL header and library locations (Andrew Boyce-Lewis)
- NRPE daemon will now partially ignore non-fatal configuration file errors and attempt to startup (Andrew Boyce-Lewis)
+
2.6 - 12/11/2006
----------------
- Added -u option to check_nrpe to return UNKNOWN states on socket timeouts (Bjoern Beutel)
@@ -21,6 +44,7 @@
- Added graceful timeout to check_nrpe to ensure connection to NRPE daemon is properly closed (Mark Plaksin)
+
2.5.2 - 06/30/2006
------------------
- Fixed incorrect service name in sample xinetd config file
@@ -29,11 +53,13 @@
- Fix to (re)allow week random seed (Gerhard Lausser)
+
2.5.1 - 04/09/2006
------------------
- Patch to fix segfault if --no-ssl option is used (Sean Finney/Peter Palfrader)
+
2.5 - 04/06/2006
----------------
- (Re)added allowed_hosts option for systems that don't support TCP wrappers
@@ -41,6 +67,7 @@
- Fix for config file directory inclusion on ReiserFS (Gerhard Lausser)
+
2.4 - 02/22/2006
----------------
- Added option to allow week random seed (Gerhard Lausser)
@@ -50,6 +77,7 @@
- Fixed bug with disconnect message in debug mode
+
2.3 - 01/23/2006
----------------
- Spec file fixes
@@ -57,6 +85,7 @@
- Fixed problem with trimming command definitions
+
2.2 - 01/22/2006
----------------
- Spec file fix
@@ -68,6 +97,7 @@
- Added config file option for writing a PID file
+
2.1 - 01/19/2004
----------------
- Replaced host access list with TCP wrapper support
@@ -80,6 +110,7 @@
plugin process is closed
+
2.0 - 09/08/2003
----------------
- Added support for passing arguments to command
@@ -94,6 +125,7 @@
- Added license exemption for use with OpenSSL
+
1.8 - 01/16/2003
----------------
- Daemon now closes stdio/out/err properly (James Peterson)
@@ -102,6 +134,7 @@
- Fixed incorrect command line options in check_nrpe plugin
+
1.7 - 01/08/2003
----------------
- Spec file updates and minor bug fixes (James Peterson)
@@ -110,6 +143,7 @@
- Bug fix for command_timeout variable (James Peterson)
+
1.6 - 12/30/2002
----------------
- Updated sample commands to match new plugin argument format
@@ -122,23 +156,27 @@
- Added --with-nrpe-port config directive (James Peterson)
+
1.5 - 06/03/2002
----------------
- Added setuid/setgid option to config file (suggested by Marek Cervenka)
+
1.4 - 06/01/2002
----------------
- Changed STATE_UNKNOWN to value of 3 instead of -1 (old style)
- Minor doc and sample config file changes
+
1.3 - 02/21/2002
----------------
- Name and version change
- Ignore SIGHUP, minor cleanup (Jon Andrews)
+
1.2.5 - 12/22/2001
------------------
- Implemented Beej's sendall() to handle partial send()s
@@ -146,45 +184,53 @@
- Removed some old crud
+
1.2.4 - 02/22/2001
------------------
- I forgot what changes I made. Go figure...
+
1.2.3 - 12/21/2000
------------------
- A bit more documentation on configuring command definitions for the plugin
+
1.2.2 - 06/05/2000
------------------
- Fixed error in docs for running under inetd using TCP wrappers
- Replaced old email address in src/netutils.h with new one
+
1.2.1 - 05/07/2000
------------------
- Removed trapping of SIGCHLD
- Changed wait4() to waitpid() to allow compilation on HP-UX and AIX
+
1.2.0 - 04/18/2000
------------------
- Server forks twice after accepting a client connection, so as to prevent the
creation of zombies
+
1.1.5 - 04/07/2000
------------------
- Fixed a small bug where one debug message was not getting logged properly
+
1.1.4 - 03/30/2000
------------------
- Added option to disable/enable debug messages using the debug option in the
config file
+
1.1.3 - 03/11/2000
------------------
- Changed config file to use an absolute path
@@ -194,12 +240,14 @@
e.g. running check_nrpe on Linux and nrpe on Solaris. (Rene Klootwijk)
+
1.1.2 - 03/07/2000
------------------
- Removed unnecessary code in signal handler routine
- Unused signals are no longer trapper
+
1.1.1 - 02/28/2000 - RKL
---------------------------
- Modified syslog code to include string describing the error code.
@@ -220,11 +268,13 @@
of this interface in the nrpe.cfg file (e.g. server_address=192.168.2.3)
+
1.0 - 02/16/2000
------------------
- Added ability to run as a service under inetd
+
1.0b6 - 02/01/2000
------------------
- Added configure script
@@ -234,12 +284,14 @@
- Cleaned up code
+
1.0b5 - 01/10/2000
------------------
- Added init script contributed by Jacob L
- Incorporated syslog code and other patches contributed by Jacob L
+
1.0b4 - 11/04/1999
------------------
- Changed 'allowed_ip' option in configuration file to
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/configure new/nrpe-2.8.1/configure
--- old/nrpe-2.7.1/configure 2007-03-08 16:18:34.000000000 +0100
+++ new/nrpe-2.8.1/configure 2007-05-10 16:34:20.000000000 +0200
@@ -310,7 +310,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE CPP EGREP OTHERLIBS SOCKETLIBS LIBWRAPLIBS HAVE_SSL nrpe_user nrpe_grp nrpe_port PERL LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT SET_MAKE CPP EGREP OTHERLIBS SOCKETLIBS LIBWRAPLIBS HAVE_SSL nrpe_user nrpe_group NRPE_INSTALL_OPTS nrpe_port nagios_user nagios_group NAGIOS_INSTALL_OPTS PERL LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -857,6 +857,8 @@
--with-nrpe-user=<user> sets user name to run NRPE
--with-nrpe-group=<group> sets group name to run NRPE
--with-nrpe-port=<port> sets port number for NRPE to listen on
+--with-nagios-user=<user> sets user name for file permissions
+--with-nagios-group=<grp> sets group name file permissions
Some influential environment variables:
CC C compiler command
@@ -1294,9 +1296,9 @@
PKG_NAME=nrpe
-PKG_VERSION="2.7.1"
+PKG_VERSION="2.8.1"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="03-08-2007"
+PKG_REL_DATE="05-10-2007"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -6117,9 +6119,9 @@
# Check whether --with-nrpe_group or --without-nrpe_group was given.
if test "${with_nrpe_group+set}" = set; then
withval="$with_nrpe_group"
- nrpe_grp=$withval
+ nrpe_group=$withval
else
- nrpe_grp=nagios
+ nrpe_group=nagios
fi;
# Check whether --with-nrpe_port or --without-nrpe_port was given.
@@ -6131,12 +6133,37 @@
fi;
+echo "GROUP: $nrpe_group"
+NRPE_INSTALL_OPTS="-o $nrpe_user -g $nrpe_group"
+
cat >>confdefs.h <<_ACEOF
#define DEFAULT_SERVER_PORT $nrpe_port
_ACEOF
+
+# Check whether --with-nagios_user or --without-nagios_user was given.
+if test "${with_nagios_user+set}" = set; then
+ withval="$with_nagios_user"
+ nagios_user=$withval
+else
+ nagios_user=nagios
+fi;
+
+# Check whether --with-nagios_group or --without-nagios_group was given.
+if test "${with_nagios_group+set}" = set; then
+ withval="$with_nagios_group"
+ nagios_grp=$withval
+else
+ nagios_group=nagios
+fi;
+
+
+NAGIOS_INSTALL_OPTS="-o $nagios_user -g $nagios_group"
+
+
+
# Check whether --enable-command-args or --disable-command-args was given.
if test "${enable_command_args+set}" = set; then
enableval="$enable_command_args"
@@ -6774,8 +6801,12 @@
s,@LIBWRAPLIBS@,$LIBWRAPLIBS,;t t
s,@HAVE_SSL@,$HAVE_SSL,;t t
s,@nrpe_user@,$nrpe_user,;t t
-s,@nrpe_grp@,$nrpe_grp,;t t
+s,@nrpe_group@,$nrpe_group,;t t
+s,@NRPE_INSTALL_OPTS@,$NRPE_INSTALL_OPTS,;t t
s,@nrpe_port@,$nrpe_port,;t t
+s,@nagios_user@,$nagios_user,;t t
+s,@nagios_group@,$nagios_group,;t t
+s,@NAGIOS_INSTALL_OPTS@,$NAGIOS_INSTALL_OPTS,;t t
s,@PERL@,$PERL,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
@@ -7287,12 +7318,16 @@
echo " General Options:"
echo " -------------------------"
-echo "$as_me:$LINENO: result: NRPE port: $nrpe_port" >&5
-echo "${ECHO_T} NRPE port: $nrpe_port" >&6
-echo "$as_me:$LINENO: result: NRPE user: $nrpe_user" >&5
-echo "${ECHO_T} NRPE user: $nrpe_user" >&6
-echo "$as_me:$LINENO: result: NRPE group: $nrpe_grp" >&5
-echo "${ECHO_T} NRPE group: $nrpe_grp" >&6
+echo "$as_me:$LINENO: result: NRPE port: $nrpe_port" >&5
+echo "${ECHO_T} NRPE port: $nrpe_port" >&6
+echo "$as_me:$LINENO: result: NRPE user: $nrpe_user" >&5
+echo "${ECHO_T} NRPE user: $nrpe_user" >&6
+echo "$as_me:$LINENO: result: NRPE group: $nrpe_group" >&5
+echo "${ECHO_T} NRPE group: $nrpe_group" >&6
+echo "$as_me:$LINENO: result: Nagios user: $nagios_user" >&5
+echo "${ECHO_T} Nagios user: $nagios_user" >&6
+echo "$as_me:$LINENO: result: Nagios group: $nagios_group" >&5
+echo "${ECHO_T} Nagios group: $nagios_group" >&6
echo ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/configure.in new/nrpe-2.8.1/configure.in
--- old/nrpe-2.7.1/configure.in 2007-03-08 16:18:34.000000000 +0100
+++ new/nrpe-2.8.1/configure.in 2007-05-10 16:34:20.000000000 +0200
@@ -9,9 +9,9 @@
AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nrpe
-PKG_VERSION="2.7.1"
+PKG_VERSION="2.8.1"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="03-08-2007"
+PKG_REL_DATE="05-10-2007"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
@@ -259,13 +259,24 @@
fi
AC_ARG_WITH(nrpe_user,--with-nrpe-user=<user> sets user name to run NRPE,nrpe_user=$withval,nrpe_user=nagios)
-AC_ARG_WITH(nrpe_group,--with-nrpe-group=<group> sets group name to run NRPE,nrpe_grp=$withval,nrpe_grp=nagios)
+AC_ARG_WITH(nrpe_group,--with-nrpe-group=<group> sets group name to run NRPE,nrpe_group=$withval,nrpe_group=nagios)
AC_ARG_WITH(nrpe_port,--with-nrpe-port=<port> sets port number for NRPE to listen on,nrpe_port=$withval,nrpe_port=5666)
AC_SUBST(nrpe_user)
-AC_SUBST(nrpe_grp)
+AC_SUBST(nrpe_group)
+echo "GROUP: $nrpe_group"
+NRPE_INSTALL_OPTS="-o $nrpe_user -g $nrpe_group"
+AC_SUBST(NRPE_INSTALL_OPTS)
AC_SUBST(nrpe_port)
AC_DEFINE_UNQUOTED(DEFAULT_SERVER_PORT,$nrpe_port)
+AC_ARG_WITH(nagios_user,--with-nagios-user=<user> sets user name for file permissions,nagios_user=$withval,nagios_user=nagios)
+AC_ARG_WITH(nagios_group,--with-nagios-group=<grp> sets group name file permissions,nagios_grp=$withval,nagios_group=nagios)
+AC_SUBST(nagios_user)
+AC_SUBST(nagios_group)
+NAGIOS_INSTALL_OPTS="-o $nagios_user -g $nagios_group"
+AC_SUBST(NAGIOS_INSTALL_OPTS)
+
+
AC_ARG_ENABLE(command-args,--enable-command-args allows clients to specify command arguments. *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!,AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS))
@@ -288,9 +299,11 @@
echo " General Options:"
echo " -------------------------"
-AC_MSG_RESULT([ NRPE port: $nrpe_port])
-AC_MSG_RESULT([ NRPE user: $nrpe_user])
-AC_MSG_RESULT([ NRPE group: $nrpe_grp])
+AC_MSG_RESULT([ NRPE port: $nrpe_port])
+AC_MSG_RESULT([ NRPE user: $nrpe_user])
+AC_MSG_RESULT([ NRPE group: $nrpe_group])
+AC_MSG_RESULT([ Nagios user: $nagios_user])
+AC_MSG_RESULT([ Nagios group: $nagios_group])
echo ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/include/common.h new/nrpe-2.8.1/include/common.h
--- old/nrpe-2.7.1/include/common.h 2007-03-08 16:18:35.000000000 +0100
+++ new/nrpe-2.8.1/include/common.h 2007-05-10 16:34:21.000000000 +0200
@@ -2,7 +2,7 @@
*
* COMMON.H - NRPE Common Include File
* Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 03-08-2007
+ * Last Modified: 05-10-2007
*
* License:
*
@@ -23,8 +23,8 @@
#include "config.h"
-#define PROGRAM_VERSION "2.7.1"
-#define MODIFICATION_DATE "03-08-2007"
+#define PROGRAM_VERSION "2.8.1"
+#define MODIFICATION_DATE "05-10-2007"
#define OK 0
#define ERROR -1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/include/dh.h new/nrpe-2.8.1/include/dh.h
--- old/nrpe-2.7.1/include/dh.h 2007-03-08 16:18:35.000000000 +0100
+++ new/nrpe-2.8.1/include/dh.h 2007-05-10 16:34:21.000000000 +0200
@@ -4,12 +4,12 @@
DH *get_dh512()
{
static unsigned char dh512_p[]={
- 0xAF,0x2D,0x6D,0x09,0x3D,0xFE,0x41,0x34,0x51,0xFF,0xCB,0x76,
- 0xF7,0x45,0x00,0x85,0x76,0xED,0xF8,0xD9,0x2C,0xD8,0x08,0x4C,
- 0x0E,0xA9,0xA4,0x90,0x12,0x80,0x85,0x0D,0x18,0xF7,0xAF,0xB6,
- 0xC6,0xDE,0xC4,0x65,0x51,0x9A,0x9F,0x17,0xA2,0x11,0x0D,0x0E,
- 0x57,0xE0,0xC3,0x2C,0x15,0x87,0x7D,0x9B,0x1F,0x07,0x14,0x9D,
- 0xE2,0x54,0x03,0x53,
+ 0x93,0x6C,0x38,0x09,0x07,0x6C,0xA2,0xAF,0xBC,0x71,0xD8,0xC3,
+ 0xA3,0x5E,0xEE,0x36,0xDD,0x5A,0x37,0x4B,0xA8,0x5C,0x45,0x4C,
+ 0x7D,0xCD,0xA2,0x8D,0xD2,0xBC,0x24,0x86,0xB4,0xCE,0x21,0xDD,
+ 0xE6,0xBD,0x27,0x27,0x7A,0x23,0x03,0xBC,0x7C,0x38,0x9A,0x31,
+ 0xED,0xFA,0xA2,0xFC,0x42,0xE0,0x36,0x9E,0x55,0x4E,0x7C,0x8E,
+ 0x7A,0xAF,0xE2,0x4B,
};
static unsigned char dh512_g[]={
0x02,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/Makefile.in new/nrpe-2.8.1/Makefile.in
--- old/nrpe-2.7.1/Makefile.in 2003-11-01 20:14:17.000000000 +0100
+++ new/nrpe-2.8.1/Makefile.in 2007-03-14 16:30:05.000000000 +0100
@@ -1,7 +1,7 @@
###############################
# Makefile for NRPE
#
-# Last Modified: 10-14-2003
+# Last Modified: 03-14-2007
###############################
@@ -9,6 +9,24 @@
SRC_BASE=./src/
SRC_INCLUDE=./include/
+CC=@CC@
+CFLAGS=@CFLAGS@ @DEFS@
+LDFLAGS=@LDFLAGS@ @LIBS@
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+CFGDIR=@sysconfdir@
+BINDIR=@bindir@
+SBINDIR=@sbindir@
+LIBEXECDIR=@libexecdir@
+INSTALL=@INSTALL@
+NAGIOS_INSTALL_OPTS=@NAGIOS_INSTALL_OPTS@
+NRPE_INSTALL_OPTS=@NRPE_INSTALL_OPTS@
+
+INIT_DIR=@init_dir@
+INIT_OPTS=-o root -g root
+
+
all:
cd $(SRC_BASE); $(MAKE) ; cd ..
@@ -16,26 +34,10 @@
@echo "*** Compile finished ***"
@echo ""
@echo "If the NRPE daemon and client compiled without any errors, you"
- @echo "can continue with installation. The NRPE daemon and client"
- @echo "binaries are located in the src/ subdirectory."
- @echo ""
- @echo " ** If this is your monitoring host **"
- @echo ""
- @echo " - Copy the check_nrpe client to the directory that"
- @echo " contains your Nagios plugins."
- @echo " - Create a command definition in your Nagios config"
- @echo " file for the NRPE client. See the README file for"
- @echo " more info on doing this."
- @echo ""
- @echo " ** If this host will be running the NRPE daemon **"
+ @echo "can continue with the installation or upgrade process."
@echo ""
- @echo " - Copy the nrpe daemon to /usr/sbin, /usr/local/nagios"
- @echo " or wherever you feel it fits best."
- @echo " - Copy the sample nrpe.cfg config file to /etc,"
- @echo " /usr/local/nagios or wherever you feel it fits best."
- @echo " - Modify the /etc/services file and configure NRPE to"
- @echo " run under inetd, xinetd, or as a standalone daemon."
- @echo " See the README file for more info on doing this."
+ @echo "Read the PDF documentation (NRPE.pdf) for information on the next"
+ @echo "steps you should take to complete the installation or upgrade."
@echo ""
nrpe:
cd $(SRC_BASE); $(MAKE) ; cd ..
@@ -44,6 +46,22 @@
cd $(SRC_BASE); $(MAKE) ; cd ..
+install-plugin:
+ cd $(SRC_BASE) && $(MAKE) $@
+
+install-daemon:
+ cd $(SRC_BASE) && $(MAKE) $@
+
+install:
+ cd $(SRC_BASE) && $(MAKE) $@
+
+install-xinetd:
+ $(INSTALL) -m 644 sample-config/nrpe.xinetd /etc/xinetd.d/nrpe
+
+install-daemon-config:
+ $(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+ $(INSTALL) -m 644 $(NRPE_INSTALL_OPTS) sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)
+
clean:
cd $(SRC_BASE); $(MAKE) $@ ; cd ..
rm -f core
Files old/nrpe-2.7.1/NRPE.pdf and new/nrpe-2.8.1/NRPE.pdf differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/nrpe.spec new/nrpe-2.8.1/nrpe.spec
--- old/nrpe-2.7.1/nrpe.spec 2007-03-08 16:18:34.000000000 +0100
+++ new/nrpe-2.8.1/nrpe.spec 2007-05-10 16:34:20.000000000 +0200
@@ -1,5 +1,5 @@
%define name nrpe
-%define version 2.7.1
+%define version 2.8.1
%define release 1
%define nsusr nagios
%define nsgrp nagios
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/README new/nrpe-2.8.1/README
--- old/nrpe-2.7.1/README 2006-04-17 22:59:13.000000000 +0200
+++ new/nrpe-2.8.1/README 2007-03-14 16:30:05.000000000 +0100
@@ -1,6 +1,15 @@
-***********
+-----------
NRPE README
-***********
+-----------
+
+
+** UPDATED DOCUMENTATION!
+
+For installation instructions and information on the design overview
+of the NRPE addon, please read the PDF documentation that is found in
+this directory: NRPE.pdf
+
+
Purpose
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/sample-config/nrpe.cfg.in new/nrpe-2.8.1/sample-config/nrpe.cfg.in
--- old/nrpe-2.7.1/sample-config/nrpe.cfg.in 2006-12-12 03:04:00.000000000 +0100
+++ new/nrpe-2.8.1/sample-config/nrpe.cfg.in 2007-03-09 19:08:58.000000000 +0100
@@ -2,7 +2,7 @@
# Sample NRPE Config File
# Written by: Ethan Galstad (nagios@nagios.org)
#
-# Last Modified: 12-11-2006
+# Last Modified: 03-09-2007
#
# NOTES:
# This is a sample configuration file for the NRPE daemon. It needs to be
@@ -34,7 +34,7 @@
# and you do not want nrpe to bind on all interfaces.
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-#server_address=192.168.1.1
+#server_address=127.0.0.1
@@ -54,7 +54,7 @@
#
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-nrpe_group=@nrpe_grp@
+nrpe_group=@nrpe_group@
@@ -69,7 +69,7 @@
#
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-#allowed_hosts=127.0.0.1,192.168.0.2
+allowed_hosts=127.0.0.1
@@ -186,19 +186,21 @@
# to match the argument format the plugins expect. Remember, these are
# examples only!
+
# The following examples use hardcoded command arguments...
command[check_users]=@libexecdir@/check_users -w 5 -c 10
command[check_load]=@libexecdir@/check_load -w 15,10,5 -c 30,25,20
-command[check_disk1]=@libexecdir@/check_disk -w 20 -c 10 -p /dev/hda1
-command[check_disk2]=@libexecdir@/check_disk -w 20 -c 10 -p /dev/hdb1
+command[check_hda1]=@libexecdir@/check_disk -w 20 -c 10 -p /dev/hda1
command[check_zombie_procs]=@libexecdir@/check_procs -w 5 -c 10 -s Z
command[check_total_procs]=@libexecdir@/check_procs -w 150 -c 200
+
# The following examples allow user-supplied arguments and can
# only be used if the NRPE daemon was compiled with support for
# command arguments *AND* the dont_blame_nrpe directive in this
-# config file is set to '1'...
+# config file is set to '1'. This poses a potential security risk, so
+# make sure you read the SECURITY file before doing this.
#command[check_users]=@libexecdir@/check_users -w $ARG1$ -c $ARG2$
#command[check_load]=@libexecdir@/check_load -w $ARG1$ -c $ARG2$
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/sample-config/nrpe.xinetd.in new/nrpe-2.8.1/sample-config/nrpe.xinetd.in
--- old/nrpe-2.7.1/sample-config/nrpe.xinetd.in 2006-04-17 22:59:13.000000000 +0200
+++ new/nrpe-2.8.1/sample-config/nrpe.xinetd.in 2007-03-09 20:19:17.000000000 +0100
@@ -3,10 +3,11 @@
service nrpe
{
flags = REUSE
- socket_type = stream
+ socket_type = stream
+ port = @nrpe_port@
wait = no
user = @nrpe_user@
- group = @nrpe_grp@
+ group = @nrpe_group@
server = @bindir@/nrpe
server_args = -c @sysconfdir@/nrpe.cfg --inetd
log_on_failure += USERID
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/SECURITY new/nrpe-2.8.1/SECURITY
--- old/nrpe-2.7.1/SECURITY 2006-02-03 23:02:32.000000000 +0100
+++ new/nrpe-2.8.1/SECURITY 2007-03-09 19:08:57.000000000 +0100
@@ -44,14 +44,13 @@
-----------------
To help prevent some nasty things from being done by evil
-clients, the following twelve metacharacters are not allowed
+clients, the following metacharacters are not allowed
in client command arguments:
- | ` & > < ' " \ [ ] { }
+ | ` & > < ' " \ [ ] { } ; !
Any client request which contains the abovementioned metachars
-is discarded. Also, the bang character (!) is not allowed, as
-it is used internally as a delimiter between command arguments.
+is discarded.
USER/GROUP RESTRICTIONS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/src/check_nrpe.c new/nrpe-2.8.1/src/check_nrpe.c
--- old/nrpe-2.7.1/src/check_nrpe.c 2007-03-08 16:18:35.000000000 +0100
+++ new/nrpe-2.8.1/src/check_nrpe.c 2007-05-10 16:34:21.000000000 +0200
@@ -4,7 +4,7 @@
* Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
* License: GPL
*
- * Last Modified: 03-08-2007
+ * Last Modified: 05-10-2007
*
* Command line: CHECK_NRPE -H [-p port] [-c command] [-to to_sec]
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/src/Makefile.in new/nrpe-2.8.1/src/Makefile.in
--- old/nrpe-2.7.1/src/Makefile.in 2003-10-16 01:14:26.000000000 +0200
+++ new/nrpe-2.8.1/src/Makefile.in 2007-05-10 16:34:21.000000000 +0200
@@ -1,7 +1,7 @@
###############################
# Makefile for NRPE
#
-# Last Modified: 10-14-2003
+# Last Modified: 05-10-2007
###############################
@@ -17,6 +17,16 @@
CP=@CP@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+CFGDIR=@sysconfdir@
+BINDIR=@bindir@
+SBINDIR=@sbindir@
+LIBEXECDIR=@libexecdir@
+INSTALL=@INSTALL@
+NAGIOS_INSTALL_OPTS=@NAGIOS_INSTALL_OPTS@
+NRPE_INSTALL_OPTS=@NRPE_INSTALL_OPTS@
+
all: nrpe check_nrpe
@@ -26,6 +36,18 @@
check_nrpe: check_nrpe.c utils.c $(SRC_INCLUDE)/utils.h $(SRC_INCLUDE)/common.h $(SRC_INCLUDE)/config.h
$(CC) $(CFLAGS) -o $@ check_nrpe.c utils.c $(LDFLAGS) $(SOCKETLIBS) $(OTHERLIBS)
+install:
+ $(MAKE) install-plugin
+ $(MAKE) install-daemon
+
+install-plugin:
+ $(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
+ $(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) check_nrpe $(DESTDIR)$(LIBEXECDIR)
+
+install-daemon:
+ $(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 775 $(NRPE_INSTALL_OPTS) nrpe $(DESTDIR)$(BINDIR)
+
clean:
rm -f core nrpe check_nrpe
rm -f *~ */*~
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/src/nrpe.c new/nrpe-2.8.1/src/nrpe.c
--- old/nrpe-2.7.1/src/nrpe.c 2007-03-08 16:18:35.000000000 +0100
+++ new/nrpe-2.8.1/src/nrpe.c 2007-05-10 16:34:21.000000000 +0200
@@ -4,7 +4,7 @@
* Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
* License: GPL
*
- * Last Modified: 03-08-2007
+ * Last Modified: 05-10-2007
*
* Command line: nrpe -c [--inetd | --daemon]
*
@@ -42,7 +42,7 @@
#define DEFAULT_COMMAND_TIMEOUT 60 /* default timeout for execution of plugins */
#define MAXFD 64
-#define NASTY_METACHARS "|`&><'\"\\[]{}"
+#define NASTY_METACHARS "|`&><'\"\\[]{};"
char *command_name=NULL;
char *macro_argv[MAX_COMMAND_ARGUMENTS];
@@ -1322,13 +1322,12 @@
}
else{
- /* read in the first line of output from the command */
- strcpy(buffer,"");
- fgets(buffer,sizeof(buffer)-1,fp);
+ /* read all lines of output - supports Nagios 3.x multiline output */
+ while((bytes_read=fread(buffer,1,sizeof(buffer)-1,fp))>0){
- /* ADDED 01/19/2004 */
- /* ignore any additional lines of output */
- while(fgets(temp_buffer,sizeof(temp_buffer)-1,fp));
+ /* write the output back to the parent process */
+ write(fd[1],buffer,bytes_read);
+ }
/* close the command and get termination status */
status=pclose(fp);
@@ -1338,9 +1337,6 @@
result=STATE_CRITICAL;
else
result=WEXITSTATUS(status);
-
- /* write the output back to the parent process */
- write(fd[1],buffer,strlen(buffer)+1);
}
/* close pipe for writing */
@@ -1349,6 +1345,7 @@
/* reset the alarm */
alarm(0);
+ /* return plugin exit code to parent process */
exit(result);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/subst.in new/nrpe-2.8.1/subst.in
--- old/nrpe-2.7.1/subst.in 2002-12-31 07:03:33.000000000 +0100
+++ new/nrpe-2.8.1/subst.in 2007-03-09 19:08:57.000000000 +0100
@@ -21,7 +21,7 @@
while (<IN>) {
s|\@nrpe_user\@|@nrpe_user@|g;
- s|\@nrpe_grp\@|@nrpe_grp@|g;
+ s|\@nrpe_group\@|@nrpe_group@|g;
s|\@nrpe_port\@|@nrpe_port@|g;
s|\@libexecdir\@|@libexecdir@|g; # put all --with-vars before directories
s|\@localstatedir\@|@localstatedir@|g;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.7.1/update-version new/nrpe-2.8.1/update-version
--- old/nrpe-2.7.1/update-version 2007-03-08 16:18:34.000000000 +0100
+++ new/nrpe-2.8.1/update-version 2007-05-10 16:34:20.000000000 +0200
@@ -10,10 +10,10 @@
fi
# Current version number
-CURRENTVERSION=2.7.1
+CURRENTVERSION=2.8.1
# Last date
-LASTDATE=03-08-2007
+LASTDATE=05-10-2007
if [ "x$1" = "x" ]
then
++++++ xinet.patch ++++++
--- /var/tmp/diff_new_pack.x19609/_old 2007-05-17 11:47:29.000000000 +0200
+++ /var/tmp/diff_new_pack.x19609/_new 2007-05-17 11:47:29.000000000 +0200
@@ -1,23 +1,23 @@
---- sample-config/nrpe.xinetd.in
-+++ sample-config/nrpe.xinetd.in
-@@ -1,15 +1,17 @@
+--- sample-config/nrpe.xinetd.in 2007-03-09 20:19:17.000000000 +0100
++++ sample-config/nrpe.xinetd.in 2007-05-16 14:51:27.833071000 +0200
+@@ -1,9 +1,10 @@
-# default: on
+# default: off
# description: NRPE (Nagios Remote Plugin Executor)
service nrpe
{
flags = REUSE
- socket_type = stream
-+ type = UNLISTED
-+ port = @nrpe_port@
+ socket_type = stream
++ type = UNLISTED
+ port = @nrpe_port@
wait = no
user = @nrpe_user@
- group = @nrpe_grp@
+@@ -11,6 +12,6 @@
server = @bindir@/nrpe
server_args = -c @sysconfdir@/nrpe.cfg --inetd
log_on_failure += USERID
- disable = no
- only_from = 127.0.0.1
+ disable = yes
-+ #only_from = 127.0.0.1
++# only_from = 127.0.0.1
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org