version bump

Package-Manager: portage-2.1-r1

6 files changed, 267 insertions, 24 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index bbe05db98917..38c1f423c8c0 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.89 2006/06/02 13:56:51 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.90 2006/07/18 17:10:04 ramereth Exp $
+
+*nagios-core-2.5 (18 Jul 2006)
+
+  18 Jul 2006; Lance Albertson <ramereth@gentoo.org>
+  +nagios-core-2.5.ebuild:
+  * Version bump
 
   02 Jun 2006; Eldad Zack <eldad@gentoo.org> nagios-core-1.4.1.ebuild,
   nagios-core-2.3.1.ebuild, nagios-core-2.4.ebuild:
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index c16a6d5d55b5..4e9b147c011c 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.x-series-nsca.patch 767 RMD160 69c3916842953666037dcf258906c15a9ce0047a SHA1 5f376bd65bf74eeb3cc00efde4fadf7f8962d06c SHA256 04ecb77abfe7618d036a2b598ea30df6704a82285b2210055eda4dd6414c94d3
 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
 RMD160 69c3916842953666037dcf258906c15a9ce0047a files/2.x-series-nsca.patch 767
@@ -31,9 +28,10 @@ RMD160 1dc2b0a10b0c824b3e0026c26d17f931703e7a98 files/submit_check_result_via_ns
 SHA256 2770e3988ce05a63866e4b32c029f3ef13d64d7da3791747014378391d5d8d3e files/submit_check_result_via_nsca.patch 585
 DIST nagios-1.4.1.tar.gz 1643386 RMD160 f79f6ec943e820562263d62b5e0fb8ab090f8d69 SHA1 27a1e46479f526aaf218d4dc8f90b29e8a6d9ace SHA256 8383ba2d76dc94d677987b23bd0a6cf241d3cde6dd93920ee69a6841edc71898
 DIST nagios-1.x-Makefile-distclean-gentoo.diff.bz2 1133 RMD160 62a627f54b878bdad8347138935ec7875bf39857 SHA1 2063a2d629e88f2e6b536d4eafe4e0f815c4fdb1 SHA256 1f6a1d76d589c5a5ae5bb68367a410ea984f6dccf766a6a76229c1014f872084
-DIST nagios-2.0b.cfg-sample.gz 8990
-DIST nagios-2.3.1.tar.gz 1734958
-DIST nagios-2.4.tar.gz 1735573
+DIST nagios-2.0b.cfg-sample.gz 8990 RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 SHA1 7a27bcf4be959424b688f52e31887862b863ec23 SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12
+DIST nagios-2.3.1.tar.gz 1734958 RMD160 fb1d1e66682ce4261535281de04067c3ad33b5ee SHA1 8376d15ca7d0ad6bd890a4d1170d325494604377 SHA256 40cd86756eb859cfd00c47c8a6670aac74c841393c49fc24bd5ed43099e3cdcc
+DIST nagios-2.4.tar.gz 1735573 RMD160 7f05352b0f46f14e5ce7fc19278216b9862e7735 SHA1 31a394195f571ec8417afec6b22da5d91f5f773b SHA256 e62346de93df5f4387377faac9ad1fd2fbfd5628f0482646144dc2b8d266fcd8
+DIST nagios-2.5.tar.gz 1736167 RMD160 a0f1890ed546ce026cf784ae3ca83119275bd529 SHA1 00e6bc45c5634649b6a1be2758ec181197d38f76 SHA256 de9eb06609299cc231d0c2104a7f65367446cb86cb6aa3f6787fb25003fd452e
 EBUILD nagios-core-1.4.1.ebuild 7488 RMD160 f1862f1d909e6b2fbe09790983f687887763774e SHA1 469cde8a2c27c11b5fd539d9b5803b1f8300f031 SHA256 058ffb1efde3a4665208f67cf7dde1fd8d2967887c324422a4b8d136d451b3fe
 MD5 886e406820dcb508f9766c6fa2478f38 nagios-core-1.4.1.ebuild 7488
 RMD160 f1862f1d909e6b2fbe09790983f687887763774e nagios-core-1.4.1.ebuild 7488
