Version bump

Package-Manager: portage-2.0.54

6 files changed, 136 insertions, 13 deletions

diff --git a/net-analyzer/nagios-nrpe/ChangeLog b/net-analyzer/nagios-nrpe/ChangeLog
index 74f4bcab1194..c09954ae7033 100644
--- a/net-analyzer/nagios-nrpe/ChangeLog
+++ b/net-analyzer/nagios-nrpe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-nrpe
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.24 2005/11/20 00:20:25 ramereth Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.25 2006/02/04 18:49:35 ramereth Exp $
+
+*nagios-nrpe-2.3 (04 Feb 2006)
+
+  04 Feb 2006; Lance Albertson <ramereth@gentoo.org> +files/nrpe-2.3,
+  metadata.xml, +nagios-nrpe-2.3.ebuild:
+  * Version bump
 
   20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
   nagios-nrpe-2.0-r1.ebuild:
diff --git a/net-analyzer/nagios-nrpe/Manifest b/net-analyzer/nagios-nrpe/Manifest
index f6e8ccc7d67d..e4943d08a9f9 100644
--- a/net-analyzer/nagios-nrpe/Manifest
+++ b/net-analyzer/nagios-nrpe/Manifest
@@ -1,12 +1,15 @@
-MD5 2933063bc4ba11e477d981bd88cc4e85 ChangeLog 2831
-MD5 6a5890137b6cd35bb0b647ff45f69667 metadata.xml 395
-MD5 9d91fabf9f7f1bda0b75ba5280521932 nagios-nrpe-1.8-r1.ebuild 1562
-MD5 0b9209b63300e01483dbb740364153af nagios-nrpe-2.0-r1.ebuild 2368
-MD5 7b0467e3d86956a9f4441597238c5f3a nagios-nrpe-2.0.ebuild 1889
+MD5 f8c343048d447138c5b1f2d5776b884f ChangeLog 2992
 MD5 a9506069b34b36a580c78efa20b05cc9 files/digest-nagios-nrpe-1.8-r1 59
 MD5 f1fc0bb370291c6d0304900e25a62dc6 files/digest-nagios-nrpe-2.0 59
 MD5 f1fc0bb370291c6d0304900e25a62dc6 files/digest-nagios-nrpe-2.0-r1 59
+MD5 82211b8da1d8b71325856f9ef0334c31 files/digest-nagios-nrpe-2.3 59
 MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-1.8 462
 MD5 3c91382446609ec78fa98d94509539dd files/nrpe-1.8.cfg 3501
 MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-2.0 462
 MD5 3c91382446609ec78fa98d94509539dd files/nrpe-2.0.cfg 3501
+MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-2.3 462
+MD5 56c82d2c8a7e7500f3fec23e5bc43cf1 metadata.xml 483
+MD5 9d91fabf9f7f1bda0b75ba5280521932 nagios-nrpe-1.8-r1.ebuild 1562
+MD5 0b9209b63300e01483dbb740364153af nagios-nrpe-2.0-r1.ebuild 2368
+MD5 7b0467e3d86956a9f4441597238c5f3a nagios-nrpe-2.0.ebuild 1889
+MD5 d1c82337f28713dda77336b5e176b75f nagios-nrpe-2.3.ebuild 2369
diff --git a/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.3 b/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.3
new file mode 100644
index 000000000000..37980be0a000
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.3
@@ -0,0 +1 @@
+MD5 2e9b7d0a29aa9b57c4a0cc14d80c75c1 nrpe-2.3.tar.gz 97586
diff --git a/net-analyzer/nagios-nrpe/files/nrpe-2.3 b/net-analyzer/nagios-nrpe/files/nrpe-2.3
new file mode 100644
index 000000000000..dfb4f832138e
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/files/nrpe-2.3
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+
+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"
+}
+
+restart() {
+	ebegin "Restarting nrpe"
+	svc_stop
+	svc_start
+	eend $? "Failed to Restart nrpe"
+}
diff --git a/net-analyzer/nagios-nrpe/metadata.xml b/net-analyzer/nagios-nrpe/metadata.xml
index 88678829037b..705f40d57950 100644
--- a/net-analyzer/nagios-nrpe/metadata.xml
+++ b/net-analyzer/nagios-nrpe/metadata.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-
-<herd>no-herd</herd>
-
+<herd>netmon</herd>
 <maintainer>
 	<email>malverian@gentoo.org</email>
 </maintainer>
-
+<maintainer>
+	<email>ramereth@gentoo.org</email>
+	<name>Lance Albertson</name>
+</maintainer> 
 <longdescription>
 	A daemon for allowing Nagios to connect directly to servers and 
 	execute commands defined in a centralized configuration file.
 </longdescription>
-
 </pkgmetadata>
-
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.ebuild
new file mode 100644
index 000000000000..6345bbfd27ec
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.3.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.3.ebuild,v 1.1 2006/02/04 18:49:35 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
+}