version bump of icinga to 1.9.3

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

3 files changed, 282 insertions, 16 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 2e769add623f..f9b7ed379445 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.39 2013/05/28 08:32:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.40 2013/07/08 04:27:17 prometheanfire Exp $
+
+*icinga-1.9.3 (08 Jul 2013)
+
+  08 Jul 2013; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.9.3.ebuild:
+  version bump of icinga to 1.9.3
 
 *icinga-1.9.1 (28 May 2013)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 57f8c0f6336f..a78cd5b6ace8 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -11,24 +11,26 @@ AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62
 AUX ido2db-init.d 936 SHA256 4e978d54b9b5efde1e4474d865d6283eeafa2a57a2ad19ec85a710e79698c456 SHA512 913e923f297281e6a429ac446a20f6b8e8fadbc5dc5b1a01f1b5d73694ebd43e0931e655194593c8335bfc6505bb47b7321b8d6530c869f1bd8b262ad030faaa WHIRLPOOL 0da5e0702535cb9e07f98cabfad9f6ce0999d5d7a60e66494ca3d4167537343d3d750d48145856affc43d404318c88b98078a8c08b369c6829f5e68555cb7dc5
 DIST icinga-1.8.4.tar.gz 7459130 SHA256 e1ecbc6c83bb8b2d4d29934182b101f305c8d45873b0cefe452dd913ee5b6de1 SHA512 4112a6ad78cfedf5106998045f12752ff1c6c55eb347e0e86f8c0e1adfaa678a256c43d5362a6a7952d4c868b00a90a812567ac5d5cd01eb98a8e2a8b346f90e WHIRLPOOL fedebccfa3e9dcc657e72525f6c5b0a7e0a5d70e12b7c2e9c2a621ba658c9007f950be45a6ce85a25bf6dd0d2ca0e62ed0939fe9af964694bfddb124ef3057ed
 DIST icinga-1.9.1.tar.gz 17075758 SHA256 ad4cc505d0b298bac791e295bbc08ab80a6437a1853689bfa708312deea72511 SHA512 a1ef5f24f82c44ac9baacd856b1f8fc1bca4956ce4ed2691aa4a7c058f2dffab6e5f9244954ae7a2f18d0d53b549a37cca145e1d638b1e57ae4619d788ce8cec WHIRLPOOL 758ea6b9015414c20f6c90b04a958ce19f9f0e8986accb3a0d78e82c88c4d9a6d6b7959c9daf3ac9696c1af76ba605fb8f81754953fa030fbf11a5eaf77665c5
+DIST icinga-1.9.3.tar.gz 17082275 SHA256 2dfef14225e8b671145d4816999bf57842d379b2e5e18d2af69cf0c5b93376db SHA512 5361b1a6ee40484ee85f32ba4a2dbd811f4776dc646c70adaf2597d85b0c9011049f8c7d057ff67de645d4edd0a3377d32c62c0c3d95eab1db9d9e0e3c636a91 WHIRLPOOL 98e5be7ce9cf8e82f202fe9f5ef163ef33afc1dcac76aae7aa022b0597fae9a71f470a4bb3022d7a45f358a72b2deea29e86cf11a7a77a65ce21947df2870f73
 EBUILD icinga-1.8.4-r1.ebuild 7580 SHA256 5e40c76b943a3f814e01eb85ced6909759b0a1f380004487cfe5e5890404f8ac SHA512 a62314e413e355454014b90742b550c7a483bcf5ca5229d801de90b6beecba10452692b1604f52104c0084fcea604c36ec61b31e2ec7bdb981fbf18cf0b75956 WHIRLPOOL e1c6103be0c02714bc5095c94283029e5c303381f090ae06e9f5992386d1fccead00943602e157396972a61ee50306f782f49b82b20913f6c72cbcbf41d8b02c
 EBUILD icinga-1.9.1.ebuild 7731 SHA256 e5f4b345225b0587c77629f2f60796f152b53e4cf40bb092f1d3f933f8565b3f SHA512 792498024fed1ca9cbdc4fd65adcf3ad58868e5b9d9a033cd3e69fd52ad5274ccb856235618e767e9bf80721b30744902b29d7e2d6146cfbced3e61764e60520 WHIRLPOOL 235715f44bd403d927a88cde9c727aad41e77e6e0f2d773308a8e3c77094d73f80543c147cd1344d815df5b75712134f8b8d4a4f24addc204d08951bf906bc17
