Create pidfile in /var/run/nrpe (#233859)

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 118 insertions, 4 deletions

diff --git a/net-analyzer/nagios-nrpe/ChangeLog b/net-analyzer/nagios-nrpe/ChangeLog
index 749979231a2b..518647fc942c 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.57 2008/07/02 15:05:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.58 2008/08/04 15:55:31 dertobi123 Exp $
+
+*nagios-nrpe-2.12-r102 (04 Aug 2008)
+*nagios-nrpe-2.12-r1 (04 Aug 2008)
+
+  04 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +nagios-nrpe-2.12-r1.ebuild, -nagios-nrpe-2.12-r101.ebuild,
+  +nagios-nrpe-2.12-r102.ebuild:
+  Create pidfile in /var/run/nrpe (#233859)
 
   02 Jul 2008; Jeroen Roovers <jer@gentoo.org> nagios-nrpe-2.12.ebuild:
   Stable for HPPA (LuckyLuke).
diff --git a/net-analyzer/nagios-nrpe/Manifest b/net-analyzer/nagios-nrpe/Manifest
index eea2542c03a7..32ad54357726 100644
--- a/net-analyzer/nagios-nrpe/Manifest
+++ b/net-analyzer/nagios-nrpe/Manifest
@@ -1,7 +1,8 @@
 AUX nrpe 591 RMD160 27dec27f122cc022215e1c049b8749cc75746150 SHA1 08c79e7a2e0458c2e896e1470fe6de1591095881 SHA256 795470c9bce54145e54879b22ae9a1a3c288c87418bc45e4b9f5420112a27d5e
 AUX nrpe-nagios3 584 RMD160 959ce8e40f61a172195e49a604ad60b5192e3a68 SHA1 6468fed5634fca87520f84ab506dac7c5401e03e SHA256 3fa45bb6136eba8a5b37f484c68887898e88dc1762a8f8b85ded4bb3d57e32c8
 DIST nrpe-2.12.tar.gz 405725 RMD160 3413f84c9bb926a4dd55cc02d7b0a01bd7fc99ee SHA1 208595c175d726e8e377d565b21897f4de1648cc SHA256 7e8d093abef7d7ffc7219ad334823bdb612121df40de2dbaec9c6d0adeb04cfc
-EBUILD nagios-nrpe-2.12-r101.ebuild 2376 RMD160 b57ad340e55eb1b92401e789fdce3f89ef2a18e7 SHA1 91af09d124ddc59241c42b4c4d28a78afa62bff2 SHA256 6fd2b3e8979ce8d18f9cd014d7206316759073ebdc3882931eacfd34595bfaaf
+EBUILD nagios-nrpe-2.12-r1.ebuild 2718 RMD160 abb78ee371c301f177417d6d978fb6af24d2b9e6 SHA1 988fa2dc289cb9f0b8843a3f12b858eaf89df8af SHA256 4c2314ecff27382f264c8980ea529f014c3e13a075c9a13d2ecc107b4f033505
+EBUILD nagios-nrpe-2.12-r102.ebuild 2615 RMD160 c50350921ff64871dcd8b1c7351193cb6e3dd05d SHA1 a522c49bcf3104967d75069800b92d79a98ea096 SHA256 220dc3cf4dc505186cad63cc4761cfd283e95cd5b0cd65a92071e975138670ad
 EBUILD nagios-nrpe-2.12.ebuild 2464 RMD160 75dfde668ba12f9e8165b44e24808cf91b68e18c SHA1 bb83423d0d6ac751a408c79f000eea427321163c SHA256 60e091c45c2d3266702c4752f37d1a94416f2b6061bd4c946bdcc45041c991a6
-MISC ChangeLog 7754 RMD160 aa4354832d2926a3fb8abac7756a14309d6e926a SHA1 4a3f94b4c92f62082ab1b687564df6dbf7e965e9 SHA256 8c10619a5f99005e071e5cddfb2c98117eb6326f45f0c69690b5fc31828d38e6
+MISC ChangeLog 8030 RMD160 a5ab02b3c5f6cac968d20735b3abac680eb460e8 SHA1 b2eea2311d72b1de18dc20e00aeb1f2c1ed577e7 SHA256 d8cf113eeb1b10ff9f7f4d104d4b1eebfe72027bed9b43500a8c92c221de10d3
 MISC metadata.xml 422 RMD160 4411d72c4f4fcf99b8b8e749fccce1fc72315acc SHA1 a95181e936cdb1913067d09e85439ed0fb82d4ea SHA256 53db66821b73f032d46f1db7ca72a341982e02c424bb1eba37d3b7ed70b2bfb9
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r1.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r1.ebuild
new file mode 100644
index 000000000000..18e08f6fc93d
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2008 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.12-r1.ebuild,v 1.1 2008/08/04 15:55:31 dertobi123 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="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~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
+
+	econf ${myconf} \
+		--host=${CHOST} \
+		--prefix=/usr/nagios \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nrpe-user=nagios \
+		--with-nrpe-grp=nagios || die "econf failed"
+	emake all || die "make failed"
+	# 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
+
+	newinitd "${FILESDIR}"/nrpe nrpe
+
+	cat << EOF > "${T}"/55-nagios-nrpe-revdep
+SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec"
+EOF
+
+	insinto /etc/revdep-rebuild
+	doins "${T}"/55-nagios-nrpe-revdep
+
+	# Create pidfile in /var/run/nrpe, bug #233859
+	keepdir /var/run/nrpe
+	fowners nagios:nagios /var/run/nrpe
+	sed -i -e \
+		"s#pid_file=/var/run/nrpe.pid#pid_file=/var/run/nrpe/nrpe.pid#" \
+		"${D}"/etc/nagios/nrpe.cfg || die "sed failed"
+}
+
+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.bz2 for more info"
+	fi
+}
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r101.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r102.ebuild
index 6d96f3fbb27e..331b990c22d3 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r101.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.12-r101.ebuild,v 1.2 2008/05/31 08:17:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r102.ebuild,v 1.1 2008/08/04 15:55:31 dertobi123 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -67,6 +67,13 @@ src_install() {
 	doexe src/check_nrpe contrib/nrpe_check_control
 
 	newinitd "${FILESDIR}"/nrpe-nagios3 nrpe
+
+	# Create pidfile in /var/run/nrpe, bug #233859
+	keepdir /var/run/nrpe
+	fowners nagios:nagios /var/run/nrpe
+	sed -i -e \
+		"s#pid_file=/var/run/nrpe.pid#pid_file=/var/run/nrpe/nrpe.pid#" \
+		"${D}"/etc/nagios/nrpe.cfg || die "sed failed"
 }
 
 pkg_postinst() {