version bump, stable on x86 (2.3), added reload to init script (2.5.1)

(Portage version: 2.0.54)

6 files changed, 137 insertions, 33 deletions

diff --git a/net-analyzer/nagios-nrpe/ChangeLog b/net-analyzer/nagios-nrpe/ChangeLog
index fd76fecf247c..9cdd867dfa65 100644
--- a/net-analyzer/nagios-nrpe/ChangeLog
+++ b/net-analyzer/nagios-nrpe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagios-nrpe
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.26 2006/02/07 20:45:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.27 2006/04/27 01:11:39 ramereth Exp $
+
+*nagios-nrpe-2.5.1 (27 Apr 2006)
+
+  27 Apr 2006; Lance Albertson <ramereth@gentoo.org> +files/nrpe-2.5.1,
+  nagios-nrpe-2.3.ebuild, +nagios-nrpe-2.5.1.ebuild:
+  * Version bump
+  * Added reload to init script (2.5.1 added this feature)
+  * Stable on x86 (2.3)
 
   07 Feb 2006; Simon Stelling <blubb@gentoo.org> nagios-nrpe-2.0-r1.ebuild:
   stable on amd64
diff --git a/net-analyzer/nagios-nrpe/Manifest b/net-analyzer/nagios-nrpe/Manifest
index 9a6610cc68ee..bfc9d272f2c3 100644
--- a/net-analyzer/nagios-nrpe/Manifest
+++ b/net-analyzer/nagios-nrpe/Manifest
@@ -1,45 +1,18 @@
 MD5 cfd72defad59b39280b8170b68625eaf ChangeLog 3084
-RMD160 6a0916a615a9cd4f56a65cfee9a5dfad4fae62ca ChangeLog 3084
-SHA256 cb0c43f07d578fa26654e8b49bd45b624d87538517376c543830c5fb59cd99d2 ChangeLog 3084
 MD5 a9506069b34b36a580c78efa20b05cc9 files/digest-nagios-nrpe-1.8-r1 59
-RMD160 063200c154663aa8da605b84b0624c9fc908ddcb files/digest-nagios-nrpe-1.8-r1 59
-SHA256 292b20bc9cb7e89f165995a5a9de68af1888fcb08bad8886d38f61c7c12f5048 files/digest-nagios-nrpe-1.8-r1 59
 MD5 f1fc0bb370291c6d0304900e25a62dc6 files/digest-nagios-nrpe-2.0 59
-RMD160 e4cea4ede3940249f46fbe1b49ac862a2734bd1a files/digest-nagios-nrpe-2.0 59
-SHA256 3c222ca1ef804855ea7ea9b75dba1c31af95844e771ad1ed297f34c6c4583f64 files/digest-nagios-nrpe-2.0 59
 MD5 f1fc0bb370291c6d0304900e25a62dc6 files/digest-nagios-nrpe-2.0-r1 59
-RMD160 e4cea4ede3940249f46fbe1b49ac862a2734bd1a files/digest-nagios-nrpe-2.0-r1 59
-SHA256 3c222ca1ef804855ea7ea9b75dba1c31af95844e771ad1ed297f34c6c4583f64 files/digest-nagios-nrpe-2.0-r1 59
 MD5 82211b8da1d8b71325856f9ef0334c31 files/digest-nagios-nrpe-2.3 59
-RMD160 04c66a3ad6d95e7c252efff348b3a03e82b7a9b2 files/digest-nagios-nrpe-2.3 59
-SHA256 acfe0da50c164e303285c282cbd74e36e7a33838eab74d0d9787479a0638dd81 files/digest-nagios-nrpe-2.3 59
+MD5 2b30ccd58fec24b4259f418590703f73 files/digest-nagios-nrpe-2.5.1 62
 MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-1.8 462
-RMD160 00f49ef6b7c795cf9d02b8dd4e93b65fbfcb202c files/nrpe-1.8 462
-SHA256 2453bf826b428777736c9a04a605c83cdc774765372e0525704e73116045fff7 files/nrpe-1.8 462
 MD5 3c91382446609ec78fa98d94509539dd files/nrpe-1.8.cfg 3501