-MISC ChangeLog 7037 SHA256 a742d85a37fcd79695140f684481eb716752f1a56daf8a1c2f34c1ddf4e4bcad SHA512 0eec17b8733bb9848be0f6138f2dbdf4f1dcffa3eca650c2c8b02429ceeb81d8de6cdbedb9f8489fd30c586a89f346fbcd24beb8819b6600dee3d8b75299c3d1 WHIRLPOOL f71a62ccbc90146d016ea350f0732c79847555c9dc5dd41d3e327ff0eec1aa53d56f0c613188d5811617724be182d024ddd58cd28a198f0e536835d67d6df438
+EBUILD icinga-1.9.3.ebuild 7731 SHA256 f05779cfd095b6de0765d9f4e5c0201779b4ba7e22bd9a30775f6b2b02fcd675 SHA512 73bc218c855c94cc64948b443c20118a1c41c50ad397d2a0b51d91474897fd9ed5050b6feb7fa433f8559c67735194a5320bc187a4fedbf7eaf3a1f34ba59e67 WHIRLPOOL c451a9944338fd9229d8fa8b82ed22d49177253aaf3168f3492cc820ca4513415b3db3122abfe561cb2a20e9ce42f4d049855a5d29ec8140de34a2912264bfcd
+MISC ChangeLog 7180 SHA256 af9d6bff6ba380b9216cbe82f35071770416953e8e474d62576b654e4ea293e6 SHA512 8ba2d0ebd98dcb06f2c48545aea3976f3ae943f7a7c5d2143c9212bc9bcd1df8924754795681410c5bc90ea1e8665aa4f69ebe1295ca55940a1df232744ebf8b WHIRLPOOL 959512ce461887f20434aa1ef68ba9a50df429ed5f7b09499477a4e3d157145b65de345e0ff557b9e1574d9227736c0f32dc6ebed4ba187d0705b6eb3d085b4f
 MISC metadata.xml 705 SHA256 6433fd0f1d22d5abb31534b5e8b0804dcfec87e5f385b1a8726a9dba818233e0 SHA512 19385ac0dceb5319793c492b4687a0ce4b9fc6e00dc0aa76efa54280d8901f9738fdafd8c307a394aab89ca6c1aac03092b99c512dd1dc47241fe7db08f074d1 WHIRLPOOL 9e0341411d01328e4243d4db6342e0df648a56b648520cb68987f04432a7a59556fa5dfa1770b461668bf3692d5ffff0377b551c5680be607d9d8d2cae010efc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRpGwAAAoJECRx6z5ArFrDLTEQAK4Fv2E4S3fW5du52YyQM629
-dcZJCZhuRp+/BpgJQrvbAWcKiEbC0yqDoSJNhHQw369u1NAMGQc1HODV5vuxLAzE
-6mwnNscXK6Tz+e1dfrEKEat16ZQnEDWzXhqtODj5RxnMr/s9DsRqnY3FFWsA35Ge
-+go3jOz5N+NC7q86oh1+QrPcTFZUyJ7agpSBHASmqk9raTEi7uNoZyREWqJ40q9z
-exClFoC0jHxS4nzn0jmLZ74VnpiaAozTqd3NuXG+WgbAeRxAqP75tLHmdWz8AwFZ
-EGzXblUiwvo5isBOBTqu1rqKQq+A0qqouN8obB/0DduGnAcz/Rm0zPwI/dlPeZ8L
-rXuYV+F9XFuwt80xy88NuQyib8sTOZqBvfySvc9S58OBgn94v9/eOdvi/boxgNo7
-GIYyat6Q/3YAc28V5Tc9rbIEr3c4hGWV9EZtiIg01S/QR7c/LY4Au+b7xWz5EUzf
-az3I0HY1+/DoA2hO+kHnvbdodNEM/D4GfbmK0wlw9DO2M0plTmsk+NscWKKJgNuA
-J75r67ODz8ocH1MgX40vutoaeK1j6WlZZROg4jKQqEBNEjfy/K2Fg+RnnyuSKp4Q
-8UeqwSoBJDiyDNxqDEtGFqvuWLjBKV07EQS7k8WmyfKwWOh30UTUDRDrM8eodcHD
-uRC5PO4x1BKn24Gm1F1Q
-=lFXf
+iQIcBAEBCAAGBQJR2j/DAAoJECRx6z5ArFrDAqcQALVxcAfTqnt8dcv29851BlOt
+uWKJG0XTZaj50FOKJO8GOgGJNLq0fOTJhN2P8JCGqWN6ZaGaOCERkBp9203Q9B+A
+SvKf6KUs6VKNxC/bKnkl2+D557JScI11NdDGljoDVdZvo28dw5BV1o6HsKNRlV9F
+9nQvujW2gZqOKIAu8KCjpk2yLa47iD8qFOFeZa/M1q4+1bnEIg81+e3D6E2HNJo+
+bVrR9BugSoFy5p0xBpqr7laY9P0kWYZR9Mqlu4mo8QD0p9+D3TtH2VhJ49r9lzuo
+wZ25ioX36uUtvvfLFGSczfhUDlH+tVMqUSjb29/i690RYhlY+2pFp/4FJFb0ugAV
+m0rIQrp0CsLgnMIDz+KbQXUXoNLBJNfR2Po4MKoGZOrzT2BP1SyVjo5jrljBU2a4
+QJLYu7fpk9wl83IZJNGMnbukw2SMUPo1Q4DOATWg2/1snJ38/RlIJXqY1HxFP2rU
+K7/C8lj5kiK+mXG2xQIAe5zqmjWcVmocSeHULQGaYybbiCXSCGRQr+S/maBW7xVW
+6HcFl/KGKNlfVrY2Fj/d88s6mfaxL+ujaUcQouf6yGEZrjDVMzHilLBPdRJmDiPv
+rImXfG3C03vYga4OfgLvNvXsC1twYDLS9DY3YfNzO5i9kyXWnqpIdS+wU4bbivMb
+NOjyJpZEZBaEb6WF5pk5
+=tuPv
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.9.3.ebuild b/net-analyzer/icinga/icinga-1.9.3.ebuild
new file mode 100644
index 000000000000..de54d6becdf2
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.9.3.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.9.3.ebuild,v 1.1 2013/07/08 04:27:17 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
+}