revbump for 2.0b_p4, updated metadata.xml

Package-Manager: portage-2.0.51.22-r2

5 files changed, 267 insertions, 30 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index bf54e8b3812e..bb66653d2b97 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.53 2005/09/26 15:30:08 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.54 2005/09/28 18:22:32 ramereth Exp $
+
+*nagios-core-2.0b_p4 (28 Sep 2005)
+
+  28 Sep 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml,
+  +nagios-core-2.0b_p4.ebuild:
+  * revbump for 2.0b_p4
+  * updated metadata.xml
 
   26 Sep 2005; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r3.ebuild,
   nagios-core-1.2-r4.ebuild:
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 3ace6f0afc00..fcb17b38c24e 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,30 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 be04314bc38c3f1ad8b15ac0b7399264 nagios-core-2.0b_p2.ebuild 5856
-MD5 245ae631470f09b98d5eb40a35a59d8e nagios-core-1.2-r3.ebuild 7161
-MD5 ce3be07134c88a9567e69cfbe28fe86a nagios-core-2.0b_p1.ebuild 5825
+MD5 432396488eb7854ef7790d70bb7a7a3c ChangeLog 9695
+MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 MD5 8b8118567805f4ea62359eb7dbf2019e nagios-core-1.2-r2.ebuild 6616
 MD5 33cb82c11240d04aee53074e0b43e681 nagios-core-1.2-r4.ebuild 7082
-MD5 618b065f1cc13f3620b1f75a3846e33e ChangeLog 9511
-MD5 a1ece421fae3536d1e5dd9b5ecb0215d metadata.xml 928
-MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
-MD5 aa5bb53aee1f5609395e8184f2eff4a6 files/digest-nagios-core-2.0b_p1 65
-MD5 19566d92e4989244216c7fb6d19d688c files/digest-nagios-core-2.0b_p2 65
+MD5 245ae631470f09b98d5eb40a35a59d8e nagios-core-1.2-r3.ebuild 7161
+MD5 ce3be07134c88a9567e69cfbe28fe86a nagios-core-2.0b_p1.ebuild 5825
+MD5 be04314bc38c3f1ad8b15ac0b7399264 nagios-core-2.0b_p2.ebuild 5856
+MD5 be04314bc38c3f1ad8b15ac0b7399264 nagios-core-2.0b_p4.ebuild 5856
+MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
+MD5 d062be8c632fbfa88dd1194e0bea2abf files/nagios 1389
 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63
+MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
+MD5 19566d92e4989244216c7fb6d19d688c files/digest-nagios-core-2.0b_p2 65
 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
-MD5 d062be8c632fbfa88dd1194e0bea2abf files/nagios 1389
-MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
-MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
-MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r2 63
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r3 63
-MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDOBQcT+MN7JbqCpMRAm1MAJ9mDsQkq/wKfvAgY4wyDgKZ9esT+wCgjRwj
-aY1pB6WR5GBdCW6Z8J7eGsg=
-=/J7i
------END PGP SIGNATURE-----
+MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
+MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
+MD5 aa5bb53aee1f5609395e8184f2eff4a6 files/digest-nagios-core-2.0b_p1 65
+MD5 7a96e80dbe17f26441d3266662b58a51 files/digest-nagios-core-2.0b_p4 65
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p4 b/net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p4
new file mode 100644
index 000000000000..089bd44d3ee3
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.0b_p4
@@ -0,0 +1 @@
+MD5 206ea26230d1360cc8871c0fee80b4c4 nagios-2.0b4.tar.gz 1710293
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
index d734cf5d5e5e..2228f02f1849 100644
--- a/net-analyzer/nagios-core/metadata.xml
+++ b/net-analyzer/nagios-core/metadata.xml
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<maintainer>
-  <email>eldad@gentoo.org</email>
-  <name>Eldad Zack</name>
-</maintainer>
-<longdescription>Nagios is a host and service monitor designed to inform you of network problems before your clients, end-users or managers do. It has been designed to run under the Linux operating system, but works fine under most *NIX variants as well. The monitoring daemon runs intermittent checks on hosts and services you specify using external "plugins" which return status information to Nagios. When problems are encountered, the daemon can send notifications out to administrative contacts in a variety of different ways (email, instant message, SMS, etc.). Current status information, historical logs, and reports can all be accessed via a web browser.</longdescription>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>eldad@gentoo.org</email>
+		<name>Eldad Zack</name>
+	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<longdescription>Nagios is a host and service monitor designed to inform you
+		of network problems before your clients, end-users or managers do. It
+		has been designed to run under the Linux operating system, but works
+		fine under most *NIX variants as well. The monitoring daemon runs
+		intermittent checks on hosts and services you specify using external
+		"plugins" which return status information to Nagios. When problems are
+		encountered, the daemon can send notifications out to administrative
+		contacts in a variety of different ways (email, instant message, SMS,
+		etc.). Current status information, historical logs, and reports can all
+		be accessed via a web browser.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild
new file mode 100644
index 000000000000..6d188529e9d6
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2005 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.0b_p4.ebuild,v 1.1 2005/09/28 18:22:32 ramereth Exp $
+
+inherit eutils depend.apache toolchain-funcs
+
+MY_P=${PN/-core}-${PV/_p}
+DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+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
+		${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 apache
+		usermod -G apache nagios
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/2.x-series-nsca.patch
+	gunzip -c ${FILESDIR}/nagios.cfg-sample.gz > ./nagios.cfg-sample
+}
+
+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 contrib || 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
+
+	# convert config files
+	emake -C contrib convertcfg || "config convert died"
+
+}
+
+src_install() {
+	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
+
+	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/*
+
+	dodoc ${S}/nagios.cfg-sample
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/nagios
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/conf.d nagios
+
+
+	rm ${S}/contrib/Makefile* ${S}/contrib/*.c ${S}/contrib/*.h
+
+	#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
+
+	mv contrib/ ${D}usr/nagios
+
+	for dir in etc/nagios usr/nagios var/nagios usr/nagios/contrib
+	do
+		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
+	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
+			mv ${D}usr/nagios/contrib/traceroute.cgi ${D}usr/nagios/sbin
+			fperms a+x /usr/nagios/sbin/traceroute.cgi
+		fi
+	fi
+}
+
+pkg_preinst() {
+	keepdir /etc/nagios
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	keepdir /usr/nagios/share/ssi
+	keepdir /var/nagios/rw
+
+	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"
+}
+
+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/contrib/convertcfg for configuration file conversion"
+	einfo
+}
+
+pkg_prerm() {
+	/etc/init.d/nagios stop
+}