-RMD160 dd41f8c3bbd7d1891b41b5ee40540ef6f8cb270f files/nrpe-1.8.cfg 3501
-SHA256 7149773365ef36afc4d1adef78cde5eb22aaa7aa6d9a10d2c17cc29a643c797f files/nrpe-1.8.cfg 3501
 MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-2.0 462
-RMD160 00f49ef6b7c795cf9d02b8dd4e93b65fbfcb202c files/nrpe-2.0 462
-SHA256 2453bf826b428777736c9a04a605c83cdc774765372e0525704e73116045fff7 files/nrpe-2.0 462
 MD5 3c91382446609ec78fa98d94509539dd files/nrpe-2.0.cfg 3501
-RMD160 dd41f8c3bbd7d1891b41b5ee40540ef6f8cb270f files/nrpe-2.0.cfg 3501
-SHA256 7149773365ef36afc4d1adef78cde5eb22aaa7aa6d9a10d2c17cc29a643c797f files/nrpe-2.0.cfg 3501
 MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-2.3 462
-RMD160 00f49ef6b7c795cf9d02b8dd4e93b65fbfcb202c files/nrpe-2.3 462
-SHA256 2453bf826b428777736c9a04a605c83cdc774765372e0525704e73116045fff7 files/nrpe-2.3 462
+MD5 5387be1bdd79ac54ccaf66a5c2cb4ffe files/nrpe-2.5.1 581
 MD5 56c82d2c8a7e7500f3fec23e5bc43cf1 metadata.xml 483
-RMD160 17cbf2c8c726024d7ab5d9856f417ecfb6c8624a metadata.xml 483
-SHA256 20e6427e87ba3ff8ed5a3df13c3a5c4ac9e1e36fec8e14bc63fdb3e80d0743d9 metadata.xml 483
 MD5 9d91fabf9f7f1bda0b75ba5280521932 nagios-nrpe-1.8-r1.ebuild 1562
-RMD160 62e21be8bdc8ac1750f406a812eef141751cf3e7 nagios-nrpe-1.8-r1.ebuild 1562
-SHA256 7c37c99999f410703a38b01173edf18229eea73f7486df0b284e0b42b5903eb9 nagios-nrpe-1.8-r1.ebuild 1562
 MD5 92e4878b8d7dfe7d82f5e7373b808e13 nagios-nrpe-2.0-r1.ebuild 2365
-RMD160 f76e7a1ecf15c37a0eafb878fc7c4090503ce1e0 nagios-nrpe-2.0-r1.ebuild 2365
-SHA256 0cb1fd3ac78361bcb5254e367a045907b54a84e538117b2f1a3720a789be10c1 nagios-nrpe-2.0-r1.ebuild 2365
 MD5 7b0467e3d86956a9f4441597238c5f3a nagios-nrpe-2.0.ebuild 1889
-RMD160 5be02323292ce9631db000cc640042807c9042db nagios-nrpe-2.0.ebuild 1889
-SHA256 28e236bd7774ec134633feaf41dac0060cd4bcdf422836d04c5a73b1717aba7e nagios-nrpe-2.0.ebuild 1889
 MD5 d1c82337f28713dda77336b5e176b75f nagios-nrpe-2.3.ebuild 2369
