Patch and bump by Priit Laes as per #198787

svn path=/; revision=13

3 files changed, 271 insertions, 0 deletions

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index ec99e69..976b20d 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -35,6 +35,7 @@ DIST nagios-1.x-Makefile-distclean-gentoo.diff.bz2 1133 RMD160 62a627f54b878bdad
 DIST nagios-2.0b.cfg-sample.gz 8990 RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 SHA1 7a27bcf4be959424b688f52e31887862b863ec23 SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12
 DIST nagios-2.9.tar.gz 1738698 RMD160 e60268efc59046b6b5884c920366e98c4badc122 SHA1 83c6b13004399cfa76c049243429286055e2d068 SHA256 f60a72dec1edef308a899734eff4f7e5167522f1afeb5c24fd1852e2749c5d9d
 DIST nagios-3.0b4.tar.gz 2723707 RMD160 0f70e5516114de3090e8e60fa947decba43542ea SHA1 bcb0d3756b6d56bbbd424ea4b3952ca3a5610520 SHA256 6fd804fb6785ae7cb5c9f8171ed6d418bf55848c52061abb457c24539c99d6e8
+DIST nagios-3.0b6.tar.gz 2732880 RMD160 a17b82dddad4d13eb14ec707ab6912141ed1e78d SHA1 b50b59830c5694f948b642c95d26f207824ee5f6 SHA256 4335e4bf8713394f8772dc2d8921faa47fc81196616021e5d2b8bd2da3f1cce0
 EBUILD nagios-core-1.4.1-r1.ebuild 7240 RMD160 0973c892dd1d6e0e8ab17bf5e7ddc67b94291ebf SHA1 424785d45415df90820fdf57e8215b50f17e36fe SHA256 4d0b569c3d2a8642cba55c3f1b916be3fc796dd2925419f201eb3f2a592067cb
 MD5 a271dc74aa33fef5a8430d763c4fa92a nagios-core-1.4.1-r1.ebuild 7240
 RMD160 0973c892dd1d6e0e8ab17bf5e7ddc67b94291ebf nagios-core-1.4.1-r1.ebuild 7240
@@ -51,6 +52,10 @@ EBUILD nagios-core-3.0_beta4.ebuild 7176 RMD160 e7bd0d98b64de409af5ba6652c9b2731
 MD5 e51b8cd2412e15e65147b90fa2f1c698 nagios-core-3.0_beta4.ebuild 7176
 RMD160 e7bd0d98b64de409af5ba6652c9b27314773c9e5 nagios-core-3.0_beta4.ebuild 7176
 SHA256 55db8b2591a56a440be708a89445da20af02b3371f29cdabd6de10fb10369dce nagios-core-3.0_beta4.ebuild 7176
+EBUILD nagios-core-3.0_beta6.ebuild 7409 RMD160 bc211f086a3835c1ae061af1a8304d6cb86e84f9 SHA1 efdbab1bdaf439f8932290c6c45005f3f7e5f8f7 SHA256 046867fa19098cfff46b63a414d7b21fef2f8ddbb0a64aedd6faa85ba35bf55d
+MD5 3908dcc8d5e785abaa63b8c688be7bf3 nagios-core-3.0_beta6.ebuild 7409
+RMD160 bc211f086a3835c1ae061af1a8304d6cb86e84f9 nagios-core-3.0_beta6.ebuild 7409
+SHA256 046867fa19098cfff46b63a414d7b21fef2f8ddbb0a64aedd6faa85ba35bf55d nagios-core-3.0_beta6.ebuild 7409
 MD5 ef84263e27625b48156346efd2d64888 files/digest-nagios-core-1.4.1 398
 RMD160 664058040de4c5d738feb55a4da8c91ff17ffa86 files/digest-nagios-core-1.4.1 398
 SHA256 d06116a1f6bb6d6b252cebbc2a6af90f64268a1516a9f5079befd6959818e6ce files/digest-nagios-core-1.4.1 398
@@ -63,3 +68,6 @@ SHA256 483d670ab17ccb1aafc809662186b525f42b49e3c4d2f91747020215debdbef3 files/di
 MD5 3a8d5d69f599383518c051cdd8c7147a files/digest-nagios-core-3.0_beta4 491
 RMD160 0c195a3ff77d1021b37d9b764785e5d69badfef3 files/digest-nagios-core-3.0_beta4 491
 SHA256 9b13758eec3c1e8115904a61d8ee6ee1367aee3d5fbd7ad5426a0d12ed9b6200 files/digest-nagios-core-3.0_beta4 491
