[patch] Patch against the nagios-nrpe package

nrpe.patch (text/plain), 3.32 KB, created by Dirk Tilger on 2010-08-08 20:46:10 UTC

diff -ur net-analyzer/nagios-nrpe/files/nrpe net-analyzer/nagios-nrpe//files/nrpe
--- net-analyzer/nagios-nrpe/files/nrpe	2010-01-04 09:21:48.000000000 +0400
+++ net-analyzer/nagios-nrpe/files/nrpe	2010-08-08 16:42:08.000000000 +0400
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!@GENTOO_PORTAGE_EPREFIX@/sbin/runscript
 
 opts="${opts} reload"
 
@@ -9,9 +9,9 @@
 start() {
 	ebegin "Starting nrpe"
 	start-stop-daemon --start --quiet --name nrpe \
-	--startas /usr/nagios/bin/nrpe \
+	--startas @GENTOO_PORTAGE_EPREFIX@/usr/nagios/bin/nrpe \
 		-c nagios:nagios \
-		-- -c /etc/nagios/nrpe.cfg \
+		-- -c @GENTOO_PORTAGE_EPREFIX@/etc/nagios/nrpe.cfg \
 		--daemon
 	eend $? "Failed to Start nrpe"
 }
diff -ur net-analyzer/nagios-nrpe/files/nrpe-nagios3 net-analyzer/nagios-nrpe//files/nrpe-nagios3
--- net-analyzer/nagios-nrpe/files/nrpe-nagios3	2010-01-04 09:21:48.000000000 +0400
+++ net-analyzer/nagios-nrpe//files/nrpe-nagios3	2010-08-08 16:49:16.000000000 +0400
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!@GENTOO_PORTAGE_EPREFIX@/sbin/runscript
 
 opts="${opts} reload"
 
@@ -9,9 +9,9 @@
 start() {
 	ebegin "Starting nrpe"
 	start-stop-daemon --start --quiet --name nrpe \
-	--startas /usr/bin/nrpe \
+	--startas @GENTOO_PORTAGE_EPREFIX@/usr/bin/nrpe \
 		-c nagios:nagios \
-		-- -c /etc/nagios/nrpe.cfg \
+		-- -c @GENTOO_PORTAGE_EPREFIX@/etc/nagios/nrpe.cfg \
 		--daemon
 	eend $? "Failed to Start nrpe"
 }
diff -ur net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r103.ebuild net-analyzer/nagios-nrpe//nagios-nrpe-2.12-r103.ebuild
--- net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r103.ebuild	2010-01-04 09:21:49.000000000 +0400
+++ net-analyzer/nagios-nrpe//nagios-nrpe-2.12-r103.ebuild	2010-08-08 16:53:14.000000000 +0400
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs prefix autotools
 
 DESCRIPTION="Nagios $PV NRPE - Nagios Remote Plugin Executor"
 HOMEPAGE="http://www.nagios.org/"
@@ -26,10 +26,22 @@
 	enewuser nagios -1 /bin/bash /dev/null nagios
 }
 
+src_unpack() {
+	unpack ${A}
+
+	mkdir ${WORKDIR}/extras
+	cp "${FILESDIR}"/nrpe-nagios3 ${WORKDIR}/extras/
+}
+
 src_prepare() {
 	# Add support for large output,
 	# http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html
 	epatch "${FILESDIR}/multiline.patch"
+
+	# Doesn't look for .dylib on MacOSX
+	epatch "${FILESDIR}"/${P}-darwin-dylib.patch
+	eautoreconf
+	eprefixify ${WORKDIR}/extras/nrpe-nagios3
 }
 
 src_configure() {
@@ -41,14 +53,13 @@
 	# 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
+		myconf="${myconf} --with-ssl=${EPREFIX}/usr"
 	fi
 
 	econf ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
+		--libexecdir=${EPREFIX}/usr/$(get_libdir)/nagios/plugins \
+		--localstatedir=${EPREFIX}/var/nagios \
+		--sysconfdir=${EPREFIX}/etc/nagios \
 		--with-nrpe-user=nagios \
 		--with-nrpe-grp=nagios || die "econf failed"
 }
@@ -77,7 +88,7 @@
 	exeinto /usr/$(get_libdir)/nagios/plugins
 	doexe src/check_nrpe contrib/nrpe_check_control
 
-	newinitd "${FILESDIR}"/nrpe-nagios3 nrpe
+	newinitd ${WORKDIR}/extras/nrpe-nagios3 nrpe
 
 	# Create pidfile in /var/run/nrpe, bug #233859
 	keepdir /var/run/nrpe