-RMD160 971f23ebab73328d1a28372b7541d77c98880f2d nagios-nrpe-2.3.ebuild 2369
-SHA256 557e2fd4d01aee7f9dfe7c668f5be1409c88c99a06dc8ad50e3e4b69fe821846 nagios-nrpe-2.3.ebuild 2369
+MD5 d1c82337f28713dda77336b5e176b75f nagios-nrpe-2.5.1.ebuild 2369
diff --git a/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.5.1 b/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.5.1
new file mode 100644
index 000000000000..2561cdc2803b
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.5.1
@@ -0,0 +1 @@
+MD5 e083553deaf47a79fd23906d823afc59 nrpe-2.5.1.tar.gz 100382
diff --git a/net-analyzer/nagios-nrpe/files/nrpe-2.5.1 b/net-analyzer/nagios-nrpe/files/nrpe-2.5.1
new file mode 100644
index 000000000000..768d860a7b17
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/files/nrpe-2.5.1
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+
+opts="${opts} reload"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting nrpe"
+	start-stop-daemon --start --quiet --name nrpe \
+	--startas /usr/nagios/bin/nrpe \
+		-c nagios:nagios \
+		-- -c /etc/nagios/nrpe.cfg \
+		--daemon
+	eend $? "Failed to Start nrpe"
+}
+
+stop() {
+	ebegin "Stopping nrpe"
+	start-stop-daemon --stop --quiet -n nrpe
+	eend $? "Failed to Stop nrpe"
+}
+
+reload() {
+	ebegin "Reloading nrpe"
+	kill -HUP `pgrep nrpe | head -1`
+	eend $? "Failed to reload nrpe"
+}
+
+restart() {
+	ebegin "Restarting nrpe"
+	svc_stop
+	svc_start
+	eend $? "Failed to Restart nrpe"
+}
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild
index 6345bbfd27ec..8fbc82e38e37 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild,v 1.1 2006/02/04 18:49:35 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild,v 1.2 2006/04/27 01:11:39 ramereth Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="ssl command-args"
 DEPEND=">=net-analyzer/nagios-plugins-1.3.0
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.1.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.1.ebuild
new file mode 100644
index 000000000000..a6e8940340c9
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.5.1.ebuild,v 1.1 2006/04/27 01:11:39 ramereth Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Nagios $PV NRPE - Nagios Remote Plugin Executor"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/nrpe-${PV}.tar.gz"
+
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="ssl command-args"
+DEPEND=">=net-analyzer/nagios-plugins-1.3.0
+	ssl? ( dev-libs/openssl )"
+S="${WORKDIR}/nrpe-${PV}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /dev/null nagios
+}
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} `use_enable ssl` \
+					  `use_enable command-args`"
+
+	# Generate the dh.h header file for better security (2005 Mar 20 eldad)
+	if useq ssl ; then
+		openssl dhparam -C 512 | sed -n '1,/BEGIN DH PARAMETERS/p' | grep -v "BEGIN DH PARAMETERS" > ${S}/src/dh.h
+	fi
+
+	./configure ${myconf} \
+		--host=${CHOST} \
+		--prefix=/usr/nagios \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nrpe-user=nagios \
+		--with-nrpe-grp=nagios \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "./configure failed"
+	emake all || die
+	# Add nifty nrpe check tool
+	cd contrib
+	$(tc-getCC) ${CFLAGS} -o nrpe_check_control	nrpe_check_control.c
+}
+
+src_install() {
+	dodoc LEGAL Changelog README SECURITY README.SSL \
+		contrib/README.nrpe_check_control
+
+	insinto /etc/nagios
+	newins ${S}/sample-config/nrpe.cfg nrpe.cfg
+	fowners root:nagios /etc/nagios/nrpe.cfg
+	fperms 0640 /etc/nagios/nrpe.cfg
+
+	exeopts -m0750 -o nagios -g nagios
+	exeinto /usr/nagios/bin
+	doexe src/nrpe
+
+	exeopts -m0750 -o nagios -g nagios
+	exeinto /usr/nagios/libexec
+	doexe src/check_nrpe contrib/nrpe_check_control
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/nrpe-${PV} nrpe
+}
+pkg_postinst() {
+	einfo
+	einfo "If you are using the nrpe daemon, remember to edit"
+	einfo "the config file /etc/nagios/nrpe.cfg"
+	einfo
+
+	if useq command-args ; then
+		ewarn "You have enabled command-args for NRPE. This enables"
+		ewarn "the ability for clients to supply arguments to commands"
+		ewarn "which should be run. "
+		ewarn "THIS IS CONSIDERED A SECURITY RISK!"
+		ewarn "Please read /usr/share/doc/${PF}/SECURITY.gz for more info"
+	fi
+}