New upstream version. Closes bug #43022.

5 files changed, 223 insertions, 9 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index de6d6789b944..82f566fa3386 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.19 2004/02/17 11:40:39 tigger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.20 2004/02/27 14:30:32 mboman Exp $
+
+*nagios-core-1.2 (27 Feb 2004)
+
+  27 Feb 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
+  nagios-core-1.2.ebuild:
+  New upstream version. Closes bug #43022
 
   17 Feb 2004; rob holland <tigger@gentoo.org> nagios-core-1.1-r6.ebuild:
   Corrected apache2 handling and shell error.
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 7d6257529e75..2b7a1eda94ab 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,14 +1,16 @@
-MD5 58c89f636cf758e1e41c37f0feee2f24 nagios-core-1.1-r6.ebuild 5885
-MD5 3ded4ec4e85d53a021c13ac3c1733e1a nagios-core-1.1-r5.ebuild 5900
 MD5 aadf8b8bfe628c29375eda05cd950768 ChangeLog 3407
-MD5 b480a3a5ddac940e863a185f069a0cc0 metadata.xml 981
+MD5 67125e899e40330692585273a7839c41 metadata.xml 980
+MD5 66b022cd4979738f025859f061f7b5e6 nagios-core-1.2.ebuild 5885
 MD5 14229fd9200b237d116ae78912617726 nagios-core-1.1-r4.ebuild 5313
-MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
-MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
-MD5 713531258f08d24d3c9ee3eb4bba2276 files/nagios 820
-MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
+MD5 3ded4ec4e85d53a021c13ac3c1733e1a nagios-core-1.1-r5.ebuild 5900
+MD5 58c89f636cf758e1e41c37f0feee2f24 nagios-core-1.1-r6.ebuild 5885
 MD5 93fc29972ca48db69fc84adba9754c62 files/nagios.cfg-sample 22287
+MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
+MD5 713531258f08d24d3c9ee3eb4bba2276 files/nagios 820
 MD5 f4f0b07e1a52477f83cbb9158db70391 files/tac.cgi.diff.bz2 204
+MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
 MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r4 63
 MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r5 63
 MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r6 63
+MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2 63
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.2 b/net-analyzer/nagios-core/files/digest-nagios-core-1.2
new file mode 100644
index 000000000000..33ac901db72f
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-1.2
@@ -0,0 +1 @@
+MD5 414d70e5269d5b8d7c21bf3ee129309f nagios-1.2.tar.gz 1625322
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
index fe1bb30c5923..123ece640070 100644
--- a/net-analyzer/nagios-core/metadata.xml
+++ b/net-analyzer/nagios-core/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>netmon</herd>
 <maintainer>
   <email>mboman@gentoo.org</email>
   <name>Michael Boman</name>