+MD5 002a871144bb9f5d42dbd07525ff96ed files/digest-nagios-core-3.0_beta6 491
+RMD160 9e63274e241ef2a0a9dbbeaf5048727b27245e31 files/digest-nagios-core-3.0_beta6 491
+SHA256 e3ed06328aec08a32da78cb8dffe065bf9a4d4f835402e5922b8a4477d1006ca files/digest-nagios-core-3.0_beta6 491
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-3.0_beta6 b/net-analyzer/nagios-core/files/digest-nagios-core-3.0_beta6
new file mode 100644
index 0000000..90aeed9
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-3.0_beta6
@@ -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 6b1bdf467250c9961c025db5f1c5e382 nagios-3.0b6.tar.gz 2732880
+RMD160 a17b82dddad4d13eb14ec707ab6912141ed1e78d nagios-3.0b6.tar.gz 2732880
+SHA256 4335e4bf8713394f8772dc2d8921faa47fc81196616021e5d2b8bd2da3f1cce0 nagios-3.0b6.tar.gz 2732880
diff --git a/net-analyzer/nagios-core/nagios-core-3.0_beta6.ebuild b/net-analyzer/nagios-core/nagios-core-3.0_beta6.ebuild
new file mode 100644
index 0000000..133f0af
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-3.0_beta6.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2007 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.9-r1.ebuild,v 1.4 2007/08/01 21:00:26 marineam Exp $
+
+inherit eutils apache-module toolchain-funcs
+
+MY_P=${PN/-core}-${PV/_beta/b}
+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="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 lighttpd perl debug"
+# mysql postgres
+DEPEND="virtual/mailx
+	apache2? (
+		${NEED_APACHE_DEPEND}
+		>=media-libs/jpeg-6b-r3
+		>=media-libs/libpng-1.2.5-r4
+		>=media-libs/gd-1.8.3-r5
+		perl? ( net-analyzer/traceroute )
+	)
+	lighttpd? (
+		www-servers/lighttpd )
+        >=media-libs/jpeg-6b-r3
+        >=media-libs/libpng-1.2.5-r4
+        >=media-libs/gd-1.8.3-r5
+        perl? ( net-analyzer/traceroute )
+	perl? ( >=dev-lang/perl-5.6.1-r7 )
+	>=dev-libs/glib-2"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# Check if gd has been compiled with jpeg and png support
+	if use apache2 || lighttpd; then
+		if ! built_with_use media-libs/gd jpeg png; then
+			eerror "Your gd has been compiled without jpeg and/or png support."
+			eerror "Please re-emerge gd:"
+			eerror "# USE="jpeg png" emerge gd"
+			die "pkg_setup failed"
+		fi
+	fi
+
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/2.x-series-nsca.patch
+
+	local strip="$(echo '$(MAKE) strip-post-install')"
+	sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
+}
+
+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 !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-grp=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-grp=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		fi
+		if use lighttpd ; then
+			myconf="${myconf} --with-command-grp=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr/nagios \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--datadir=/usr/nagios/share \
+		|| die "./configure failed"
+
+	emake CC=$(tc-getCC) nagios || die "make failed"
+
+	if use apache2 || use lighttpd ; then
+		# Only compile the CGI's if any of the web backends is 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 !apache2 && use !lighttpd; then
+		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to use flag/' \
+			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to 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
+
+	doinitd "${FILESDIR}"/nagios || die "Error adding nagios init script"
+	newconfd "${FILESDIR}"/conf.d nagios \
+		|| die "Error adding nagios init script configuration"
+
+	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 apache2; then
+		insinto "${APACHE2_MODULES_CONFDIR}"
+		doins "${FILESDIR}"/99_nagios.conf \
+			|| die "Error adding configuration files for apache"
+
+		if use perl; then
+			into /usr/nagios ; dosbin contrib/traceroute.cgi
+		fi
+	fi
+
+	# Lighttpd Module
+	if use lighttpd; then
+		insinto /etc/lighttpd
+		newins "${FILESDIR}/lighttpd_nagios.conf" nagios.conf
+	fi
+
+	for dir in etc/nagios var/nagios ; do
+		chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}"
+	done
+
+	chown -R root:root "${D}"/usr/nagios
+	find "${D}"/usr/nagios -type d -print0 | xargs -0 chmod 755
+	find "${D}"/usr/nagios/*bin -type f -print0 | xargs -0 chmod 755
+	find "${D}"/usr/nagios/share -type f -print0 | xargs -0 chmod 644
+	
+	chown nagios:nagios "${D}"/var/nagios/spool/checkresults
+	chmod 640 "${D}"/var/nagios/spool/checkresults
+	
+	keepdir /etc/nagios
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	keepdir /usr/nagios/share/ssi
+	keepdir /var/nagios/rw
+	keepdir /var/nagios/spool/checkresults
+
+	if use !apache2 && use !lighttpd; then
+		chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
+	else
+		if use apache2 ; then
+			chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
+		fi
+		if use lighttpd ; then
+			chown -R nagios:lighttpd "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
+		fi
+	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"
+
+	cat << EOF > "${T}"/55-nagios-core-revdep
+SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec"
+EOF
+
+	insinto /etc/revdep-rebuild
+	doins "${T}"/55-nagios-core-revdep
+}
+
+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 !apache2 || use !lighttpd; 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."
+
+		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+
+		einfo
+		einfo "That will make nagios's web front end visable via"
+		einfo "http://localhost/nagios/"
+		einfo
+		einfo "Note that the user your webserver is running at needs"
+		einfo "read-access to /etc/nagios. There are several possible"
+		einfo "solutions to accomplish this, choose the one you are"
+		einfo "most comfortable with:"
+		einfo "	usermod -G nagios apache"
+		einfo "or"
+		einfo "	chown nagios:apache /etc/nagios"
+
+	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
+}