Hello community,
here is the log from the commit of package nagios-nrpe
checked in at Tue Jan 30 15:24:03 CET 2007.
--------
--- nagios-nrpe/nagios-nrpe.changes 2006-07-01 08:53:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/nagios-nrpe/nagios-nrpe.changes 2007-01-30 11:03:46.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Jan 30 11:00:36 CET 2007 - tsieden@suse.de
+
+- update to version 2.6
+ * Added -u option to check_nrpe to return UNKNOWN states on socket
+ timeouts (Bjoern Beutel)
+ * Added connection_timeout variable to NRPE daemon to catch dead
+ client connections (Ton Voon)
+ * Added graceful timeout to check_nrpe to ensure connection to
+ NRPE daemon is properly closed (Mark Plaksin)
+
+-------------------------------------------------------------------
Old:
----
nrpe-2.5.2.tar.bz2
New:
----
nrpe-2.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagios-nrpe.spec ++++++
--- /var/tmp/diff_new_pack.u27216/_old 2007-01-30 15:23:57.000000000 +0100
+++ /var/tmp/diff_new_pack.u27216/_new 2007-01-30 15:23:57.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package nagios-nrpe (Version 2.5.2)
+# spec file for package nagios-nrpe (Version 2.6)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,11 +12,11 @@
Name: nagios-nrpe
BuildRequires: nagios-plugins openssl-devel tcpd-devel
-License: GPL
+License: GNU General Public License (GPL)
Group: System/Monitoring
Requires: nagios-plugins inet-daemon
Autoreqprov: on
-Version: 2.5.2
+Version: 2.6
Release: 1
Source0: nrpe-%{version}.tar.bz2
Source1: rcnrpe
@@ -96,6 +96,14 @@
%config(noreplace) /etc/xinetd.d/nagios-nrpe
%changelog -n nagios-nrpe
+* Tue Jan 30 2007 - tsieden@suse.de
+- update to version 2.6
+ * Added -u option to check_nrpe to return UNKNOWN states on socket
+ timeouts (Bjoern Beutel)
+ * Added connection_timeout variable to NRPE daemon to catch dead
+ client connections (Ton Voon)
+ * Added graceful timeout to check_nrpe to ensure connection to
+ NRPE daemon is properly closed (Mark Plaksin)
* Sat Jul 01 2006 - stark@suse.de
- update to version 2.5.2
* number of bugfixes
@@ -145,7 +153,7 @@
* Mon Jan 13 2003 - stark@suse.de
- update to 1.7
* Syntax changes (-H option specifies host name in check_nrpe,
--c option specifies config file in nrpe)
+ -c option specifies config file in nrpe)
* Added command_timeout directive to config file to allow user
to specify timeout for executing plugins
* Thu Sep 26 2002 - stark@suse.de
++++++ nrpe-2.5.2.tar.bz2 -> nrpe-2.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/Changelog new/nrpe-2.6/Changelog
--- old/nrpe-2.5.2/Changelog 2006-07-01 00:00:27.000000000 +0200
+++ new/nrpe-2.6/Changelog 2006-12-12 03:03:59.000000000 +0100
@@ -2,6 +2,12 @@
NRPE Changelog
**************
+2.6 - 12/11/2006
+------------------
+- Added -u option to check_nrpe to return UNKNOWN states on socket timeouts (Bjoern Beutel)
+- Added connection_timeout variable to NRPE daemon to catch dead client connections (Ton Voon)
+- Added graceful timeout to check_nrpe to ensure connection to NRPE daemon is properly closed (Mark Plaksin)
+
2.5.2 - 06/30/2006
------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/configure new/nrpe-2.6/configure
--- old/nrpe-2.5.2/configure 2006-07-01 00:00:27.000000000 +0200
+++ new/nrpe-2.6/configure 2006-12-12 03:03:59.000000000 +0100
@@ -1294,9 +1294,9 @@
PKG_NAME=nrpe
-PKG_VERSION="2.5.2"
+PKG_VERSION="2.6"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="06-30-2006"
+PKG_REL_DATE="12-11-2006"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -5654,7 +5654,8 @@
-for ac_func in strdup strstr strtoul initgroups
+
+for ac_func in strdup strstr strtoul initgroups closesocket
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/configure.in new/nrpe-2.6/configure.in
--- old/nrpe-2.5.2/configure.in 2006-07-01 00:00:27.000000000 +0200
+++ new/nrpe-2.6/configure.in 2006-12-12 03:03:59.000000000 +0100
@@ -9,9 +9,9 @@
AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nrpe
-PKG_VERSION="2.5.2"
+PKG_VERSION="2.6"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="06-30-2006"
+PKG_REL_DATE="12-11-2006"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
@@ -95,7 +95,7 @@
AC_DEFINE(HAVE_LIBWRAP)
])
AC_SUBST(LIBWRAPLIBS)
-AC_CHECK_FUNCS(strdup strstr strtoul initgroups)
+AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket)
dnl socklen_t check - from curl
AC_CHECK_TYPE([socklen_t], ,[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/common.h new/nrpe-2.6/include/common.h
--- old/nrpe-2.5.2/include/common.h 2006-04-10 03:42:29.000000000 +0200
+++ new/nrpe-2.6/include/common.h 2006-12-12 03:03:59.000000000 +0100
@@ -1,8 +1,8 @@
/************************************************************************
*
* COMMON.H - NRPE Common Include File
- * Copyright (c) 1999-2003 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 03-05-2003
+ * Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
+ * Last Modified: 12-11-2006
*
* License:
*
@@ -23,8 +23,8 @@
#include "config.h"
-#define PROGRAM_VERSION "2.5.1"
-#define MODIFICATION_DATE "04-09-2006"
+#define PROGRAM_VERSION "2.6"
+#define MODIFICATION_DATE "12-11-2006"
#define OK 0
#define ERROR -1
@@ -39,6 +39,7 @@
#define DEFAULT_SOCKET_TIMEOUT 10 /* timeout after 10 seconds */
+#define DEFAULT_CONNECTION_TIMEOUT 300 /* timeout if daemon is waiting for connection more than this time */
#define MAX_INPUT_BUFFER 2048 /* max size of most buffers we use */
#define MAX_FILENAME_LENGTH 256
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/config.h.in new/nrpe-2.6/include/config.h.in
--- old/nrpe-2.5.2/include/config.h.in 2006-01-21 00:44:09.000000000 +0100
+++ new/nrpe-2.6/include/config.h.in 2006-12-12 03:03:59.000000000 +0100
@@ -2,7 +2,7 @@
*
* NRPE Common Header File
* Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 01-20-2006
+ * Last Modified: 12-11-2006
*
* License:
*
@@ -43,6 +43,7 @@
#undef HAVE_STRSTR
#undef HAVE_STRTOUL
#undef HAVE_INITGROUPS
+#undef HAVE_CLOSESOCKET
#undef SIZEOF_INT
#undef SIZEOF_SHORT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/dh.h new/nrpe-2.6/include/dh.h
--- old/nrpe-2.5.2/include/dh.h 2006-04-28 18:41:54.000000000 +0200
+++ new/nrpe-2.6/include/dh.h 2006-12-12 03:04:00.000000000 +0100
@@ -4,12 +4,12 @@
DH *get_dh512()
{
static unsigned char dh512_p[]={
- 0xDD,0xFE,0xAB,0x05,0xB7,0x0F,0xD8,0xDA,0x6D,0xAD,0x7C,0xD8,
- 0x5D,0x9E,0xE9,0xE6,0x79,0x28,0x19,0xE7,0xAA,0xA9,0x56,0xD1,
- 0xDE,0x11,0xD0,0x89,0x8D,0x63,0x2D,0xB1,0xDD,0x29,0x4F,0x83,
- 0x7A,0xAB,0x85,0xAA,0xE8,0xB7,0x4D,0x4F,0x8E,0x16,0x90,0xA3,
- 0xBD,0x55,0x57,0xE8,0x21,0x77,0xE9,0x5D,0x87,0x5C,0xF1,0xFA,
- 0x81,0xC0,0xD5,0xF3,
+ 0xF7,0xA2,0x46,0xB0,0x6F,0x77,0xC4,0xD1,0x98,0x62,0xBD,0x55,
+ 0x3F,0x6C,0x49,0x9E,0x0B,0x2D,0xDE,0xA3,0x51,0x36,0xA5,0xBF,
+ 0xF8,0x1C,0xC1,0xD3,0xA1,0xD8,0x69,0x06,0xB1,0x21,0x87,0xF2,
+ 0x9E,0x74,0x30,0x4E,0x56,0x09,0x8C,0x4F,0xD3,0x9A,0xDA,0xB8,
+ 0x37,0x72,0xA0,0x71,0x69,0x52,0x33,0x62,0x16,0xC3,0xE6,0xA0,
+ 0x8A,0x98,0xEF,0xFB,
};
static unsigned char dh512_g[]={
0x02,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/nrpe.h new/nrpe-2.6/include/nrpe.h
--- old/nrpe-2.5.2/include/nrpe.h 2006-02-23 23:48:26.000000000 +0100
+++ new/nrpe-2.6/include/nrpe.h 2006-12-12 03:04:00.000000000 +0100
@@ -52,6 +52,7 @@
int process_macros(char *,char *,int);
int my_system(char *,int,int *,char *,int); /* executes a command via popen(), but also protects against timeouts */
void my_system_sighandler(int); /* handles timeouts when executing commands via my_system() */
+void my_connection_sighandler(int); /* handles timeouts of connection */
void sighandler(int);
void child_sighandler(int);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/include/utils.h new/nrpe-2.6/include/utils.h
--- old/nrpe-2.5.2/include/utils.h 2003-10-16 01:21:23.000000000 +0200
+++ new/nrpe-2.6/include/utils.h 2006-12-12 03:04:00.000000000 +0100
@@ -3,9 +3,9 @@
* UTILS.H - NRPE Utilities Include File
*
* License: GPL
- * Copyright (c) 1999-2003 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
*
- * Last Modified: 10-14-2003
+ * Last Modified: 12-11-2006
*
* Description:
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/nrpe.spec new/nrpe-2.6/nrpe.spec
--- old/nrpe-2.5.2/nrpe.spec 2006-07-01 00:00:27.000000000 +0200
+++ new/nrpe-2.6/nrpe.spec 2006-12-12 03:03:59.000000000 +0100
@@ -1,5 +1,5 @@
%define name nrpe
-%define version 2.5.2
+%define version 2.6
%define release 1
%define nsusr nagios
%define nsgrp nagios
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/sample-config/nrpe.cfg.in new/nrpe-2.6/sample-config/nrpe.cfg.in
--- old/nrpe-2.5.2/sample-config/nrpe.cfg.in 2006-02-23 23:48:26.000000000 +0100
+++ new/nrpe-2.6/sample-config/nrpe.cfg.in 2006-12-12 03:04:00.000000000 +0100
@@ -2,7 +2,7 @@
# Sample NRPE Config File
# Written by: Ethan Galstad (nagios@nagios.org)
#
-# Last Modified: 02-23-2006
+# Last Modified: 12-11-2006
#
# NOTES:
# This is a sample configuration file for the NRPE daemon. It needs to be
@@ -127,6 +127,17 @@
+# CONNECTION TIMEOUT
+# This specifies the maximum number of seconds that the NRPE daemon will
+# wait for a connection to be established before exiting. This is sometimes
+# seen where a network problem stops the SSL being established even though
+# all network sessions are connected. This causes the nrpe daemons to
+# accumulate, eating system resources. Do not set this too low.
+
+connection_timeout=300
+
+
+
# WEEK RANDOM SEED OPTION
# This directive allows you to use SSL even if your system does not have
# a /dev/random or /dev/urandom (on purpose or because the necessary patches
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.5.2/src/check_nrpe.c new/nrpe-2.6/src/check_nrpe.c
--- old/nrpe-2.5.2/src/check_nrpe.c 2006-04-10 03:42:30.000000000 +0200
+++ new/nrpe-2.6/src/check_nrpe.c 2006-12-12 03:04:00.000000000 +0100
@@ -4,7 +4,7 @@
* Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
* License: GPL
*
- * Last Modified: 04-09-2006
+ * Last Modified: 12-11-2006
*
* Command line: CHECK_NRPE -H
participants (1)
-
root@Hilbert.suse.de