bumping icinga for a new release

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

3 files changed, 286 insertions, 15 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 1d39fd3b649b..3cd1510a4f31 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/icinga
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.48 2014/09/08 05:41:02 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.49 2014/12/09 02:58:34 prometheanfire Exp $
+
+*icinga-1.12.0 (09 Dec 2014)
+
+  09 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.12.0.ebuild:
+  bumping icinga for a new release
 
 *icinga-1.11.7 (08 Sep 2014)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 13b23dbc0d17..c1cc0d4c9761 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -12,28 +12,30 @@ DIST icinga-1.10.4.tar.gz 15391948 SHA256 fecaeca3f4f059fe506681e99a5e15fd4bef16
 DIST icinga-1.11.1.tar.gz 18699628 SHA256 7dca7d6193fe9de1d5d044e3eefd9dfca5a24485a60d332edac68c5cc4838c95 SHA512 878d75ef669c9110c42275ab36781fc440d42e98821a0da400d2ed174b61e9571fbf35bd847afdfcf67039b4814b34f13b892ddca738d207fd2abf26715c803d WHIRLPOOL 26561d572c9bb38df2ab0656fac69168b327e4e8c00d1e756aae4c8dbae10b74fd10313f74fb80f08bc9de713a402801d649abcbaa8adc6d3386f48f54cdf9dd
 DIST icinga-1.11.4.tar.gz 18657247 SHA256 34e923d8daac0235513ece5f54a2065b9166cce3ef3c9f8794e635c93ae0d541 SHA512 0cc2cd8561affbbb400f59d02023bc35de3f6f39c120fcb9d293d7ce343c88061b7a7ef557c22ed79881e499c967223616cf2a4a0746b480ee8a36b3e9a23e27 WHIRLPOOL 55277fee87e552ad94c069c252a68d3fe1fedef435e5fd0e00768a1e62887de6980913f3b4c096c62a6bf2cf1abca5dd2c68934e9f3603f965555349572edf9e
 DIST icinga-1.11.7.tar.gz 18657763 SHA256 b6526dd44d42c70e50ebfb58608f1fec8ba6d805fda4fde57f1078c248e25045 SHA512 3c06771f83257afc9096078ba5304ad9a3fbd8d75f22ca62113c45b06f1a015ef3758936dcb3376b3a18584a360ca4a629e5b071570b7215f7b199e414946af1 WHIRLPOOL 4f66389b467f77e5544239c9c1553e185e37f115f057df83330118e2e8883efa5d73b05bc1c9b3801ff522947e098f3169185b71a172bf9ac26173a033ce30d6
+DIST icinga-1.12.0.tar.gz 18670338 SHA256 6bcee5605d66a00444454514baeffd8084df6097cf8ebead2b8114387d5def14 SHA512 214eece3d5545f9157c25d83f1ed65eab82ae4508e713efa2aec83d69e0621ff53618a33c266e88f67b13e4734bd62d7e55cb2cbc547946d13e691f9b24c726b WHIRLPOOL 94fd7435f113e839e1d6a71a466060ab3e2f161a64643e011acb01f1a34bfe00a7313ea47434db6f74405b1b3fe7581c39bb39fd04887e4985fcd16f0cc0c827
 DIST icinga-1.9.6.tar.gz 17082621 SHA256 a70a54d49813f8ea1b58688d5d2b3ecd00a0470a900c84943c044669f582274c SHA512 f2489d6c898e754ca162304651e71e071e5f1d0ce396ecd87ba9e6fd0a14343cca24fd860e661250b2723a696045d45602ebf2fc9aa16dbaf126415ba109b3ff WHIRLPOOL 599b3a257e1ef9b9d713cfbde0233ab171f46ee5f2fffaa2e5a3ab95daaad2c9ee88e61def2420d60e9262fb57dc4a18ea168c0d9b1da52dc85792d2d1389cbf
 EBUILD icinga-1.10.4.ebuild 7795 SHA256 5314066824f8d66f22b39964c9614f8d95ddb77e02ffec2beaf33e7ebeb442db SHA512 9dc8cac3ceea97a9886c13d900fb7d99e0e66c537e9c15def5d87fdbfb32647d01267f2e0c7766e42d863770595156ea552864fa7b775093dc0e925c702d2214 WHIRLPOOL 40d56987ab0696fa0dfc5ccbf81caca1f9a0746bad20cb86db457884829c00310eff110f27822530591f426fc4aa0e3f9af487593cdcadd8f6565a59048f87ba
 EBUILD icinga-1.11.1.ebuild 7795 SHA256 8a688553a4c4fd402acad6fb56f0228cac166255b72e9e4692836121e5ac78cb SHA512 597ea77d3a3ba4c586dd7aedc3a6b94bfed647df64fc62964e3e534fe2bcd37725ded2ffe84269f25fb1d7b1f91ea841bb08f8f6d0c50fd3b6288dfb9872fa31 WHIRLPOOL 88f53d49f65726fdb52c8a099a35f3207c64b34d7d9b8b488602d4218a88e4173f4980b97313380474768c1dac8d9babdeb093db47650cc09d3543ac763ce00d
 EBUILD icinga-1.11.4.ebuild 7795 SHA256 2f6102de4842518fded761f5bc2a6c8fbdc687bc302061f22f176ba50ff196f3 SHA512 d9f7570b81cef83ddd9729da37faf91871aed9b8fb2412b7de427a0db5bac7f33840ca11481bd8b8b35329ac4a51274e3295c49e3d6ddb07389e9bc199dfc380 WHIRLPOOL 4df3cab175b01184ffb53c84f45fa8ec57178eb1bab936e58061d8120880168ad78037140ef9b664fa55919c6b7a0ecd8359a8b2763d16d46df1b3e831edd891
 EBUILD icinga-1.11.7.ebuild 7875 SHA256 bb38dd5891996f7e91c9aa964307d8d65f8ab2fbd842e638cf385e32af78980b SHA512 b888e8b9f06a3c408b8671b7279dfc587376cd51992c47c6259aa85ccf6e26fd990035b2e9ef403f24bd2d01613d964a8c70feb983281e6bdc22dc327b1a051a WHIRLPOOL 9199a4acb04f13d4d549923d84d7ca73b46995f7cd7f23a2b43392f2348ae7d742c2e5559d2c28ee28b54f61e96031308336e039225f123dac3c35f900dc467d