@@ -46,10 +44,14 @@ EBUILD nagios-core-2.4.ebuild 5972 RMD160 202ff3a724ee625ffc6eae465a4488978e6fdb
 MD5 04f71325c36e02448937ca7e94d351a3 nagios-core-2.4.ebuild 5972
 RMD160 202ff3a724ee625ffc6eae465a4488978e6fdb6b nagios-core-2.4.ebuild 5972
 SHA256 524a5d0cb0031bb5f809c5d9e03691b3f64a6a4d232fc18c8eafb296f610b44a nagios-core-2.4.ebuild 5972
-MISC ChangeLog 15801 RMD160 715ed000f4942c9770d439140e38141b27252937 SHA1 f8c99105f081a16cf2ea6378737a0aa340689396 SHA256 fc2c8380fecf8d4b0340ed1f19ae76e4d59a232de4ac85c4bae1731acf5819e0
-MD5 1a3dec233060b98a24a81eae41d88ffe ChangeLog 15801
-RMD160 715ed000f4942c9770d439140e38141b27252937 ChangeLog 15801
-SHA256 fc2c8380fecf8d4b0340ed1f19ae76e4d59a232de4ac85c4bae1731acf5819e0 ChangeLog 15801
+EBUILD nagios-core-2.5.ebuild 5975 RMD160 2cb43c1cdb1a42b685e7fce374b35facb1247ebe SHA1 8cfb070fb49c63d0e7c85fde8d6169fbd2655b05 SHA256 d06dc39fe51636edea7e5f9ecbd7cff4899f34469a30ee7f961744fc88f9b488
+MD5 c021b5f3ea0292142786890d4b1ab9c5 nagios-core-2.5.ebuild 5975
+RMD160 2cb43c1cdb1a42b685e7fce374b35facb1247ebe nagios-core-2.5.ebuild 5975
+SHA256 d06dc39fe51636edea7e5f9ecbd7cff4899f34469a30ee7f961744fc88f9b488 nagios-core-2.5.ebuild 5975
+MISC ChangeLog 15934 RMD160 2ef430d3c57059262ea4aa2b3a53be96c2ece724 SHA1 4f9ec2e5f127620ae764a10901d4cd584193ffac SHA256 9dac23f490d39793f49c0392201fd4a0371c01386910f03ca052b562a597bfa5
+MD5 f42c5956cc04dad3971209829e743689 ChangeLog 15934
+RMD160 2ef430d3c57059262ea4aa2b3a53be96c2ece724 ChangeLog 15934
+SHA256 9dac23f490d39793f49c0392201fd4a0371c01386910f03ca052b562a597bfa5 ChangeLog 15934
 MISC metadata.xml 1049 RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 SHA1 19972fccad8732b7fd85e1b8c0f1077dc254432f SHA256 c2b2985cb9cd326a5eb6523769cdf7e63bde2a0523dc59df5989282d1fbbd2a0
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 RMD160 33d4d61b3c0c0c29cd4770349d1b18ee280b8395 metadata.xml 1049
@@ -57,16 +59,12 @@ SHA256 c2b2985cb9cd326a5eb6523769cdf7e63bde2a0523dc59df5989282d1fbbd2a0 metadata
 MD5 2ff64ef7844e2d8435b395e2a77645c0 files/digest-nagios-core-1.4.1 551
 RMD160 b1f7ffc038e3d8705fe5bc94fa792480f890bd57 files/digest-nagios-core-1.4.1 551
 SHA256 7e25c77577e6d3484161cabb5e76212de02538d6011b570be3b1c18742d97f18 files/digest-nagios-core-1.4.1 551
