Hello community,
here is the log from the commit of package nagios-nrpe
checked in at Tue Mar 13 00:59:20 CET 2007.
--------
--- nagios-nrpe/nagios-nrpe.changes 2007-01-30 11:03:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/nagios-nrpe/nagios-nrpe.changes 2007-03-12 14:18:41.588786000 +0100
@@ -1,0 +2,11 @@
+Mon Mar 12 14:17:39 CET 2007 - tsieden@suse.de
+
+- update to version 2.7.1
+ * Changed C++ style comment to C style to fix compilation errors on AIX
+ (Ryan McGarry)
+ * 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)
+
+-------------------------------------------------------------------
Old:
----
nrpe-2.6.tar.bz2
New:
----
nrpe-2.7.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagios-nrpe.spec ++++++
--- /var/tmp/diff_new_pack.V15183/_old 2007-03-13 00:59:08.000000000 +0100
+++ /var/tmp/diff_new_pack.V15183/_new 2007-03-13 00:59:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package nagios-nrpe (Version 2.6)
+# spec file for package nagios-nrpe (Version 2.7.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.6
+Version: 2.7.1
Release: 1
Source0: nrpe-%{version}.tar.bz2
Source1: rcnrpe
@@ -95,7 +95,15 @@
%config(noreplace) /etc/nagios/nrpe.cfg
%config(noreplace) /etc/xinetd.d/nagios-nrpe
-%changelog -n nagios-nrpe
+%changelog
+* 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
+ (Ryan McGarry)
+ * 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)
* Tue Jan 30 2007 - tsieden@suse.de
- update to version 2.6
* Added -u option to check_nrpe to return UNKNOWN states on socket
++++++ nrpe-2.6.tar.bz2 -> nrpe-2.7.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.6/Changelog new/nrpe-2.7.1/Changelog
--- old/nrpe-2.6/Changelog 2006-12-12 03:03:59.000000000 +0100
+++ new/nrpe-2.7.1/Changelog 2007-03-08 16:18:34.000000000 +0100
@@ -2,8 +2,20 @@
NRPE Changelog
**************
-2.6 - 12/11/2006
+
+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)
- 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)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.6/configure new/nrpe-2.7.1/configure
--- old/nrpe-2.6/configure 2006-12-12 03:03:59.000000000 +0100
+++ new/nrpe-2.7.1/configure 2007-03-08 16:18:34.000000000 +0100
@@ -851,7 +851,7 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
---with-ssl-lib=DIR sets location of the SSL library
+--with-ssl=DIR sets location of the SSL installation
--with-ssl-inc=DIR sets location of the SSL include files
--with-kerberos-inc=DIR sets location of the Kerberos include files
--with-nrpe-user=<user> sets user name to run NRPE
@@ -1294,9 +1294,9 @@
PKG_NAME=nrpe
-PKG_VERSION="2.6"
+PKG_VERSION="2.7.1"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="12-11-2006"
+PKG_REL_DATE="03-08-2007"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -5995,14 +5995,13 @@
check_for_ssl=yes
fi;
-ssl_lib_dir=
ssl_inc_dir=
-# Check whether --with-ssl-lib or --without-ssl-lib was given.
-if test "${with_ssl_lib+set}" = set; then
- withval="$with_ssl_lib"
+# Check whether --with-ssl or --without-ssl was given.
+if test "${with_ssl+set}" = set; then
+ withval="$with_ssl"
- ssl_lib_dir=$withval
+ ssl_dir=$withval
fi;
@@ -6026,16 +6025,28 @@
echo "$as_me:$LINENO: checking for SSL" >&5
echo $ECHO_N "checking for SSL... $ECHO_C" >&6
found_ssl=no
- for dir in $ssl_inc_dir /usr/local/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/freeware/lib/openssl; do
+ for dir in $ssl_inc_dir $ssl_dir /usr/local/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/freeware/lib/openssl; do
ssldir="$dir"
if test -f "$dir/include/openssl/ssl.h"; then
found_ssl=yes
- CFLAGS="$CFLAGS -I$ssldir/include/openssl -I$ssldir/include"
+ CFLAGS="$CFLAGS -I$dir/include/openssl -I$ssldir/include"
break
fi
if test -f "$dir/include/ssl.h"; then
found_ssl=yes
- CFLAGS="$CFLAGS -I$ssldir/include"
+ CFLAGS="$CFLAGS -I$dir/include"
+ break
+ fi
+ if test -f "$dir/ssl.h"; then
+ found_ssl=yes
+ CFLAGS="$CFLAGS -I$dir/include"
+ ssldir="$dir/.."
+ break
+ fi
+ if test -f "$dir/openssl/ssl.h"; then
+ found_ssl=yes
+ CFLAGS="$CFLAGS -I$dir/include"
+ ssldir="$dir/.."
break
fi
done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.6/configure.in new/nrpe-2.7.1/configure.in
--- old/nrpe-2.6/configure.in 2006-12-12 03:03:59.000000000 +0100
+++ new/nrpe-2.7.1/configure.in 2007-03-08 16:18:34.000000000 +0100
@@ -9,9 +9,9 @@
AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nrpe
-PKG_VERSION="2.6"
+PKG_VERSION="2.7.1"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="12-11-2006"
+PKG_REL_DATE="03-08-2007"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
@@ -168,10 +168,9 @@
],check_for_ssl=yes)
dnl Optional SSL library and include paths
-ssl_lib_dir=
ssl_inc_dir=
-AC_ARG_WITH(ssl-lib,--with-ssl-lib=DIR sets location of the SSL library,[
- ssl_lib_dir=$withval
+AC_ARG_WITH(ssl,--with-ssl=DIR sets location of the SSL installation,[
+ ssl_dir=$withval
])
AC_ARG_WITH(ssl-inc,--with-ssl-inc=DIR sets location of the SSL include files,[
ssl_inc_dir=$withval
@@ -185,16 +184,28 @@
if test x$check_for_ssl = xyes; then
AC_MSG_CHECKING(for SSL)
found_ssl=no
- for dir in $ssl_inc_dir /usr/local/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/freeware/lib/openssl; do
+ for dir in $ssl_inc_dir $ssl_dir /usr/local/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/freeware/lib/openssl; do
ssldir="$dir"
if test -f "$dir/include/openssl/ssl.h"; then
found_ssl=yes
- CFLAGS="$CFLAGS -I$ssldir/include/openssl -I$ssldir/include"
+ CFLAGS="$CFLAGS -I$dir/include/openssl -I$ssldir/include"
break
fi
if test -f "$dir/include/ssl.h"; then
found_ssl=yes
- CFLAGS="$CFLAGS -I$ssldir/include"
+ CFLAGS="$CFLAGS -I$dir/include"
+ break
+ fi
+ if test -f "$dir/ssl.h"; then
+ found_ssl=yes
+ CFLAGS="$CFLAGS -I$dir/include"
+ ssldir="$dir/.."
+ break
+ fi
+ if test -f "$dir/openssl/ssl.h"; then
+ found_ssl=yes
+ CFLAGS="$CFLAGS -I$dir/include"
+ ssldir="$dir/.."
break
fi
done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.6/include/common.h new/nrpe-2.7.1/include/common.h
--- old/nrpe-2.6/include/common.h 2006-12-12 03:03:59.000000000 +0100
+++ new/nrpe-2.7.1/include/common.h 2007-03-08 16:18:35.000000000 +0100
@@ -2,7 +2,7 @@
*
* COMMON.H - NRPE Common Include File
* Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 12-11-2006
+ * Last Modified: 03-08-2007
*
* License:
*
@@ -23,8 +23,8 @@
#include "config.h"
-#define PROGRAM_VERSION "2.6"
-#define MODIFICATION_DATE "12-11-2006"
+#define PROGRAM_VERSION "2.7.1"
+#define MODIFICATION_DATE "03-08-2007"
#define OK 0
#define ERROR -1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.6/include/dh.h new/nrpe-2.7.1/include/dh.h
--- old/nrpe-2.6/include/dh.h 2006-12-12 03:04:00.000000000 +0100
+++ new/nrpe-2.7.1/include/dh.h 2007-03-08 16:18:35.000000000 +0100
@@ -4,12 +4,12 @@
DH *get_dh512()
{
static unsigned char dh512_p[]={
- 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,
+ 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,
};
static unsigned char dh512_g[]={
0x02,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.6/nrpe.spec new/nrpe-2.7.1/nrpe.spec
--- old/nrpe-2.6/nrpe.spec 2006-12-12 03:03:59.000000000 +0100
+++ new/nrpe-2.7.1/nrpe.spec 2007-03-08 16:18:34.000000000 +0100
@@ -1,5 +1,5 @@
%define name nrpe
-%define version 2.6
+%define version 2.7.1
%define release 1
%define nsusr nagios
%define nsgrp nagios
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nrpe-2.6/src/check_nrpe.c new/nrpe-2.7.1/src/check_nrpe.c
--- old/nrpe-2.6/src/check_nrpe.c 2006-12-12 03:04:00.000000000 +0100
+++ new/nrpe-2.7.1/src/check_nrpe.c 2007-03-08 16:18:35.000000000 +0100
@@ -1,10 +1,10 @@
/********************************************************************************************
*
* CHECK_NRPE.C - NRPE Plugin For Nagios
- * Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
* License: GPL
*
- * Last Modified: 12-11-2006
+ * Last Modified: 03-08-2007
*
* Command line: CHECK_NRPE -H