adding icinga-1.10.1 to tree

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 281 insertions, 15 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 4ba2161aa7e9..6709bcbb8098 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/icinga
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.41 2013/11/10 23:20:10 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.42 2013/11/18 21:29:39 prometheanfire Exp $
+
+*icinga-1.10.1 (18 Nov 2013)
+
+  18 Nov 2013; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.10.1.ebuild:
+  adding icinga-1.10.1 to tree
 
 *icinga-1.10.0 (10 Nov 2013)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index d1cf688bc022..5a3489996ec9 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -10,25 +10,27 @@ AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f46
 AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f WHIRLPOOL 7816a44592582b65bb05b7c568af29885ab547b0164582d939e37b937ddc0cfa3dfc503b8673042b5ce60e0b19ba96dcfe08e13882c8bbae80d9750411945966
 AUX ido2db-init.d 936 SHA256 4e978d54b9b5efde1e4474d865d6283eeafa2a57a2ad19ec85a710e79698c456 SHA512 913e923f297281e6a429ac446a20f6b8e8fadbc5dc5b1a01f1b5d73694ebd43e0931e655194593c8335bfc6505bb47b7321b8d6530c869f1bd8b262ad030faaa WHIRLPOOL 0da5e0702535cb9e07f98cabfad9f6ce0999d5d7a60e66494ca3d4167537343d3d750d48145856affc43d404318c88b98078a8c08b369c6829f5e68555cb7dc5
 DIST icinga-1.10.0.tar.gz 15294322 SHA256 204b6798bfcd4035a48fd8880feb705046c976c81cb35c24a627e7ebea6c04a3 SHA512 e444b0624dc274971d11ee7f2bdbf5517602db570b0fea12cc609ad4ea8db64af925ea5e0a54e5f8f30c20240c1b5352d57ce3de76af7d78c2751c96ae932b24 WHIRLPOOL 3ab53eff23a87196a4933409c8ce43b8f056ce83f4533b9ada3c0d04b356097eed10879e51c88398722aed28da18a5fd8ae754f53fd6f0f1514c93fbf187c576
+DIST icinga-1.10.1.tar.gz 15295501 SHA256 32a209ffe3f267703c13577e5bf556532d5ee276b636be985f08abe571fe5e2b SHA512 f5ef221eee14fe499b101540f6d00c68b43e51b5d42552961631242be271bb50e8561757b12e0bf61296fff390cc9bf8be8ca61e0a87c4d35abc2678d9b79f58 WHIRLPOOL 7134db028a9651a926ba4ec381f6de95a1902becbb929d16b289d334cc61774bb81775f8bbf757f48dc2a957e4e0047d97afdc75715eb97d547592ab50b0adcc
 DIST icinga-1.9.3.tar.gz 17082275 SHA256 2dfef14225e8b671145d4816999bf57842d379b2e5e18d2af69cf0c5b93376db SHA512 5361b1a6ee40484ee85f32ba4a2dbd811f4776dc646c70adaf2597d85b0c9011049f8c7d057ff67de645d4edd0a3377d32c62c0c3d95eab1db9d9e0e3c636a91 WHIRLPOOL 98e5be7ce9cf8e82f202fe9f5ef163ef33afc1dcac76aae7aa022b0597fae9a71f470a4bb3022d7a45f358a72b2deea29e86cf11a7a77a65ce21947df2870f73
 EBUILD icinga-1.10.0.ebuild 7732 SHA256 60be1d38073e9e841146b1bf0b7aada483de97a107292d83197c59b87c78659d SHA512 97de31aee77d86199a3332c1d77697820b93bfe8012aa7b43ded08e39a869e4cbdfa4be8d4db3a6e997c4b73b0f8a32adbc1697cd3de665744899ead8cab3655 WHIRLPOOL 34cb674d286cc6ae925ca6ac5367c16c1fc1b8599750d88023f0f629ca4edae58184c270edb74d4180806a6daa1b2a0336e6d692275915ea4a793e83309487de
+EBUILD icinga-1.10.1.ebuild 7732 SHA256 3b32f8330096af56219949680513a1fda042b14ec23b5cad2add571195be776d SHA512 155dca9cff96289831272c9c5040f8a13b01f513ce2dcf55c18d2f5fe8d31068f81ad548c692b4c1caf9afd164bf6673ae39d934c8a397b6362f3277922caed6 WHIRLPOOL a69588cd626a43f4e9fbef3eb853923d581c0157e475195f6206ae63d43b40807d9227a3c8ec678ba85a006d183583262c52c9a7faa8afc491f263edf4cad339
 EBUILD icinga-1.9.3.ebuild 7731 SHA256 f05779cfd095b6de0765d9f4e5c0201779b4ba7e22bd9a30775f6b2b02fcd675 SHA512 73bc218c855c94cc64948b443c20118a1c41c50ad397d2a0b51d91474897fd9ed5050b6feb7fa433f8559c67735194a5320bc187a4fedbf7eaf3a1f34ba59e67 WHIRLPOOL c451a9944338fd9229d8fa8b82ed22d49177253aaf3168f3492cc820ca4513415b3db3122abfe561cb2a20e9ce42f4d049855a5d29ec8140de34a2912264bfcd
