added command-args option, added nrpe_check_control from contrib

Package-Manager: portage-2.0.51.19

4 files changed, 103 insertions, 16 deletions

diff --git a/net-analyzer/nagios-nrpe/ChangeLog b/net-analyzer/nagios-nrpe/ChangeLog
index 00a33d51d075..8e33bd567001 100644
--- a/net-analyzer/nagios-nrpe/ChangeLog
+++ b/net-analyzer/nagios-nrpe/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2005/05/03 16:35:38 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.21 2005/07/10 04:41:17 ramereth Exp $
+
+*nagios-nrpe-2.0-r1 (10 Jul 2005)
+
+  10 Jul 2005; Lance Albertson <ramereth@gentoo.org>
+  +nagios-nrpe-2.0-r1.ebuild:
+  * Added configure option for command-args
+  * Added nrpe_check_control from contrib
 
   03 May 2005; Eldad Zack <eldad@gentoo.org> nagios-nrpe-1.8-r1.ebuild,
   nagios-nrpe-2.0.ebuild:
diff --git a/net-analyzer/nagios-nrpe/Manifest b/net-analyzer/nagios-nrpe/Manifest
index bf7de0f26d76..e97464ed4f1a 100644
--- a/net-analyzer/nagios-nrpe/Manifest
+++ b/net-analyzer/nagios-nrpe/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5ad0d6c220dd1ce48df318998d9b1390 ChangeLog 2480
 MD5 9836adb15300bf890cba617db33c00ed nagios-nrpe-1.8-r1.ebuild 1552
-MD5 7243ba975262e63eef5718abe802befe nagios-nrpe-2.0.ebuild 1880
-MD5 042dd427db4df603d895dc81e445e0f7 ChangeLog 2272
 MD5 6a5890137b6cd35bb0b647ff45f69667 metadata.xml 395
-MD5 f1fc0bb370291c6d0304900e25a62dc6 files/digest-nagios-nrpe-2.0 59
+MD5 7243ba975262e63eef5718abe802befe nagios-nrpe-2.0.ebuild 1880
+MD5 a29c5101034e73b15d7e36dc97fdd06c nagios-nrpe-2.0-r1.ebuild 2433
+MD5 a9506069b34b36a580c78efa20b05cc9 files/digest-nagios-nrpe-1.8-r1 59
 MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-1.8 462
-MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-2.0 462
 MD5 3c91382446609ec78fa98d94509539dd files/nrpe-1.8.cfg 3501
+MD5 f1fc0bb370291c6d0304900e25a62dc6 files/digest-nagios-nrpe-2.0 59
+MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-2.0 462
 MD5 3c91382446609ec78fa98d94509539dd files/nrpe-2.0.cfg 3501
-MD5 a9506069b34b36a580c78efa20b05cc9 files/digest-nagios-nrpe-1.8-r1 59
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCd6hzT+MN7JbqCpMRAmn2AJ49DWYwPRSDfl9BPc1TdatgPcsSiQCdGCES
-ga6bU0TTkSOCX2xnufsFE9k=
-=gH15
------END PGP SIGNATURE-----
+MD5 f1fc0bb370291c6d0304900e25a62dc6 files/digest-nagios-nrpe-2.0-r1 59
diff --git a/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.0-r1 b/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.0-r1
new file mode 100644
index 000000000000..fb06ce736c2b
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/files/digest-nagios-nrpe-2.0-r1
@@ -0,0 +1 @@
+MD5 70ef9502a3b7e49fa520dbceabfa04d0 nrpe-2.0.tar.gz 52157
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.0-r1.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.0-r1.ebuild
new file mode 100644
index 000000000000..1d1ac0ecb9f0
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 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.0-r1.ebuild,v 1.1 2005/07/10 04:41:17 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 ~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 ${FILESDIR}/nrpe-${PV}.cfg nrpe.cfg
+	fowners root:nagios /etc/nagios/nrpe.cfg
+	fperms 0640 /etc/nagios/nrpe.cfg
+
+	exeinto /usr/nagios/bin
+	doexe src/nrpe
+
+	exeinto /usr/nagios/libexec
+	doexe src/check_nrpe contrib/nrpe_check_control
+
+	fowners nagios:nagios /usr/nagios/libexec/check_nrpe /usr/nagios/bin/nrpe
+	fperms 0750	/usr/nagios/libexec/check_nrpe /usr/nagios/bin/nrpe
+
+	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
+}