--- nagios-nrpe-2.8.1.orig/debian/copyright +++ nagios-nrpe-2.8.1/debian/copyright @@ -0,0 +1,10 @@ +This package was debianized by Jason Thomas on +Wed, 14 Jan 2004 16:13:36 +1100. + +It was downloaded from http://www.nagios.org/download/extras.php + +Upstream Author: Ethan Galstad (nagios@nagios.org) + +Copyright: + +/usr/share/common-licenses/GPL --- nagios-nrpe-2.8.1.orig/debian/check_nrpe.cfg +++ nagios-nrpe-2.8.1/debian/check_nrpe.cfg @@ -0,0 +1,11 @@ +# this command runs a program $ARG1$ with arguments $ARG2$ +define command { + command_name check_nrpe + command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c $ARG1$ -a $ARG2$ +} + +# this command runs a program $ARG1$ with no arguments +define command { + command_name check_nrpe_1arg + command_line /usr/lib/nagios/plugins/check_nrpe -H $HOSTADDRESS$ -c $ARG1$ +} --- nagios-nrpe-2.8.1.orig/debian/rules +++ nagios-nrpe-2.8.1/debian/rules @@ -0,0 +1,63 @@ +#!/usr/bin/make -f + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 -Wall +else + CFLAGS += -O2 -Wall +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +include /usr/share/dpatch/dpatch.make + +build: build-stamp +build-stamp: patch-stamp + dh_testdir + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/nagios/plugins --libdir=/usr/lib/nagios --enable-command-args + $(MAKE) all + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + if test -f Makefile; then $(MAKE) distclean; fi + dh_clean + rm -f {build,install}-stamp + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdebconf + dh_installdirs + dh_installchangelogs Changelog + dh_installdocs -A + dh_installexamples + dh_installinit -u defaults 30 + dh_installman + dh_install + touch debian/nagios-nrpe-server/etc/nagios/nrpe_local.cfg + touch install-stamp + +binary: binary-indep binary-arch +binary-indep: +binary-arch: install-stamp + dh_testdir + dh_testroot + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +.PHONY: binary binary-arch binary-indep clean install --- nagios-nrpe-2.8.1.orig/debian/NEWS +++ nagios-nrpe-2.8.1/debian/NEWS @@ -0,0 +1,11 @@ +nagios-nrpe (2.4-1) unstable; urgency=low + + the nagios-nrpe-doc package is no longer provided. the documentation + can now be found in /usr/share/doc/nagios-nrpe-{server|plugins}. new + versions of the plugin and server packages conflict with the doc + package to prevent the old (and possibly incorrect in the future) + documentation from remaining. to fully purge all information about + the package you should run: + dpkg -P nagios-nrpe-doc + + -- sean finney Mon, 13 Mar 2006 15:47:47 +0100 --- nagios-nrpe-2.8.1.orig/debian/compat +++ nagios-nrpe-2.8.1/debian/compat @@ -0,0 +1 @@ +4 --- nagios-nrpe-2.8.1.orig/debian/README.Debian +++ nagios-nrpe-2.8.1/debian/README.Debian @@ -0,0 +1,12 @@ +nrpe +---- + +Put any local check command you need into /etc/nagios/nrpe_local.cfg +This file is included from the /etc/nagios/nrpe.cfg + +To enable the use of command argument processing change dont_blame_nrpe option +in nrpe.cfg then create the commands you want in nrpe_local.cfg + +Most options can be overridden in nrpe_local.cfg + + -- Jason Thomas , Thu, 15 Jan 2004 10:45:45 +1100 --- nagios-nrpe-2.8.1.orig/debian/nagios-nrpe-plugin.postrm +++ nagios-nrpe-2.8.1/debian/nagios-nrpe-plugin.postrm @@ -0,0 +1,42 @@ +#! /bin/sh +# postrm script for nagios-nrpe +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + if [ -x /usr/sbin/update-nagios ] ; then + /usr/sbin/update-nagios + fi + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- nagios-nrpe-2.8.1.orig/debian/nagios-nrpe-server.init +++ nagios-nrpe-2.8.1/debian/nagios-nrpe-server.init @@ -0,0 +1,72 @@ +#! /bin/sh +# + +### BEGIN INIT INFO +# Provides: nagios-nrpe-server +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start/Stop the Nagios remote plugin execution daemon +### END INIT INFO + + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/nrpe +NAME=nagios-nrpe +DESC=nagios-nrpe +CONFIG=/etc/nagios/nrpe.cfg +PIDDIR=/var/run + +test -x $DAEMON || exit 0 + +if ! [ -x "/lib/lsb/init-functions" ]; then + . /lib/lsb/init-functions +else + echo "E: /lib/lsb/init-functions not found, lsb-base (>= 3.0-6) needed" + exit 1 +fi + +# Include nagios-nrpe defaults if available +if [ -f /etc/default/nagios-nrpe-server ] ; then + . /etc/default/nagios-nrpe-server +fi +# we also used to include this file, so if it's there +# we include it as well +if [ -f /etc/default/nagios-nrpe ]; then + . /etc/default/nagios-nrpe +fi +if [ "$NICENESS" ]; then NICENESS="-n $NICENESS"; fi + +set -e + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + start_daemon -p $PIDDIR/nrpe.pid $NICENESS $DAEMON -c $CONFIG -d $DAEMON_OPTS + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/nrpe.pid --retry 15 + log_end_msg $? + ;; + reload|force-reload) + log_daemon_msg "Reloading $DESC configuration files" "$NAME" + start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDDIR/nrpe.pid + log_end_msg $? + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + log_failure_msg "Usage: $N {start|stop|restart|reload|force-reload}" + exit 1 + ;; +esac + +exit 0 --- nagios-nrpe-2.8.1.orig/debian/nagios-nrpe-server.preinst +++ nagios-nrpe-2.8.1/debian/nagios-nrpe-server.preinst @@ -0,0 +1,54 @@ +#! /bin/sh +# preinst script for nagios-nrpe-server +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + if id nagios >/dev/null 2>&1 ; then + # We have a nagios user. + if [ `id nagios -g -n` != "nagios" ] ; then + addgroup --system nagios || true + usermod -g nagios nagios + fi + else + adduser --system --group --no-create-home --home /var/log/nagios --quiet nagios + fi + +# if [ "$1" = "upgrade" ] +# then +# start-stop-daemon --stop --quiet --oknodo \ +# --pidfile /var/run/bud.pid \ +# --exec /usr/sbin/bud 2>/dev/null || true +# fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- nagios-nrpe-2.8.1.orig/debian/nagios-nrpe-plugin.postinst +++ nagios-nrpe-2.8.1/debian/nagios-nrpe-plugin.postinst @@ -0,0 +1,52 @@ +#! /bin/sh +# postinst script for nagios-nrpe +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + + if [ -x /usr/sbin/update-nagios ] ; then + /usr/sbin/update-nagios + fi + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- nagios-nrpe-2.8.1.orig/debian/nagios-nrpe-server.install +++ nagios-nrpe-2.8.1/debian/nagios-nrpe-server.install @@ -0,0 +1,2 @@ +src/nrpe usr/sbin +sample-config/nrpe.cfg etc/nagios --- nagios-nrpe-2.8.1.orig/debian/docs +++ nagios-nrpe-2.8.1/debian/docs @@ -0,0 +1,4 @@ +README +README.SSL +LEGAL +SECURITY --- nagios-nrpe-2.8.1.orig/debian/nagios-nrpe-server.default +++ nagios-nrpe-2.8.1/debian/nagios-nrpe-server.default @@ -0,0 +1,10 @@ +# defaults file for nagios-nrpe-server +# (this file is a /bin/sh compatible fragment) + +# DAEMON_OPTS are any extra cmdline parameters you'd like to +# pass along to the nrpe daemon +#DAEMON_OPTS="--no-ssl" + +# NICENESS is if you want to run the server at a different nice() priority +#NICENESS=5 + --- nagios-nrpe-2.8.1.orig/debian/control +++ nagios-nrpe-2.8.1/debian/control @@ -0,0 +1,38 @@ +Source: nagios-nrpe +Section: net +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Nagios Maintainer Group +Uploaders: sean finney , Jason Thomas +Build-Depends: debhelper (>= 4.0.0), openssl, dpatch, libssl-dev +Standards-Version: 3.7.2 + +Package: nagios-nrpe-server +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-3) +Pre-Depends: adduser +Conflicts: nagios-nrpe-doc +Recommends: nagios-plugins | nagios-plugins-basic +Description: Nagios Remote Plugin Executor Server + Nagios is a host/service/network monitoring and management system. + . + The purpose of this addon is to allow you to execute Nagios plugins on a + remote host in as transparent a manner as possible. + . + This program runs as a background process on the remote host and processes + command execution requests from the check_nrpe plugin on the Nagios host. + +Package: nagios-nrpe-plugin +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: nagios-nrpe-doc +Recommends: nagios2 +Description: Nagios Remote Plugin Executor Plugin + Nagios is a host/service/network monitoring and management system. + . + The purpose of this addon is to allow you to execute Nagios plugins on a + remote host in as transparent a manner as possible. + . + This is a plugin that is run on the Nagios host and is used to contact the + NRPE process on remote hosts. + --- nagios-nrpe-2.8.1.orig/debian/nagios-nrpe-plugin.install +++ nagios-nrpe-2.8.1/debian/nagios-nrpe-plugin.install @@ -0,0 +1,2 @@ +src/check_nrpe usr/lib/nagios/plugins/ +debian/check_nrpe.cfg etc/nagios-plugins/config/ --- nagios-nrpe-2.8.1.orig/debian/changelog +++ nagios-nrpe-2.8.1/debian/changelog @@ -0,0 +1,181 @@ +nagios-nrpe (2.8.1-1ubuntu0.2) hardy-proposed; urgency=low + + * [4dc53fb] Use retry argument for start-stop-daemon when stopping nrpe, + this fixes cases where restarting nagios-nrpe fails to respawn it. + (LP: #896388) + + -- Stéphane Graber Thu, 03 May 2012 10:19:29 -0400 + +nagios-nrpe (2.8.1-1ubuntu0.1) hardy-proposed; urgency=low + + * Use pidfile for start-stop-daemon and fix pidfile deletion (LP: #600941) + + -- Michael Jeanson Mon, 24 Oct 2011 16:35:38 -0400 + +nagios-nrpe (2.8.1-1) unstable; urgency=low + + * New upstream release + * bump Recommends to nagios2, thanks to Henning Sprang + for suggesting this (closes: #399856). + * fix typo in package description, thanks to Tilman Koschnick for + noticing this (closes: #419130). + + -- sean finney Sat, 12 May 2007 12:27:30 +0200 + +nagios-nrpe (2.5.1-3) unstable; urgency=high + + * apparently we were already including another default file + without installing it, and some people were using it. so + now we include this one as well as the new default, with this + one taking precedence since it was there first. thanks to + Peter Palfrader for catching this (closes: #398914). + + -- sean finney Fri, 17 Nov 2006 09:17:55 +0100 + +nagios-nrpe (2.5.1-2) unstable; urgency=low + + * include a /etc/default/nagios-nrpe-server where variables + such as DAEMON_OPTS can be set (closes: #396709). + * bump standards version to 3.7.2 + * add pre-depends on adduser + * LSB-ize init script, and add dependency on lsb-base + + -- sean finney Sat, 04 Nov 2006 17:38:34 +0100 + +nagios-nrpe (2.5.1-1) unstable; urgency=low + + * new upstream release. includes fix from Peter Palfrader to catch + invalid free()'s when nrpe is called with --no-ssl (closes: #361233). + + -- sean finney Sun, 14 May 2006 21:38:48 -0500 + +nagios-nrpe (2.4-2) unstable; urgency=low + + [sean finney] + * removing nrpe_local.cfg caused trouble for some people, so + i've added it back in (closes: #360093). + + -- sean finney Fri, 31 Mar 2006 07:02:31 +0200 + +nagios-nrpe (2.4-1) unstable; urgency=low + + * new upstream release. + + [sean finney] + * (NEEDS TESTING) move away from cdbs for my own sanity. + * add build-dependency on dpatch. + * no longer create nrpe_local.cfg. no reason to have it. + * remove postinst script for nagios-nrpe-server, as all it + did was touch the previously mentioned file. + * upstream has incorporated the following patches: + - 02_global-cmd-prefix.dpatch + - 03_nrpe-trailing-whitespace.dpatch + * check_nrpe -h provides what "-a" does, but i've gone ahead and + added a comment in check_nrpe.cfg too, because it can't hurt + to do so :) (closes: #351714). + * no longer generate the nagios-nrpe-doc package, and move copies of + the documentation into the plugin and server packages. add a + Conflicts: nagios-nrpe-doc to the remaining packages to ensure + that the stale package doesn't remain. NEWS.Debian also mentions + this and instructs the admin to purge the package too. + + -- sean finney Tue, 24 Jan 2006 18:16:54 +0100 + +nagios-nrpe (2.2-1) unstable; urgency=low + + * new upstream release. + + [sean finney] + * debian packaging source repository is now migrated to svn. + * updated 01_nodevrandom-and-docoptions.dpatch and + 02_global-cmd-prefix.dpatch to apply against the latest + upstream version. + * nrpe.cfg has moved location in the upstream tarball. + * introduced 03_nrpe-trailing-whitespace.dpatch to fix regression + in config file parsing until upstream incorporates it. + + -- sean finney Tue, 24 Jan 2006 17:52:54 +0100 + +nagios-nrpe (2.0-9) unstable; urgency=low + + * Sean Finney: + - nagios-nrpe has now joined forces with the debian pkg-nagios + project, updated Maintainer and Uploaders field accordingly. + - provide check_nrpe_1arg command definition so that one can call + check_nrpe both with and without arguments to the cmds + (closes: #248424). + - changed nagios-nrpe-server's Recommends on nagios-plugins to reflect + the upcoming new nagios-plugins layout. + - changed nagios-nrpe-plugin's Depends on nagios to a Recommends. + - building issues seem to be resolved on arm now (closes: #259442). + - updated Standards-Version to 3.6.2 + - included patch from joerg and weasel to document some cmdline options + and provide a better alternative to reading a random byte from + /dev/random (closes: #333552). + - included "global command prefix" patch from joerg jaspert + (closes: #332253). + + -- sean finney Tue, 25 Oct 2005 10:04:59 -0400 + +nagios-nrpe (2.0-8) unstable; urgency=low + + * debian/control: change depends on nagios-plugins, to recommends. + (closes: #327199) + + -- Jason Thomas Mon, 10 Oct 2005 08:07:57 +1000 + +nagios-nrpe (2.0-7) unstable; urgency=high + + * The previous upload fixes a bug that breaks the install of this package so + this is a new upload with a high urgency to try and get it into sarge. + + -- Jason Thomas Thu, 19 Aug 2004 22:47:40 +1000 + +nagios-nrpe (2.0-6) unstable; urgency=low + + * nagios plugin config dir changed to etc/nagios-plugins/configs/ + (closes: #266826) + + -- Jason Thomas Thu, 19 Aug 2004 21:17:28 +1000 + +nagios-nrpe (2.0-5) unstable; urgency=low + + * debian/nagios-nrpe-server.preinst: added code to create nagios user and + group. + (closes: #248995, #241168) + + -- Jason Thomas Sat, 15 May 2004 12:02:35 +1000 + +nagios-nrpe (2.0-4) unstable; urgency=low + + * debian/nagios-nrpe-server.init.d: added missing -d to restart. + (closes: #248797) + * debian/nrpe.1: renamed to nrpe.8 + * debian/nagios-nrpe-server.manpages: changed nrpe.1 to nrpe.8 + * debian/dirs: deleted it as its not needed. + + -- Jason Thomas Fri, 14 May 2004 14:05:03 +1000 + +nagios-nrpe (2.0-3) unstable; urgency=low + + * debian/nagios-nrpe-server.init.d: added --oknodo to stop commands which + will make upgrades and purges clean. + + -- Jason Thomas Wed, 24 Mar 2004 13:09:00 +1100 + +nagios-nrpe (2.0-2) unstable; urgency=low + + * debian/control: added build-depends cdbs + (closes: #230943) + * debian/control: nagios-nrpe-server now conflicts netsaint-nrpe-server + (closes: #230303) + + -- Jason Thomas Wed, 11 Feb 2004 09:27:01 +1100 + +nagios-nrpe (2.0-1) unstable; urgency=low + + * Initial Release. + (closes: #209124) + + -- Jason Thomas Wed, 14 Jan 2004 16:13:36 +1100 + --- nagios-nrpe-2.8.1.orig/debian/nagios-nrpe-server.manpages +++ nagios-nrpe-2.8.1/debian/nagios-nrpe-server.manpages @@ -0,0 +1 @@ +debian/nrpe.8 --- nagios-nrpe-2.8.1.orig/debian/nrpe.8 +++ nagios-nrpe-2.8.1/debian/nrpe.8 @@ -0,0 +1,52 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH NAGIOS-NRPE 8 "January 14, 2004" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +nrpe \- Nagios Remote Plugin Executor - Server +.SH SYNOPSIS +.B nagios-nrpe +\fI-c \fR +.SH DESCRIPTION +.PP +The purpose of this addon is to allow you to execute Nagios plugins on a +remote host in as transparent a manner as possible. +.PP +This program runs as a background process on the remote host and processes +command execution requests from the check_nrpe plugin on the Nagios host. +.SH OPTIONS +.IP + = Name of config file to use +.IP + = One of the following two operating modes: +.TP +\fB\-i\fR += Run as a service under inetd or xinetd +.TP +\fB\-d\fR += Run as a standalone daemon +.PP +Notes: +This program is designed to process requests from the check_nrpe +plugin on the host(s) running Nagios. It can run as a service +under inetd or xinetd (read the docs for info on this), or as a +standalone daemon. Once a request is received from an authorized +host, NRPE will execute the command/plugin (as defined in the +config file) and return the plugin output and return code to the +check_nrpe plugin. +.SH AUTHOR +This manual page was written by Jason Thomas , +for the Debian project (but may be used by others). --- nagios-nrpe-2.8.1.orig/debian/patches/00list +++ nagios-nrpe-2.8.1/debian/patches/00list @@ -0,0 +1,2 @@ +01_nodevrandom-and-docoptions.dpatch +02_nrpe.cfg_local-include.dpatch --- nagios-nrpe-2.8.1.orig/debian/patches/01_nodevrandom-and-docoptions.dpatch +++ nagios-nrpe-2.8.1/debian/patches/01_nodevrandom-and-docoptions.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_nodevrandom-and-docoptions.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad nagios-nrpe-2.2~/src/check_nrpe.c nagios-nrpe-2.2/src/check_nrpe.c +--- nagios-nrpe-2.2~/src/check_nrpe.c 2006-01-21 20:23:36.000000000 +0100 ++++ nagios-nrpe-2.2/src/check_nrpe.c 2006-01-24 08:36:39.000000000 +0100 +@@ -93,6 +93,9 @@ + printf(" [arglist] = Optional arguments that should be passed to the command. Multiple\n"); + printf(" arguments should be separated by a space. If provided, this must be\n"); + printf(" the last option supplied on the command line.\n"); ++ printf(" -h,--help Print this short help.\n"); ++ printf(" -l,--license Print licensing information.\n"); ++ printf(" -n,--no-ssl Do not initial an ssl handshake with the server, talk in plaintext.\n"); + printf("\n"); + printf("Note:\n"); + printf("This plugin requires that you have the NRPE daemon running on the remote host.\n"); +diff -urNad nagios-nrpe-2.2~/src/nrpe.c nagios-nrpe-2.2/src/nrpe.c +--- nagios-nrpe-2.2~/src/nrpe.c 2006-01-21 20:23:36.000000000 +0100 ++++ nagios-nrpe-2.2/src/nrpe.c 2006-01-24 08:38:30.000000000 +0100 +@@ -120,11 +120,13 @@ + printf("Usage: nrpe [-n] -c \n"); + printf("\n"); + printf("Options:\n"); +- printf(" -n = Do not use SSL\n"); ++ printf(" -n,--no-ssl = Do not use SSL\n"); + printf(" = Name of config file to use\n"); + printf(" = One of the following two operating modes:\n"); +- printf(" -i = Run as a service under inetd or xinetd\n"); +- printf(" -d = Run as a standalone daemon\n"); ++ printf(" -i,--inetd Run as a service under inetd or xinetd\n"); ++ printf(" -d,--daemon Run as a standalone daemon\n"); ++ printf(" -h,--help Print this short help.\n"); ++ printf(" -l,--license Print licensing information.\n"); + printf("\n"); + printf("Notes:\n"); + printf("This program is designed to process requests from the check_nrpe\n"); +diff -urNad nagios-nrpe-2.2~/src/utils.c nagios-nrpe-2.2/src/utils.c +--- nagios-nrpe-2.2~/src/utils.c 2003-10-16 01:14:27.000000000 +0200 ++++ nagios-nrpe-2.2/src/utils.c 2006-01-24 08:36:39.000000000 +0100 +@@ -90,17 +90,7 @@ + ends and the rest of the buffer (padded randomly) starts. + ***************************************************************/ + +- /* try to get seed value from /dev/urandom, as its a better source of entropy */ +- fp=fopen("/dev/urandom","r"); +- if(fp!=NULL){ +- seed=fgetc(fp); +- fclose(fp); +- } +- +- /* else fallback to using the current time as the seed */ +- else +- seed=(int)time(NULL); +- ++ seed=(int)time(NULL)*311-getpid()*359+getppid()*383; + srand(seed); + for(x=0;x +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad nagios-nrpe-2.4~/sample-config/nrpe.cfg.in nagios-nrpe-2.4/sample-config/nrpe.cfg.in +--- nagios-nrpe-2.4~/sample-config/nrpe.cfg.in 2006-02-03 23:02:32.000000000 +0100 ++++ nagios-nrpe-2.4/sample-config/nrpe.cfg.in 2006-03-31 07:07:16.000000000 +0200 +@@ -178,3 +178,8 @@ + #command[check_load]=@libexecdir@/check_load -w $ARG1$ -c $ARG2$ + #command[check_disk]=@libexecdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ + #command[check_procs]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ ++ ++# ++# local configuration: ++# if you'd prefer, you can instead place directives here ++include=/etc/nagios/nrpe_local.cfg