adding icinga-1.8.2 as it was released :D

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

3 files changed, 279 insertions, 2 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index e99c5f2fa4bc..c13756264e57 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.31 2012/11/03 22:15:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.32 2012/12/06 04:35:15 prometheanfire Exp $
+
+*icinga-1.8.2 (06 Dec 2012)
+
+  06 Dec 2012; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.8.2.ebuild:
+  adding icinga-1.8.2 as it was released
 
   03 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> files/icinga-init.d,
   files/ido2db-init.d:
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 2570119d891d..f90b17bb8b0d 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fix-prestripped-binaries-1.7.0.patch 857 SHA256 dba024fff1934a44e7f3e20e93c121aa251ef1286c8971247e45509c31aaf3ad SHA512 4a01ff3cf8569cfeadad283d1085b7af4f5703f6ad066aa5eb61f06f79ca54a4fd29375dd9a120a1a649c7e76019298e9e99ee1360717db227ff63c0a9cc021c WHIRLPOOL 5029ccefc5e66ca363dbed33ce8df99c6993a0f82942143e9c8ada45481f6bcaecfa62380bb69802fb0d0b3910e4501ec2378423d8b72b5cd93822e60a993e22
 AUX fix-prestripped-binaries.patch 775 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957 SHA512 a5db714d24e1d2fabc9d30d6156f84ba87db05fa6c1ba76543f646d31a16542abf19ffed89766b51a15c24f8fe4c74ce5e24e3ee76826ef324e11d98e3528cb6 WHIRLPOOL 82609265990b25673c71956ef6dd7f50b124918c45aa54716ff9d50fa9e429f94b82af4ef2df27781450b416ed2dca90a5818c5e216c74804efc01ac0af2bd9f
 AUX icinga-apache.conf 591 SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df SHA512 f08d6d17fcbd695af43a6e2ca230c001ad5ab2ce4f50c61ed8a41addb1eebc7a6fbbb0a53d72ba5686d5a8d0f21d9a2e9cff98e8ce53e8bd04d9a658300d327a WHIRLPOOL 5b93d216745a5aee353aa03e5054926bf6e0ef8929ce17b174672787254a4b3c9707a3d718ca75619d03436818543434c621f8e97f9914bef616dba2ddc093d1
@@ -9,8 +12,27 @@ AUX ido2db-init.d 936 SHA256 4e978d54b9b5efde1e4474d865d6283eeafa2a57a2ad19ec85a
 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
 DIST icinga-1.8.1.tar.gz 7543668 SHA256 3d02d80bdefc2518ab8517be6930a518b77747e0243fa594731fb1f95dbab916 SHA512 2a0d0c68c6f039e38281ac59ef4145997728bfbd5c869f89cb329a9fc522db0315bc31c629ce2c04b58a7a980675ade5dd06d461ee4c904f0002b101377c9af0 WHIRLPOOL fc3282200a076ae6da3ae7f615c8a5b35abd38e65c86fb9763c974d128294457830f78fc157b792c7ec46d54250fae9a2432556ea489e9d3ab6a35879a32eac8
+DIST icinga-1.8.2.tar.gz 7458441 SHA256 39b69a8676895cf458fb71a2ebe75806ea6014bff6ac09871f330f293a6de0c9 SHA512 daa95d90a2e8f5a100d16d82700c54ff2f43ed6ba7fb327ebd079e93e58bdd821a7c8d77f07c74b8a02f5d73b55b208e60585fabed6abf9a01af0c1b3967c8ee WHIRLPOOL 6f8f0306fa8311d04b7cfa38ce5fa08ac1e0d616c8eb6784018b56d6ca1820bbbd7248b6190847628f0ae1f391ecc71e83a5acf4710f7c5ba26f565ad65f6e29
 EBUILD icinga-1.7.2.ebuild 7406 SHA256 e5b29146cd3ab5245655f8811a5d4ed82742221098a5b94b5a0f14e6e997a200 SHA512 3e5bb591c76f22cf2350199f8e598ca44106c5185a2a0aa47c3ae94bb8b38d0467922d2308edd231e87ee50154941c4d75304badfa152bd3887e472d864fd605 WHIRLPOOL 49dd6a43e3ccab455df89ce436279a437733817af7642b0506cc1fd525dd205806fcd6396a9120e9156e6a0631af6950f4a96828fac70f7f216d1e2b53437447
 EBUILD icinga-1.8.0.ebuild 7523 SHA256 fb51a45b2ebc70f0b71693add0fca50464edeb72fae8ad631bf3156d1d0fe593 SHA512 8193d559df9f56a6ecd089ba555f46e19fbe8f6d2503e75121f5afd4282d9649883bb20e820512c392f64f5c109eb2a4d832c84b3b4962d744225968f071ca67 WHIRLPOOL a2632f75f7712db483d58c2f6ee64c1ff0364dbfd36929344a585f20218caaf1b1153b3a82a0585d824ef218b6eba4ac9ef28d946728e64a6cdca9a781928ffa
 EBUILD icinga-1.8.1.ebuild 7523 SHA256 0b04bf59354176a5c9eb469641f49adef5a8b822565c36de1ef5e1d36d21b618 SHA512 e54291c61b9de54902932ac9c210d057cc5b7be66e34011e445d8ea41007b70a4c4f62defd21d41af93398afa9224749aa87c10ce5d6dea24d2369586a91cf19 WHIRLPOOL 120bfa93fb08c63ea12e4e2d7e5b388b239b653b0bb313a6799cb72185d6fd91c2780fc71dd889a83a59ef8038a84c16d92c061d6ef9279dd9d3f196a34379dd
