bump to icinga-1.8.0 and added instructions for updating idoutils db stuffs

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 272 insertions, 5 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index ed3ceb9bce95..994902aa5181 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/icinga
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.28 2012/10/16 16:05:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.29 2012/10/23 03:49:20 prometheanfire Exp $
+
+*icinga-1.8.0 (23 Oct 2012)
+
+  23 Oct 2012; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.8.0.ebuild:
+  bump to 1.8.0 and added instructions for updating idoutils db stuff
 
   16 Oct 2012; Jeroen Roovers <jer@gentoo.org> icinga-1.7.2.ebuild:
   Marked ~hppa too.
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 0ed83da74580..ca3bff873fee 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -10,13 +10,25 @@ AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f46
 AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f WHIRLPOOL 7816a44592582b65bb05b7c568af29885ab547b0164582d939e37b937ddc0cfa3dfc503b8673042b5ce60e0b19ba96dcfe08e13882c8bbae80d9750411945966
 AUX ido2db-init.d 936 SHA256 313d17b31c4aee42f4959f30e173390db2e73464ffb5996172db0197ca8123d2 SHA512 c5c6f3245f61bb5deb49438255215624c3286a73dfe6c7ef7f69fb60e497163c2d7766cc6fa14acbbc20505bc278a59afd946a95189d3b952ed817c98b93fd53 WHIRLPOOL f271ad1ad9a7b541420654d2c96f2ac61f0acb484963ac27892a0dbd1889789c721e23313f6f2b4787336531c63b3cd7715e53a19f5ad6f1ff29fba128d5a4bc
 DIST icinga-1.7.2.tar.gz 12946623 SHA256 86497cab06197f6df017e788e26b27bf1797b8c448fa90fa806c693bc30b6750 SHA512 220dc9dd3dd3ece28fc1a20979e89e7214f200848e1a81a1161eea903fa0d0ef0b44da21ece20b8b79216fe003736b320fbc25286f7d6e441522eefa43c6017c WHIRLPOOL a5a61485e9f5b8917b6182a50b671c74ce5576453760869263543c7cad38c370019866b5d01b534eea3c2783cf90233d6cfe5fe1e6ee86e5b9fa1ed4f104550e
+DIST icinga-1.8.0.tar.gz 7543267 SHA256 0ebc89f7c7beda727804f8a78ee07cf747281fa9e479f5d8f152f6f9b3af0fb8 SHA512 75561bda625c461f469c3d97f8edf6bade111a956241fc20b15909652432eb4a28027733a1ae18890d73d44319403771ede3ba972ac32ce08b984d5f2a2070c8 WHIRLPOOL c02f8836d916673775527d20c121670e0a6ed1f7d75a87aca6031b6be7c48969324e01b9994ea2ac7af175c8c6b01b6845b874eafdd7415f4d34b5b08095730f
 EBUILD icinga-1.7.2.ebuild 7406 SHA256 e5b29146cd3ab5245655f8811a5d4ed82742221098a5b94b5a0f14e6e997a200 SHA512 3e5bb591c76f22cf2350199f8e598ca44106c5185a2a0aa47c3ae94bb8b38d0467922d2308edd231e87ee50154941c4d75304badfa152bd3887e472d864fd605 WHIRLPOOL 49dd6a43e3ccab455df89ce436279a437733817af7642b0506cc1fd525dd205806fcd6396a9120e9156e6a0631af6950f4a96828fac70f7f216d1e2b53437447