-MD5 801bbf98c4aa4b4d10fc5de369933342 files/digest-nagios-core-2.3.1 133
-RMD160 064da001ae6ee1a3d08d2d1b577bb9bbcb6fc821 files/digest-nagios-core-2.3.1 133
-SHA256 7d0241c5d0da3ab2636bdba2b1ec6bd27b5f121e018f6389cabb966421dd199a files/digest-nagios-core-2.3.1 133
-MD5 7f02929ded7ed06c70d2b670a264d48f files/digest-nagios-core-2.4 131
-RMD160 58c7da8718425833b05e5b36e902bed77436c061 files/digest-nagios-core-2.4 131
-SHA256 07ee78e363245ad44a3621ac7f0cc679671994863ce1537ccbfa2777d28db33d files/digest-nagios-core-2.4 131
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEgEO+T+MN7JbqCpMRAjcsAJwNVdn3m+OVyFTuYBQPlDeM8PNZTACeIYWl
-rrT0LNXkDgaziJb9n0Pkpi4=
-=+4Im
------END PGP SIGNATURE-----
+MD5 d39c41dd2383eab4bb237c90fe1dbdf4 files/digest-nagios-core-2.3.1 491
+RMD160 e72e63e55e9e806b203937bf3cde16f3915df5eb files/digest-nagios-core-2.3.1 491
+SHA256 c1f767c1883d59ea7e22c89d606c4879a43d7259e55045853552df5b9057737c files/digest-nagios-core-2.3.1 491
+MD5 3f05e1da810ec9ed9bef1029aff133c2 files/digest-nagios-core-2.4 485
+RMD160 614ad7c8f4f7604677be3dede9dbe2da2cb75e01 files/digest-nagios-core-2.4 485
+SHA256 87e3e628b03992d5b8038a9b80ab168c036c28879b9e357f71539227d512fa49 files/digest-nagios-core-2.4 485
+MD5 b6b85fb28fc2279eb3be17377152d4d3 files/digest-nagios-core-2.5 485
+RMD160 114fba97e51b68fa3f07c60ee4a24be0bfacfa11 files/digest-nagios-core-2.5 485
+SHA256 d26b0a8fcb534c5593d50a59e3169ea24c292f13e8c519f97818bd3855001132 files/digest-nagios-core-2.5 485
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1 b/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1
index bbc7d31072b4..b533041132d3 100644
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.3.1
@@ -1,2 +1,6 @@
 MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
+RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 nagios-2.0b.cfg-sample.gz 8990
+SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12 nagios-2.0b.cfg-sample.gz 8990
 MD5 22029e5b71b50036c41a44f63e58150d nagios-2.3.1.tar.gz 1734958
+RMD160 fb1d1e66682ce4261535281de04067c3ad33b5ee nagios-2.3.1.tar.gz 1734958
+SHA256 40cd86756eb859cfd00c47c8a6670aac74c841393c49fc24bd5ed43099e3cdcc nagios-2.3.1.tar.gz 1734958
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.4 b/net-analyzer/nagios-core/files/digest-nagios-core-2.4
index 1d99a83fa256..4811c04f0a0b 100644
--- a/net-analyzer/nagios-core/files/digest-nagios-core-2.4
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.4
@@ -1,2 +1,6 @@
 MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
+RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 nagios-2.0b.cfg-sample.gz 8990
+SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12 nagios-2.0b.cfg-sample.gz 8990
 MD5 bb8f0106dc7f282c239f54db1f308445 nagios-2.4.tar.gz 1735573
+RMD160 7f05352b0f46f14e5ce7fc19278216b9862e7735 nagios-2.4.tar.gz 1735573
+SHA256 e62346de93df5f4387377faac9ad1fd2fbfd5628f0482646144dc2b8d266fcd8 nagios-2.4.tar.gz 1735573
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-2.5 b/net-analyzer/nagios-core/files/digest-nagios-core-2.5
new file mode 100644
index 000000000000..d6f6113d34a1
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-2.5
@@ -0,0 +1,6 @@
+MD5 6b679390ce57974a0f69145e0918372f nagios-2.0b.cfg-sample.gz 8990
+RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 nagios-2.0b.cfg-sample.gz 8990
+SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12 nagios-2.0b.cfg-sample.gz 8990
+MD5 1a77528f6797bd3c0320da5e4fae2b1a nagios-2.5.tar.gz 1736167
+RMD160 a0f1890ed546ce026cf784ae3ca83119275bd529 nagios-2.5.tar.gz 1736167
+SHA256 de9eb06609299cc231d0c2104a7f65367446cb86cb6aa3f6787fb25003fd452e nagios-2.5.tar.gz 1736167
diff --git a/net-analyzer/nagios-core/nagios-core-2.5.ebuild b/net-analyzer/nagios-core/nagios-core-2.5.ebuild
new file mode 100644
index 000000000000..2f0862a2560b
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-2.5.ebuild
@@ -0,0 +1,225 @@
+# 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.5.ebuild,v 1.1 2006/07/18 17:10:04 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
+
+	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
+}