-MISC ChangeLog 5690 SHA256 0ebc4f08de56a3552e1048836603b1330cdd7f1d18921d527c7e722e0e802bf6 SHA512 9807b2d67f10ac0204763e2030dba683a649fc1bfb36f12ca9b8bd23b07e290ac1f17907416639781270430f14b26785b5466c84c1b7d5a4294d0b2887badd67 WHIRLPOOL dd519667305912a27e59336691100aad58568712c5f0de75111275b265e7e116952027aa0ea038235d086ac13dbe854540a4c34a720858633c87410eb7349fa2
+EBUILD icinga-1.8.2.ebuild 7523 SHA256 62df6cf3591454ff9bb96bbd303995ada8cb06d953af9503fc9de0baa2afbe06 SHA512 5a395eca604487e40b3571841d6efaa339bd7829be668a048a8c75133327d2bf8e48591c38026fd980ed92be7c7fb689ce24521dfc6effc44ab36361a7ece862 WHIRLPOOL a4107ebb01ee503bb4e951686a6b7126007b9c4de2ae008352f47e8e76e41d60099633a6a8afac7830a64f31d47ab99679f5565f1ae73b6e85db74b3f8e2fbfc
+MISC ChangeLog 5847 SHA256 c805d31df105f3acef51c16d61bcee18cb630df3aac091ab37b519cd5878a30a SHA512 287a5e95b0a541d1c22d5e62eabe08c11d1d1782a35f27212e045a90c2726c1f89c47875a3daa0172310ab59f1dc3c1e840c353ac2e4a7b939bb28bbc86581ee WHIRLPOOL 2b1fb7c522366a4fc83ad64b02c4eddbb45d3a4d909cb95d1c4eddfd3d831483a5890a65a67f075f35b9a4818f4906af3ec8b51cde01a1bd5ba8372d6d2d1e66
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQwCCJAAoJECRx6z5ArFrD2qQQAJn9JgryzSYvTkwXu4lvZhLi
+rorABTJA2XxLpENLREA05EbuCeCn+Mv1WiIdsA3iPv+MLcBPoFExTxFqUIUql9QL
+xgf7DEUVgJmv4xcTO+a3T1zPkpAcTR/Xi90GMSB+SGmqp+tYLjhq+xLzopkxQqLV
+Z5BSz9cvpK6DWCY5dFDef4JhsXC2hnalQMbcYMM4Kl0lDM48eBNphsrIA/uhH0Ts
+YyVFoCmLxCGkv5tzyWKGP0v1Kse+kYpx5JUWPuD2nCKWVaK5CHInpnfZL4pFIFr3
+R7WY7jtP9R4nGud4TOyLz3tA8AuCDKsSmsAe1wGVx2YE0cifFVZLJC60RFHnjsg3
+f7SR1NwVgbpd6PLezESKCAjbyZaDhECWEZyC5hePAmgaXHkX9Nq8jzvqupVSh2CW
+dBfu7wzRbd+9zPcDg6bloISqAfF/MRf4buSgUvxhXCUpmtdtpQkYt/zKhnDnPlUe
+K45J4uifsMLV4pUNjuANhfGZ/E88R6HLq1xeGdIfKNhAJk4dNDX4DRBjt2pcIohs
+tEsnf79vLMS1t6w5PYU5BkzuDDF4QtZgmN1pcwdMJp6ZffhQit1HDLUkCR1m6Q9e
+BgTVYeNBzYd2qMqNnLa1D4OJHH6SUn9IhIQwfEYFyOjYzldq1vJqFg+d9kxXdpTA
+v1U9/9iZrzm6dt+ViJ2y
+=za56
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.8.2.ebuild b/net-analyzer/icinga/icinga-1.8.2.ebuild
new file mode 100644
index 000000000000..2df556d57eb0
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.8.2.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.2.ebuild,v 1.1 2012/12/06 04:35:15 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
+}