-MISC ChangeLog 5103 SHA256 928850da5343b3cbd61411e7ba5f23bed6df0e36066c625f994dd8f6bc93e1aa SHA512 be4d7de122bddb07c0a89254ab85b2a1d202c2dde808875427732510f3a73fffc9765e1c72557fac3b5161da3955854a7ee744e48d7f9bb0e6f2f5883f651a92 WHIRLPOOL fbaade03038a3e3c0319b37fd6e40deac591244e8960e5b6b9e8c4315b2a9209fd43a1ec60af252643c5c48f03ae511a47b5ede97a5710335592d54c1e0121e9
+EBUILD icinga-1.8.0.ebuild 7523 SHA256 fb51a45b2ebc70f0b71693add0fca50464edeb72fae8ad631bf3156d1d0fe593 SHA512 8193d559df9f56a6ecd089ba555f46e19fbe8f6d2503e75121f5afd4282d9649883bb20e820512c392f64f5c109eb2a4d832c84b3b4962d744225968f071ca67 WHIRLPOOL a2632f75f7712db483d58c2f6ee64c1ff0364dbfd36929344a585f20218caaf1b1153b3a82a0585d824ef218b6eba4ac9ef28d946728e64a6cdca9a781928ffa
+MISC ChangeLog 5293 SHA256 a5352a278aab0a40fa575f469e700447afd37fc7a3cf511744d09e18a6b9149a SHA512 209d99803f028a7df6927532d016ea3e68543f83c407697ea64cf7de598f3a1ca3885d62258418a5e1e3d668ae31b5771267a117ed471ea6c5ca2f11917fe6fc WHIRLPOOL e24b08e0bdb8133dc034b71809c2bdf466e0fedac06e8255cdf4d1daacf4b123260cd3422f7eaa48c8ffaddaa493c1fb6096802757b468e557f82d446046a34c
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB9hbMACgkQVWmRsqeSphNONgCfSAkWNzKPbpD5UjYv7yQd6ehf
-YRkAmwX5wB/pKx5bfYvBSvfW66CJ5+Wr
-=x4xg
+iQIcBAEBCAAGBQJQhhPHAAoJECRx6z5ArFrDwTsQALn1azWHx8h1YG0xHWHAxs2a
+VOn1aYWaRf84GrW0EkagKm3pfGljox2pILlxQVTKXjxmpkVnBuWMesRcmFmdekZl
+zpXlvkiTVMHEM2O1cB0mYQf5X7Qtb64kejRgEbIFaM/4l1a0JGJGWR49VmGFEeXo
+t20dBf2oU80jJzwdnAxA6i9ZoqDqIrjT5tWChNSJSM0XciYGS/mv/9TCf31vm6dg
+D0xdyBV4tXRsGbCPFogBssPx3xXzdLIyhlE3aiAxn0VSazCoIAnMqZJsOXcgNVvC
+T2iIjyabPikN8+4EcoEJpQRKfS/xf22s+BShDdyyp/lg1r6McwOMi6/4V6XOSCIK
+6iR8X7JQKuvnuwOekWelx80PmxCln2AqBsnXKAKs8CbRfyGS/qFNos+xqvXUBiFe
+6PmxmnvV01jlk+nOqqypatRXjOJBmYQlm8gRHocQMXUCmYqyGVHsuATE/LXr0Fym
+vkCDXYdC+nPx34x9NyS6d/pd7E24mdt8bqMGN8L8eFEEe1oPB3+PjgX4Pvi/47bn
+SD0lX4f+Z65KBMTtmiy2Pv2FDN2F5oYciFtxhE22J+E8Iufv8Gsj1KZu8iInGAv/
+2UJ4jLJV/Orf77sOsLfTE8u5nuSAjrkb8JVXNyrfagJQ+lMTyNrlvvdUonf6Gq3Z
+wdAmeD1LO/FCTz4jITr4
+=WwVg
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.8.0.ebuild b/net-analyzer/icinga/icinga-1.8.0.ebuild
new file mode 100644
index 000000000000..3189e824cd42
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.8.0.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.8.0.ebuild,v 1.1 2012/10/23 03:49:20 prometheanfire Exp $
+
+EAPI=2
+
+inherit depend.apache eutils multilib toolchain-funcs user versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="+apache2 eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+	perl? ( dev-lang/perl )
+	virtual/mailx
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	plugins? ( net-analyzer/nagios-plugins )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+}
+
+src_configure() {
+	local myconf
+
+	myconf="$(use_enable perl embedded-perl)
+	$(use_with perl perlcache)
+	$(use_enable idoutils)
+	$(use_enable ssl)
+	--disable-statuswrl
+	--with-cgiurl=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga
+	--libdir=/usr/$(get_libdir)
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--with-lockfile=/var/run/icinga/icinga.lock
+	--with-temp-dir=/tmp/icinga
+	--with-temp-file=/tmp/icinga/icinga.tmp"
+
+	if use idoutils ; then
+		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
+		--with-ido-sockfile=/var/lib/icinga/ido.sock
+		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+	fi
+
+	if use eventhandler ; then
+		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+	fi
+
+	if use plugins ; then
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf+=" --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+			myconf+=" --with-command-group=apache"
+		elif use lighttpd ; then
+			myconf+=" --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+
+	emake icinga || die "make failed"
+
+	if use web ; then
+		emake DESTDIR="${D}" cgis || die
+	fi
+
+	if use idoutils ; then
+		emake DESTDIR="${D}" idoutils || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog README UPGRADING || die
+
+	if ! use web ; then
+		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
+	fi
+
+	emake DESTDIR="${D}" install{,-config,-commandmode} || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+
+	if use eventhandler ; then
+		emake DESTDIR="${D}" install-eventhandlers || die
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d icinga || die
+	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
+	if use idoutils ; then
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/* || die
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
+		elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
+		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
+		fowners -R root:root /usr/$(get_libdir)/icinga || die
+		cd "${D}" || die
+		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
+		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
+	fi
+
+	if use eventhandler ; then
+		dodir /etc/icinga/eventhandlers || die
+		fowners icinga:icinga /etc/icinga/eventhandlers || die
+	fi
+
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	keepdir /etc/icinga
+	keepdir /var/lib/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	if use apache2 ; then
+		webserver=apache
+	elif use lighttpd ; then
+		webserver=lighttpd
+	else
+		webserver=icinga
+	fi
+
+	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
+	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
+
+	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
+	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
+}
+
+pkg_postinst() {
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "Note that the user your webserver is running as needs"
+		elog "read-access to /etc/icinga."
+		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 icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add a line like"
+				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
+				elog
+				elog "Icinga web service needs user authentication. If you"
+				elog "use the base configuration, you need a password file"
+				elog "with a password for user \"icingaadmin\""
+				elog "You can create this file by executing:"
+				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+	else
+		ewarn "Please note that you have installed Icinga without web interface."
+		ewarn "Please don't file any bugs about having no web interface when you do this."
+		ewarn "Thank you!"
+	fi
+	elog
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+	elog "If your kernel has /proc protection, icinga"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding icinga into"
+	elog "the group wheel, but this is not recomended."
+	elog
+	if [ -d "${ROOT}"/var/icinga ] ; then
+		ewarn
+		ewarn "/var/icinga was moved to /var/lib/icinga"
+		ewarn "please move the files if this was an upgrade"
+		if use idoutils ; then
+			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
+			ewarn "it accesses"
+			ewarn "update your db with the scripts under the directory"
+			ewarn "/usr/share/icinga/contrib/db/"
+		fi
+		ewarn
+		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
+		ewarn "remove /var/icinga afterwards to make this warning disappear"
+	fi
+}