-MISC ChangeLog 7358 SHA256 62351cdd2e343a04f5d7ab2a1bc4c4f5ae30225284f7f0db814b673dcc9f6e15 SHA512 0d298e68ea758108cfd5ffcbd667a9d62f6b9d10103e47d2596fc1c254b7a3a6e0fc03d6a1cbebd7da39b3a9a5346502e3d49965973494e2f129a9a0ee0e85af WHIRLPOOL 868912682db1d9fdaeb17b4c0922d9bb6b309cfa9185e422ec6abe5f05d9685765a7d075ede748935988b2dda5316c8fccb1dc2b72e4c1340e3c3aa0f49062e4
+MISC ChangeLog 7500 SHA256 fd3c9c502de8320fd5b0ba1764e8797a6dd87290c2431da9e4d826e4b5ab4316 SHA512 fcd515fb8cd0e33fc14326e522d726e474ae7b62185353580d33662d16b67833938a76e203f0051acb8c33e00135db68f91b18209c98dd3f087d380d622715d5 WHIRLPOOL 4bf2446ab55e705e115b29615b26b7d64ea0f2df399475016af4ea1bb875ef73b6e6c620fc76952f5325bea014db68aa8a42c5bf981264e89046cc4f2e01c85f
 MISC metadata.xml 705 SHA256 6433fd0f1d22d5abb31534b5e8b0804dcfec87e5f385b1a8726a9dba818233e0 SHA512 19385ac0dceb5319793c492b4687a0ce4b9fc6e00dc0aa76efa54280d8901f9738fdafd8c307a394aab89ca6c1aac03092b99c512dd1dc47241fe7db08f074d1 WHIRLPOOL 9e0341411d01328e4243d4db6342e0df648a56b648520cb68987f04432a7a59556fa5dfa1770b461668bf3692d5ffff0377b551c5680be607d9d8d2cae010efc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSgBU4AAoJECRx6z5ArFrDsVgQAIMgr71gtemfCNKN91Tdwp+t
-PxI7kwoRuCVcO6HyoM4FSeGtQa/4EmgIy9TTQuDIDpXdooTqT4tpMWAD39WOBRIH
-7uUlHTfHIvNkaPaFaBzCj8Nv+NFD88lly3PJ9MlVv0evSeucJmqBFUjYjP6vFjQb
-1wthuIrWOW+cBYgElIIs9zA8v/lAfs5rP08YiHBHa3RBSzyNxC22ZLupx6fpo5Ul
-A5tZzyZCVJamkBmqGPBH+SKV0gAsHdeB4miFt315Z+VaNYi10a82qWLMe1fnLBk1
-ldfkvXtRkSZO714A25qFXAJRKNJGmzOjDd/eaJVhduewEsXFoHft8hEBiS/GZFaD
-8IPbimdyfXJ91h0HSm4Yi1YkymgYg6z8JRCnW5lxSvWdjDzB9BcwIjAwEFhv41sO
-P0sO3dHIfZHSEP4xRhCJfAuFcF/brz5kCx21eDUIhRwOYNTi8Rlv0506c+n2VMtF
-aDDriMHqKSVFSS4U6J+DClxHapzc8pKzfkBm9H1Y9gEWxr6IFASOrHgq7oEjjCxH
-0InYXWWMkiKOUm1zeTjeWdtU28kRqKJznM1S2w2SRYi45ONwTuKwb8qMGg5kL8i2
-uwJ30AQ+2YQxI0GnvWOpdEBjUUOCh034wXR8JquW3SmkjTC5jxBvdtwgOBaVQd9X
-kH7Rbym0jOTiyL74jOBs
-=qmsL
+iQIcBAEBCAAGBQJSiodcAAoJECRx6z5ArFrDnpcQANClrFIdR+AAF2hndsjiAX+8
+Iwk7AhDPBFK/ADs5C76Qwc+Nc+F+dXaNK2zUMWfPseA94+e6uf1V/P+vThh+UxOs
+/IpHjj/FX0kf5Pi2jyIt03uwQ94dKA0j1OLt54r6ngg0rL+CrTa2egE6ofUudWEF
+NJ4hZNErs8yGqZ79jqP+bDkap/NwCDUhfGjrYwSxkgtxdVQvEjGZyCqFEYlMreQk
+ciAoLTpyh5F5u/kskvVjmvLQHw0Pb+ybkXMaWfTl3a0XLDbakfuUuofD2rYHDT86
+ODGo/vMvYmclKewiTNJM8umqEmramJ8Y3dI3jld3O40rY4oLIzuGYCHj+oY38MuN
+UYfpW8UhrXyJbMT0glUf141PA9qHeSNi/7P/ng1RteEF4pNRp8jOZWj1Xy0UblLY
+3+w4bzIG4K0Ik9yW8oABTPXqDY1YoAh+EHSNJGSVORKLHQ6Ll/DImv7xO+plBKR/
+wFhVO/Lbsmk/9z2BpWEuSVA7YRJ/SgV8vxIZ2nHXHd7tmlJx1icCxrZ4cjXsnh1w
+9o36VYOh+9DmKSm1NuC4DLrCkIvt4RS5c8ztuIc8dpWguumpBkThL5dSIhmtwReI
+NfLgfjp5rmnFVs1HWc9JuAn/HATolArVRT6wJfG8nhA3k8mNH6QJx/oTPwPBGrkz
+z+eGcd5dyHgdfjhSagyn
+=voBc
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.10.1.ebuild b/net-analyzer/icinga/icinga-1.10.1.ebuild
new file mode 100644
index 000000000000..96b717de1f38
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.10.1.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.10.1.ebuild,v 1.1 2013/11/18 21:29:39 prometheanfire Exp $
+
+EAPI=5
+
+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 contrib 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-statusurl
+	--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 contrib ; then
+		emake DESTDIR="${D}" -C contrib || 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 contrib ; then
+		emake DESTDIR="${D}" -C contrib install || 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
+
+	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"
+				elog
+				elog "you may want to also add apache to the icinga group"
+				elog "to allow it access to the AuthUserFile"
+				elog
+			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
+}