version bump

(Portage version: 2.0.54-r2)

4 files changed, 238 insertions, 1 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 212cc808c774..b461a5da2420 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.86 2006/05/16 19:48:34 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.87 2006/06/01 05:32:25 ramereth Exp $
+
+*nagios-core-2.4 (01 Jun 2006)
+
+  01 Jun 2006; Lance Albertson <ramereth@gentoo.org>
+  +nagios-core-2.4.ebuild:
+  * Version bump
 
   16 May 2006; Markus Rothe <corsair@gentoo.org> nagios-core-1.4.1.ebuild:
   Stable on ppc64; bug #133487
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 0ed444206964..7882791fe4fa 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -6,6 +6,7 @@ MD5 155842cf933f59e8cd68b61d84280e70 files/digest-nagios-core-1.4 151
 MD5 2e5fdbc8e1063290d5589c1091bde0bb files/digest-nagios-core-1.4.1 153
 MD5 0112e82ce6b3c7360d47e40bdf76a990 files/digest-nagios-core-2.3 131
 MD5 801bbf98c4aa4b4d10fc5de369933342 files/digest-nagios-core-2.3.1 133
+MD5 7f02929ded7ed06c70d2b670a264d48f files/digest-nagios-core-2.4 131
 MD5 f83fb59efe215d8191866a95685b4b39 files/nagios 1416
 MD5 354f5aeb0e831ee8e218962eb85d07e4 files/nagios-1.x-Makefile-asneeded.diff 5460
 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
@@ -15,3 +16,4 @@ MD5 b77809d363ccf9b561c099866e60ad3b nagios-core-1.4.1.ebuild 7508
 MD5 71fc67b930bb60a4b18c2fd2e55febbf nagios-core-1.4.ebuild 7504
 MD5 0db78682d06f57a5c4af37bad8cea745 nagios-core-2.3.1.ebuild 5995
 MD5 bad76591d737b015d248479440d94a51 nagios-core-2.3.ebuild 5990