+EBUILD icinga-1.12.0.ebuild 7875 SHA256 66efd9365115b98a0142535cb165f2e1ad9089f1bf60a258e3b492d973b93197 SHA512 ad59cd543a0cc8e47d02d7408508ebe6b27d607a87266118ad539aace9c910ca2ba8a5a6c4a19f3f0db814a224b43176aa524680da351129352819281d236554 WHIRLPOOL ed85f87272bbcdd6e0daf539b431e4674a7c418561df224443bd1d4270d71367d9a358d0e1d07077e2d1b76ea521aa76ea1617a58ff5cacccdfa53dd70b4bbd9
 EBUILD icinga-1.9.6.ebuild 7794 SHA256 080a08eca2979978b55bf9c66c0cefb9f91bf10b40b5cf72f8d33dbf324c930a SHA512 0154d454a08eda869c27eaa576319f2ab09a5ea3065cb0885b36e528f4242c655439bbff15ef623de3cbb02cbbefa3d7b0a9340649709714c975965fb3c37638 WHIRLPOOL 8dc9c7328a58dbb106089c6fcbec9590fe003c3b74b5cdc0ee7a4dcb189ac2ff870e78acb7fe6c8c99ef276cb1dd4be28595584244a06cc602fc075db6606591
-MISC ChangeLog 8761 SHA256 e295f41da9597dfccd6c33cf555a93bfcce988e06f9dd12818c56dc0d58e0fa2 SHA512 7b0a3bc5d4064366e04930fbe1eee79e7792b2e465a493e5470ff414370aa14483b9e4a29bf3c03a3835636140b9fb9ef772b40c0f11ca8b501e3451553ffa68 WHIRLPOOL 746a77f57396a8c820cc96767b4f1b9c67e08c28e0b69d5904619ed841055abfaa23d714db108eb45e6d1ec7f4c55671d411e5f86963de89de7feadd3d00d498
+MISC ChangeLog 8907 SHA256 99cd2deab63348b83ef0ffb205f86d01ae5c5a30cf516756ee58943ac23fd8c1 SHA512 c087921a1c5ab18351639b2459dcdc3127cdc89fd7f649b06bef8a885347b7a33dcaad0ca2854416df52dc69c9e0db4bfbe68dbc278c9a09a1592e0b33210894 WHIRLPOOL 0551c0b68fbf39d01471e3f11454c14f68a43e701ccf0fd57e2f340dae885270dced02992560817a4e987ca4391a259e74dc0eb3ab7e57c2cbd5ba91813b13fb
 MISC metadata.xml 705 SHA256 6433fd0f1d22d5abb31534b5e8b0804dcfec87e5f385b1a8726a9dba818233e0 SHA512 19385ac0dceb5319793c492b4687a0ce4b9fc6e00dc0aa76efa54280d8901f9738fdafd8c307a394aab89ca6c1aac03092b99c512dd1dc47241fe7db08f074d1 WHIRLPOOL 9e0341411d01328e4243d4db6342e0df648a56b648520cb68987f04432a7a59556fa5dfa1770b461668bf3692d5ffff0377b551c5680be607d9d8d2cae010efc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUDUGEAAoJECRx6z5ArFrDKHgP/2uE44LeOAdEDKGvxlJHOB79
