bump for nagios-3

Package-Manager: portage-2.1.5_rc6

4 files changed, 105 insertions, 9 deletions

diff --git a/net-analyzer/nagios-imagepack/ChangeLog b/net-analyzer/nagios-imagepack/ChangeLog
index e344c761e49d..a8c2580ba7b5 100644
--- a/net-analyzer/nagios-imagepack/ChangeLog
+++ b/net-analyzer/nagios-imagepack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-imagepack
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/ChangeLog,v 1.16 2008/03/14 11:59:56 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/ChangeLog,v 1.17 2008/04/27 18:12:03 dertobi123 Exp $
+
+*nagios-imagepack-1.0-r100 (27 Apr 2008)
+
+  27 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-imagepack-1.0.ebuild, +nagios-imagepack-1.0-r100.ebuild:
+  bump for nagios-3
 
   14 Mar 2008; Caleb Tennis <caleb@gentoo.org>
   nagios-imagepack-1.0-r1.ebuild:
diff --git a/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild b/net-analyzer/nagios-imagepack/nagios-imagepack-1.0-r100.ebuild
index 8bd0b67f1f59..561f4f3e8465 100644
--- a/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild
+++ b/net-analyzer/nagios-imagepack/nagios-imagepack-1.0-r100.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild,v 1.12 2007/07/11 23:49:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/nagios-imagepack-1.0-r100.ebuild,v 1.1 2008/04/27 18:12:03 dertobi123 Exp $
 
 DESCRIPTION="Nagios imagepacks - Icons and pictures for Nagios"
 HOMEPAGE="http://www.nagios.org"
@@ -13,13 +13,12 @@ SRC_URI="
 	${IMAGE_URI}/imagepak-remus.tar.gz
 	${IMAGE_URI}/imagepak-satrapa.tar.gz
 	${IMAGE_URI}/imagepak-werschler.tar.gz
+	http://dev.gentoo.org/~eldad/distfiles/imagepak-gentoo.tar.bz2
 "
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ppc64 sparc x86"
-
-RDEPEND="net-analyzer/nagios-core"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE=""
 
@@ -32,6 +31,6 @@ src_install () {
 	# nagios-core installs nagios.gd2
 	rm base/nagios.gd2
 
-	insinto /usr/nagios/share/images/logos
-	doins base/* didier/* imagepak-andrade/* imagepak-bernhard/* remus/* satrapa/* werschler/*
+	insinto /usr/share/nagios/htdocs/images/logos
+	doins base/* didier/* imagepak-andrade/* imagepak-bernhard/* remus/* satrapa/* werschler/* gentoo/*
 }
diff --git a/net-analyzer/nagios-nrpe/ChangeLog b/net-analyzer/nagios-nrpe/ChangeLog
index 091eede24eba..0a8626b44287 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.49 2008/03/14 11:58:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.50 2008/04/27 18:14:56 dertobi123 Exp $
+
+*nagios-nrpe-2.12-r101 (27 Apr 2008)
+
+  27 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +nagios-nrpe-2.12-r101.ebuild:
+  bump for nagios-3
 
   14 Mar 2008; Caleb Tennis <caleb@gentoo.org> nagios-nrpe-2.10.ebuild:
   amd64 stable, per bug #205335
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r101.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r101.ebuild
new file mode 100644
index 000000000000..6892a137df71
--- /dev/null
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.12-r101.ebuild
@@ -0,0 +1,85 @@
+# 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.1 2008/04/27 18:14:56 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 ~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 \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--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/bin
+	doexe src/nrpe
+
+	exeopts -m0750 -o nagios -g nagios
+	exeinto /usr/$(get_libdir)/nagios/plugins
+	doexe src/check_nrpe contrib/nrpe_check_control
+
+	newinitd "${FILESDIR}"/nrpe-nagios3 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.bz2 for more info"
+	fi
+}