diff --git a/net-analyzer/nagios-core/nagios-core-1.2.ebuild b/net-analyzer/nagios-core/nagios-core-1.2.ebuild
new file mode 100644
index 000000000000..b4bc561a4abf
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-1.2.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2.ebuild,v 1.1 2004/02/27 14:30:32 mboman Exp $
+
+inherit eutils
+
+DESCRIPTION="Nagios ${PV} core - Host and service monitor cgi, docs etc..."
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/nagios-1.2.tar.gz"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE="noweb mysql postgres perl debug apache2"
+
+DEPEND=">=net-mail/mailx-8.1
+	!noweb? (
+		>=media-libs/jpeg-6b-r3
+		>=media-libs/libpng-1.2.5-r4
+		>=media-libs/libgd-1.8.3-r5
+
+		apache2? ( >=net-www/apache-2.0.43-r1 )
+		!apache2? ( <net-www/apache-2 )
+	)
+
+	perl? ( >=dev-lang/perl-5.6.1-r7 )
+	mysql? ( >=dev-db/mysql-3.23.56 )
+	postgres? ( >=dev-db/postgresql-7.3.2 )"
+
+S="${WORKDIR}/nagios-${PV}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /dev/null nagios
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/Makefile-distclean.diff.bz2
+}
+
+src_compile() {
+	if [ -n "`use mysql`" -a -n "`use postgres`" ]; then
+		eerror "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time."
+		eerror "You have to remove either 'mysql' or 'postgres' from your USE flags before emerging this."
+
+		has_version ">=sys-apps/portage-2.0.50" && (
+			einfo "You can add:"
+			einfo "net-analyzer/nagios-core [use flags]"
+			einfo "to the file:"
+			einfo "/etc/portage/package.use"
+			einfo "to permamently set this package's USE flags"
+		)
+
+		exit 1
+	fi
+
+	local myconf
+
+	use mysql && myconf="${myconf} \
+		--with-mysql-xdata \
+		--with-mysql-status \
+		--with-mysql-comments \
+		--with-mysql-extinfo \
+		--with-mysql-retention \
+		--with-mysql-downtime"
+
+	use postgres && myconf="${myconf} \
+		--with-pgsql-xdata \
+		--with-pgsql-status \
+		--with-pgsql-comments \
+		--with-pgsql-extinfo \
+		--with-pgsql-retention \
+		--with-pgsql-downtime"
+
+	use perl && myconf="${myconf} \
+		--enable-embedded-perl \
+		--with-perlcache"
+
+	if [ -n "`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
+
+	./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"
+
+	make DESTDIR=${D} nagios contrib
+
+	use noweb || make DESTDIR=${D} cgis # Only compile the CGI's if "noweb" useflag is not set.
+}
+
+src_install() {
+	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
+
+	use noweb && (
+		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile
+		sed -i -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' 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 ${FILESDIR}/nagios.cfg-sample
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/nagios
+
+	insinto /usr/nagios/contrib
+	doins contrib/*
+
+	insinto /usr/nagios/contrib/database
+	doins contrib/database/*
+
+	insinto /usr/nagios/contrib/eventhandlers
+	doins contrib/eventhandlers/*
+
+	insinto /usr/nagios/contrib/eventhandlers/distributed-monitoring
+	doins contrib/eventhandlers/distributed-monitoring/*
+
+	insinto /usr/nagios/contrib/eventhandlers/redundancy-scenario1
+	doins contrib/eventhandlers/redundancy-scenario1/*
+}
+
+pkg_preinst() {
+	einfo "Sample config files installed by default will always"
+	einfo "include cgi.cfg"
+	einfo "The sample configs can be found in /usr/share/doc/${PF}/sample-configs/"
+	chown -R nagios:nagios ${D}/etc/nagios || die "Failed Chown of ${D}/etc/nagios"
+	keepdir /usr/nagios/share/ssi
+	chown -R nagios:nagios ${D}/usr/nagios || die "Failed Chown of ${D}/usr/nagios"
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
+	keepdir /var/nagios/rw
+	chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Remember to edit the config files in /etc/nagios"
+	einfo "Also, if you want nagios to start at boot time"
+	einfo "remember to execute:"
+	einfo "  rc-update add nagios default"
+	einfo
+
+	if [ -z "`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."
+
+		einfo "1. Execute the command:"
+		einfo " \"ebuild /var/db/pkg/net-analyzer/${PF}/${PF}.ebuild config\""
+
+		if [ -n "`use apache2`" ]; then
+			insinto /etc/apache2/conf/modules.d
+			doins ${FILESDIR}/99_nagios.conf
+
+			einfo " 2. Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+		else
+			insinto /etc/apache/conf/addon-modules
+			doins ${FILESDIR}/nagios.conf
+			echo "Include  conf/addon-modules/nagios.conf" >> ${ROOT}/etc/apache/conf/apache.conf
+
+			einfo " 2. 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 "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
+}
+
+pkg_prerm() {
+	/etc/init.d/nagios stop
+}