-24hHIliIdV2o0wjFoj/YDx95Z74ir3EJivLI6y0YGWy+05F0UQkEx+4L99bTtVU9
-Wu370OmGbfmUi+MSsjXkK4zF9Blea6eJCbpjMoxZNkYS1y4tH3JhnfAaYaMClad9
-YIGurhoLEh7uX8LqTA1HuH30TJJ5tOlVt2Pf0ruWJ6mmMz6Km4XRGcMgkyOC+2Ba
-b/jhKS4/KwXU4eTLiFweurZ2GCHTjpcwWYEZzEgSv1y8eacstzxWYMfWH1tXfHr1
-vLm8QVxTcz/0msaYK9ADBxD7jL7failDjsyO805NHKYb4N6MKXmyvH6OVzy+XMr8
-kHtDpPS9Gy6X0T0YRrOlFhm7XzXpX6NTxzKxfXS/o/KXW1/ZuUw0rMSBKToNVCtz
-gGP6vvlBRR3ANcXiiW9eJ62+fVqq2/StLTL4JMyEvCqs9yJKlj2+8PACQj6na85X
-EYbskiePd7zo0g5Y6qc6rRKW7NEoFLPnlPHleAZvQW/p7Z4d3ep59SVm/gKhVlaY
-byolk/fv8N2Ehptd5u0w4gNzjvYwYX1gBa96Zfmu9pXhDGZ/Nsvd8mPY2kPmzpNF
-UgUvYyqWaQ46ak7tGB8kDru6bGLa4LEl6clCiN6/zlmhdTG9eXXToUMKc6mCD/F0
-XW+uhHnj19av2XCo3UdY
-=b8V1
+iQIcBAEBCAAGBQJUhmWcAAoJECRx6z5ArFrD6LEP/1+y0f5JvZ1rPlRmRHABeDqM
+s8RJctq3R4j0ZF8lPPPBT7Z2Cgp6m/XMlvAZIPKnn00Lr9ZZ0Da66Z4hcfEjtGLg
+VWMrSN9UUH9ji/Vmuyc8Ep37M4P7bZ65fz61YdSnY9UEa0c4EM640hGWydCYAeNH
+EmVFClQNm81VFN2ShRjNcbXHe82Q22lnOaUiIs8NvDD3M2Ypakae5DS27u6jpCB6
+r4VxNa5QbeM6TYlLrbN2S62/N/x82galBHXXum4EnUOcRWF28Nx+xQVdpfJROqQ2
+lAmwP0S609FVUscHCqhOwfM8aSZ7PSHKFZv4jI/8fVVEUj2ydBDgKjsMUL9sx8HB
+lUbtvkAQPMANCAKZs40N4Ak1uzSyqvagQNxPCcb+CIErjawQrlQ0l9SEaTSWiLQR
+xRlVGcRgn73ymjJXqQWO1X3/0zAgjNOzgOYPZppCQ8WpDmDP8nIra6EAILgz4cJj
+OcKeDTP0/azL3kXGq9Q/CJIcAjca53zPHBwYdXstS/OuLyrKDOulHQQQVyY0PNMu
+Vajlt3kvuNEdtT+J9TWsuCgqm+L6MD5zvowWozPd35x7i3W+YHDyQrRymb2p2rPE
+peXsVAW5DjZk5oG/IiX+9iBveYNN7GnkwfVWfvjFHogsc+7b53yxXQdXAVqblIxE
+shJILYSEsLBKCfsJa5UK
+=JGVs
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.12.0.ebuild b/net-analyzer/icinga/icinga-1.12.0.ebuild
new file mode 100644
index 000000000000..16e5a18817c0
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.12.0.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.12.0.ebuild,v 1.1 2014/12/09 02:58:34 prometheanfire Exp $
+
+EAPI=5
+
+inherit depend.apache eutils multilib pax-utils 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"
+SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${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)
+	--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"
+
+	# paxmarks
+	if use idoutils ; then
+		pax-mark m usr/sbin/ido2db
+	fi
+}
+
+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
+}