+MD5 0db78682d06f57a5c4af37bad8cea745 nagios-core-2.4.ebuild 5995
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.4 b/net-analyzer/nagios-core/files/digest-nagios-core-2.4
new file mode 100644
index 000000000000..1d99a83fa256
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.4
@@ -0,0 +1,2 @@
+MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
+MD5 bb8f0106dc7f282c239f54db1f308445 nagios-2.4.tar.gz 1735573
diff --git a/net-analyzer/nagios-core/nagios-core-2.4.ebuild b/net-analyzer/nagios-core/nagios-core-2.4.ebuild
new file mode 100644
index 000000000000..63b6b1c39554
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-2.4.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.4.ebuild,v 1.1 2006/06/01 05:32:25 ramereth Exp $
+
+inherit eutils apache-module toolchain-funcs gnuconfig
+
+MY_P=${PN/-core}-${PV/_}
+DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	mirror://gentoo/nagios-2.0b.cfg-sample.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="noweb perl debug apache2"
+# mysql postgres
+DEPEND="virtual/mailx
+	!noweb? (
+		>=media-libs/jpeg-6b-r3
+		>=media-libs/libpng-1.2.5-r4
+		>=media-libs/gd-1.8.3-r5
+		${NEED_APACHE_DEPEND}
+		perl? ( net-analyzer/traceroute )
+	)
+	perl? ( >=dev-lang/perl-5.6.1-r7 )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# If there's a gd lib on the system, it will try to build with it.
+	# check if gdlib-config is on, and then check its output.
+	if [[ -x ${ROOT}usr/bin/gdlib-config ]]; then
+		if [[ ! $(${ROOT}usr/bin/gdlib-config --libs | grep -- -ljpeg) ]]; then
+			eerror "Your gd has been compiled without jpeg support."
+			eerror "Please re-emerge gd:"
+			eerror "# USE="jpeg" emerge gd"
+			die "pkg_setup failed"
+		fi
+	fi
+
+	enewgroup nagios
+
+	if use noweb; then
+		enewuser nagios -1 /bin/bash /dev/null nagios
+	else
+		enewuser nagios -1 /bin/bash /dev/null nagios,apache
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/2.x-series-nsca.patch
+	# ppc64 needs this
+	gnuconfig_update
+}
+
+src_compile() {
+	local myconf
+
+	if use perl
+	then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --enable-DEBUG0"
+		myconf="${myconf} --enable-DEBUG1"
+		myconf="${myconf} --enable-DEBUG2"
+		myconf="${myconf} --enable-DEBUG3"
+		myconf="${myconf} --enable-DEBUG4"
+		myconf="${myconf} --enable-DEBUG5"
+	fi
+
+	if use noweb; then
+		myconf="${myconf} --with-command-grp=nagios"
+	else
+		myconf="${myconf} --with-command-grp=apache"
+	fi
+
+	./configure ${myconf} \
+		--host=${CHOST} \
+		--prefix=/usr/nagios \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		${myconf} || die "./configure failed"
+
+	emake CC=$(tc-getCC) nagios || die "make failed"
+
+	if use !noweb ; then
+		# Only compile the CGI's if "noweb" useflag is not set.
+		make CC=$(tc-getCC) DESTDIR=${D} cgis || die
+	fi
+
+	emake -C contrib all || "contrib make filed"
+
+}
+
+src_install() {
+	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
+	docinto contrib
+	dodoc contrib/README
+
+	if use noweb; then
+		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' \
+			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' \
+			Makefile
+	fi
+
+	sed -i -e 's/^contactgroups$//g' Makefile
+
+	make DESTDIR=${D} install
+	make DESTDIR=${D} install-config
+	make DESTDIR=${D} install-commandmode
+
+	docinto sample-configs
+	dodoc ${D}/etc/nagios/*
+	rm ${D}/etc/nagios/*
+
+	newdoc ${WORKDIR}/nagios-2.0b.cfg-sample nagios.cfg-sample
+
+	#contribs are not configured by the configure script, we'll configure them overselves...
+	find ${S}/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:;
+						s:/usr/local/nagios/libexec:/usr/nagios/libexec:;
+						s:/usr/local/nagios/etc:/etc/nagios:;
+						s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i
+
+	insinto /usr/share/doc/${PF}/contrib
+	doins -r contrib/eventhandlers
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/nagios
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/conf.d nagios
+
+	chmod 644 ${S}/contrib/*.cgi
+	into /usr/nagios
+	for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do
+		dobin $bin
+	done
+
+	# Apache Module
+	if use !noweb; then
+		if use apache2; then
+			insinto ${APACHE2_MODULES_CONFDIR}
+			doins ${FILESDIR}/99_nagios.conf
+		else
+			insinto ${APACHE1_MODULES_CONFDIR}
+			doins ${FILESDIR}/nagios.conf
+		fi
+		if use perl; then
+			into /usr/nagios ; dosbin contrib/traceroute.cgi
+		fi
+	fi
+
+	for dir in etc/nagios usr/nagios var/nagios ; do
+		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
+	done
+
+	keepdir /etc/nagios
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	keepdir /usr/nagios/share/ssi
+	keepdir /var/nagios/rw
+}
+
+pkg_preinst() {
+	if use noweb; then
+		chown -R nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+	else
+		chown -R nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+	fi
+
+	chmod ug+s ${D}/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
+	chmod 0750 ${D}/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
+	einfo
+	einfo "Also, if you want nagios to start at boot time"
+	einfo "remember to execute:"
+	einfo "  rc-update add nagios default"
+	einfo
+
+	if use !noweb; then
+		einfo "This does not include cgis that are perl-dependent"
+		einfo "Currently traceroute.cgi is perl-dependent"
+		einfo "To have ministatus.cgi requires copying of ministatus.c"
+		einfo "to cgi directory for compiling."
+
+		if use apache2; then
+			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+		else
+			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
+		fi
+
+		einfo
+		einfo "That will make nagios's web front end visable via"
+		einfo "http://localhost/nagios/"
+		einfo
+
+	else
+		einfo "Please note that you have installed Nagios without web interface."
+		einfo "Please don't file any bugs about having no web interface when you do this."
+		einfo "Thank you!"
+	fi
+
+	einfo
+	einfo "If your kernel has /proc protection, nagios"
+	einfo "will not be happy as it relies on accessing the proc"
+	einfo "filesystem. You can fix this by adding nagios into"
+	einfo "the group wheel, but this is not recomended."
+	einfo
+
+	einfo
+	ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion"
+}
+
+pkg_prerm() {
+	/etc/init.d/nagios stop
+}