Version bump

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 230 insertions, 2 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 477e690eaff2..0c82508c616d 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.136 2009/01/22 17:00:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.137 2009/01/25 17:02:50 dertobi123 Exp $
+
+*nagios-core-3.1.0 (25 Jan 2009)
+
+  25 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  +nagios-core-3.1.0.ebuild:
+  Version bump
 
 *nagios-core-3.0.6-r1 (22 Jan 2009)
 
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 4dbccdf37eb4..d89da79e9bec 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -9,7 +9,9 @@ AUX nagios3 1441 RMD160 b0b9361c9e4515904ebf1b41ac0be557f59e7a96 SHA1 5351b5d19c
 DIST nagios-2.0b.cfg-sample.gz 8990 RMD160 5c1f02e13351f46214d032936dd1ecef3c2449c2 SHA1 7a27bcf4be959424b688f52e31887862b863ec23 SHA256 d1397cef03c96eca2bcce85675d2db2b94ddafd439e63c6463f7f11536564c12
 DIST nagios-2.12.tar.gz 1742179 RMD160 b44e49166441735473450ba555137c695cc50920 SHA1 d3e8e3419f751c66a29775bb5280cec662d26a29 SHA256 d1bd812793bff2b3bac15ef72ceff788bd6c2ead4952cb1f19c6232fd3c497cd
 DIST nagios-3.0.6.tar.gz 2735504 RMD160 1c2b026b4dc5095f2419d239042b75200db1b95f SHA1 d6bd20cdc22d2b931f9ad7f9cb33ff71d2cb7d71 SHA256 bedeb2c1ffbf7525ec19ac84a66bad60a19d2b0544cbf050a53bfc363c09bb22
+DIST nagios-3.1.0.tar.gz 2724545 RMD160 adae68a67f74e87fb1e6d0d49743704d55eee648 SHA1 0bf1cc2fbca92dfa82b11592d3d5adc6ac3983db SHA256 30b81eb7943805b129d1db18bb67386feb998f9e6464cb2efbea0756499b2651
 EBUILD nagios-core-2.12.ebuild 6719 RMD160 d8dbabbce75d22a7264cc1a61dee505865b5131a SHA1 37c2aff853a2fe3289ed6d1e21729932da3234ed SHA256 aa163f37b1eeaa0f0ea5da691c172c4be4a126aa2a3390837ed5a9fd6b077445
 EBUILD nagios-core-3.0.6-r1.ebuild 6315 RMD160 f617bf1c8df72f399d3fe7a3fc850288eb4d2180 SHA1 140754a65f981ea343ddef39cc8ad0d8204e3bc8 SHA256 1a9f06d38be3dc4efecd674697bd8d8e090abfc9be7147d80926bb285dff48cf
-MISC ChangeLog 23640 RMD160 51c990d4181c042100a9a029ebe6a9b8b88ef391 SHA1 5305963209cea9fcc1789867f9b4189b00eea2e1 SHA256 bf0808bec7459db692cc53326ca42165684b597f5224287c37ebc47b32d52d65
+EBUILD nagios-core-3.1.0.ebuild 6312 RMD160 a1b07bee739d61e2771b99b4d05ac02df8a95c09 SHA1 6ef00561c1cba4a6bf75ee13b1f37df7d03bb1f5 SHA256 7d59d9c7bc83b188259842114d8978a4449e896444671e8a3915e09cd3d0bf7d
+MISC ChangeLog 23775 RMD160 a0678b23b0a73de2b7760036014feefcd178817e SHA1 223ab5180b8b088c5b0c9ac644ac82b520c66ad1 SHA256 e1c2a8a9c0e0d07571dae51b25d1106c1a0b563bb44434ca5c030e0b469561a8
 MISC metadata.xml 1103 RMD160 126745b1627d4be7d8a3868e3670cb332df3d838 SHA1 3f5215646412a2aefde093d14561dd540d7abf01 SHA256 f2b241a3f4277286838954546eca184d08973197ce00e2f6a6ae2698f1eade81
diff --git a/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild b/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild
new file mode 100644
index 000000000000..5be0c086f6f3
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.1.0.ebuild,v 1.1 2009/01/25 17:02:50 dertobi123 Exp $
+
+EAPI="1"
+
+inherit eutils depend.apache toolchain-funcs
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug lighttpd perl +web vim-syntax"
+DEPEND="virtual/mailx
+	web? (
+		>=media-libs/jpeg-6b-r3
+		>=media-libs/libpng-1.2.5-r4
+		>=media-libs/gd-1.8.3-r5
+		lighttpd? ( www-servers/lighttpd )
+	)
+	perl? ( >=dev-lang/perl-5.6.1-r7 )"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+want_apache2
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# Check if gd has been compiled with jpeg and png support
+	if use web; 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}"
+
+	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"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-grp=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+		--datadir=/usr/share/nagios/htdocs \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		|| die "./configure failed"
+
+	emake CC=$(tc-getCC) nagios || die "make failed"
+
+	if use web ; then
+		# Only compile the CGI's if "web" useflag is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog INSTALLING LEGAL README UPGRADING
+
+	if ! use web ; then
+		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
+			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \
+			Makefile
+	fi
+
+	sed -i -e 's/^contactgroups$//g' Makefile
+
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install-config
+	emake DESTDIR="${D}" install-commandmode
+
+	newinitd "${FILESDIR}"/nagios3 nagios
+	newconfd "${FILESDIR}"/conf.d nagios
+
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			doins "${FILESDIR}"/99_nagios3.conf
+	    elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}/lighttpd_nagios3-r1.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+
+	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/$(get_libdir)/nagios
+	find "${D}"/usr/$(get_libdir)/nagios -type d -print0 | xargs -0 chmod 755
+	find "${D}"/usr/$(get_libdir)/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755
+
+	keepdir /etc/nagios
+	keepdir /var/nagios
+	keepdir /var/nagios/archives
+	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"
+		elif 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"
+}
+
+pkg_postinst() {
+	elog "If you want nagios to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add nagios default"
+	elog
+
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "To have ministatus.cgi requires copying of ministatus.c"
+		elog "to cgi directory for compiling."
+
+		elog "Note that the user your webserver is running at needs"
+		elog "read-access to /etc/nagios."
+		elog
+
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G nagios apache"
+				elog "or"
+				elog "	chown nagios:apache /etc/nagios"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+			elif use lighttpd ; then
+				elog "  usermod -G nagios lighttpd "
+				elog "or"
+				elog "  chown nagios:lighttpd /etc/nagios"
+			fi
+			elog
+			elog "That will make nagios's web front end visable via"
+			elog "http://localhost/nagios/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the nagios group!"
+		fi
+
+	else
+		elog "Please note that you have installed Nagios without web interface."
+		elog "Please don't file any bugs about having no web interface when you do this."
+		elog "Thank you!"
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+}
+
+pkg_postinst() {
+	einfo "Fixing permissions"
+	chown nagios:nagios "${ROOT}"var/nagios
+}