updating icinga from 1.9.0 to 1.9.1 and bumped the eapi as well

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

3 files changed, 232 insertions, 2 deletions

diff --git a/net-analyzer/icinga-web/ChangeLog b/net-analyzer/icinga-web/ChangeLog
index b90e2c12cb36..7053219aa1f7 100644
--- a/net-analyzer/icinga-web/ChangeLog
+++ b/net-analyzer/icinga-web/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/icinga-web
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.12 2013/07/28 02:39:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.13 2013/09/10 15:30:47 prometheanfire Exp $
+
+*icinga-web-1.9.1 (10 Sep 2013)
+
+  10 Sep 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-web-1.9.1.ebuild:
+  updating icinga from 1.9.0 to 1.9.1 and bumped the eapi as well
 
   28 Jul 2013; Patrick Lauer <patrick@gentoo.org> -icinga-web-1.7.2.ebuild,
   -icinga-web-1.8.1.ebuild, -icinga-web-1.8.2.ebuild, -icinga-web-1.8.3.ebuild:
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 3cb143e68988..9c2140ded55a 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST icinga-web-1.9.0.tar.gz 14642077 SHA256 b55288bb8e5d360cb41582753334739a0ea47eda1453a73ff3d5b4c84b32f062 SHA512 1e41577b64f627addc6043eaa45d6cc5bdadb881f40e3b8b4a87ba07ce7be1bc0c28ff8ecea60ffba37547fdd9866d5b60aa1dfc0ec4b6d24b5a999cf8866a31 WHIRLPOOL 1fb6811b35450fda35a8e8aaa528e10fd09f92b5f604de57c76dd6bdca10049e2c0b70c8bcb6a884a75124239d3be1c34ff7c69ed17834a9bd61960829c7a26a
+DIST icinga-web-1.9.1.tar.gz 14635896 SHA256 aa5b1aa6962a727a6760f89ef19845a878b7e06ee723b8f1fd7821b6a6b578aa SHA512 42a3edddae5a287b87fd6d077ac303e7caa0b430af86e9046413e7d04d703cd3de7df881463eebb1e5216315056e06ce9f6dccbef93b6e55d1c3f5fe002447b9 WHIRLPOOL 8b5a6bf78794f722952566c82ae238640a716e61022fead31145bbc6fa40ca3bbf439aa593c5839b09873f7d43469cff28422ecd9b93e51cc7124859d1ae8257
 EBUILD icinga-web-1.9.0.ebuild 6304 SHA256 6171e771b1f6f1145801bd1e219befcc2faef606ccf7612d41f809ce0f094a54 SHA512 53ec85f98810d5b9b487b6ea93dcc05044bbf1b0e89558d26e7ebc012a85ba77f270f59830ec5d42ebbf956234da0685a2de00fc064783df0ec695edbc41fa4b WHIRLPOOL 96f10c210183a3e74e428bf0f74181fa7f762b95d24c23533a2c35d5b8cd75224035e4854d7fb52ce1d602ff2870750a725fdd03ef35b1bc0dee628e4bd52b74
-MISC ChangeLog 2491 SHA256 fb27126507588e3693fe92ea1b4d49ce492279f173d2af23e7e5a86359493ed3 SHA512 a123e2525ae69e79f2be251c74b9b9a06284e1620317edb08938363975f6224822a8da444daed953ebed8d47808884bbdc3317158f4d807ce2982289eb3367c6 WHIRLPOOL 2f22b81b2743e282156aca09519ac8cc6271fbacee6ad43c922104b79afb561c62b2a90fc2037eb62b0172120510d868d4c21a94ebbe1c943013e7530d57c830
+EBUILD icinga-web-1.9.1.ebuild 6237 SHA256 274f14fc057e9bb1c20fdacbae0b4337d087372f98036e18c84e27056734fa62 SHA512 619b8ca98dbcc4763e0334cba88d1acaf21202a315878d480ce790e6a0f3cb49cc4f0de051cff7606f51f8a4052c9b98096d8f715b561d5a4d373dd092eb9902 WHIRLPOOL 88fe3cf769055239e57408fee6ab1519bfaf8c68e49a67818a5dd26464377b1a0a2fa2638c5ef4e486ec79c1dd9a692f68e5d433b29737c1baae4ad07f921bb2
+MISC ChangeLog 2683 SHA256 e9d2b0d6eeb42d289b9c1b859c879314ff6c37c8686d98560415ffa3bc6a6584 SHA512 426767201f80efd142d5a0160bbba76ab593db8b45ed7171eb1ce84cdd89377bc106a747f212e53130464d1a8d9c22f9d62d6250698ffa89d880cdb9f800f4ba WHIRLPOOL 1b39d4f0ff0251300330a4ea31e2541d49b942119654ce8034d563f289268eb864e9282d17956c021ada04a66ffbb7e3cccb3f0bd85f1e722d62cae6aa3d33fe
 MISC metadata.xml 419 SHA256 49679fa6aac480dadb07969911c1ea1fd09b7fd67b28be3ffc121333426dac61 SHA512 31f0c6fe93a928fee82cd8fb970dafdaf7b9f830c44ca33621fac89998ee0ab416ef851ac76a8019dc8fba93db331ba627e2ae42257d80a9615d12b03fbeffe1 WHIRLPOOL 8cbed9673cc9bb5797643e4cdbfc6adc378d5baa3e877614b7b0d55ad4d659e979283d9323c57938a301aa787edd7a66fb3e2882b0eba4ff90c638b0344801e9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSLzuIAAoJECRx6z5ArFrDcaYP/jN1EQHm1v1MjgJHxZ3Rn/QS
+7jg4N1fKntftFdx1VksZDfcPYHMq6XEgz7Aw469P2n1NHvcnTUkVw/CCy9Nh+JHL
+59nPPMCZ86ao6ZHY/EkjfY5hy1eChS3QkwEwDxR17qV13QFYbvYcAM2N0M+QxOFP
+4jfw5BUmG1sW3JWOWX0Cg1TNq4/ePqrif1qFnHa8exsRr+eKoBeSpgyqEiaTssgX
+7F9BJwY3H+oQY+P5k9kR0jUQ4QBOeStS11glCRcVWczKS9GkwslJ6YTu2Ic4VgR8
+xdrauvin8tPZp8FEfg/Pek9uZ5oFMzgi0cnsuFPoF+NSQLdSVeE94PYn7WNdO/Z4
+MImweUZa+FSL1Dqhg5QEkipYq8QFhT/e6UHyaGC4XnButmku0iHO3Tp3QQFTt5CY
+pZ/l2PETLcXT5FBi9h9WkHxMxtqBLay/Gf+Em7dXmZnzp2CFyIbYGcTIsPkm3XWO
+CNfLFvYsiftVfd+fEZ4775NZyeSqpnNZ26GZTPREXG9Bn/O/Mc2h6aXBANBUOWSN
+c3lUHZQstrDSapdcNrZ3hAakMO/0OXgTJjwWFxKa4PX+tCrXpKdJyHmvK6BFuCE/
+TPh4HWOBAD8U+cEE2etKWyJfgR6GtOqLPIKfGf4Kp6GzK4RxW+PMhyIAUTXj4uZD
+dN1/xGLYurkRId3+IP8a
+=PLwR
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga-web/icinga-web-1.9.1.ebuild b/net-analyzer/icinga-web/icinga-web-1.9.1.ebuild
new file mode 100644
index 000000000000..3a188b59fb4d
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.9.1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.9.1.ebuild,v 1.1 2013/09/10 15:30:47 prometheanfire Exp $
+
+EAPI="5"
+
+inherit depend.apache eutils user multilib
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+		dev-lang/php[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
+		pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+	if use apache2 ; then
+		depend.apache_pkg_setup
+	fi
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	#removed checks for some php stuff since we have these things called use flags
+	sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' configure.ac
+	autoreconf
+}
+
+src_configure() {
+	local myconf
+
+	myconf="--prefix=/usr/share/icinga/icinga-web
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--libexecdir=/usr/$(get_libdir)/icinga/plugins
+	--with-bin-user=icinga
+	--with-bin-group=nagios
+	--with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+	--with-conf-dir=/etc/icinga-web
+	--with-log-dir=/var/log/icinga-web
+	--with-icinga-objects-dir=/etc/icinga/objects
+	--with-icinga-bin=/usr/sbin/icinga
+	--with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+	if use apache2 ; then
+		myconf+=" --with-web-user=apache
+		--with-web-group=apache
+		--with-web-apache-path=${APACHE_MODULES_CONFDIR}"
+	else
+		myconf+=" --with-web-user=root
+		--with-web-group=root"
+	fi
+
+	if use postgres ; then
+		myconf+=" --with-db-type=pgsql
+		--with-db-port=5432
+		--with-api-subtype=pgsql
+		--with-api-port=5432"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	dodoc README
+	rm -f README
+
+	emake DESTDIR="${D}" install
+
+	emake DESTDIR="${D}" install-javascript
+
+	if use apache2 ; then
+		dodir ${APACHE_MODULES_CONFDIR}
+		emake DESTDIR="${D}" install-apache-config
+		echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+		cat "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+		echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+	fi
+
+	insinto /usr/share/icinga/icinga-web/contrib
+	doins -r etc/schema/*
+
+	if use apache2 ; then
+		sed -i 's/%%USER%%/apache/g'  etc/scheduler/icingaCron
+	else
+		sed -i 's/%%USER%%/root/g'  etc/scheduler/icingaCron
+	fi
+	sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
+
+	dodir /usr/share/icinga/icinga-web/cron/
+	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF
+# Force the shell to bash
+SHELL=/bin/bash
+#mail to root
+MAILTO=root
+
+#runs every minute
+* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
+EOF
+
+	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF
+# Mail reports to root
+!mailto(root)
+
+#runs every minute
+@ 1		/usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
+EOF
+
+	if use apache2 ; then
+		diropts -o apache -g apache
+	else
+		diropts -o root -g root
+	fi
+	dodir /var/log/icinga-web
+
+	if use apache2 ; then
+		fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+	else
+		fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+	fi
+
+	if use pnp ; then
+		insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
+		doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
+		doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml
+	fi
+}
+
+pkg_config() {
+	einfo "press enter to install the icinga-web crontab"
+	einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron"
+	einfo
+	read
+
+	if has_version sys-process/fcron; then
+		fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab
+	else
+		crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If this is a new install, you must create a new database for it, e.g. icinga_web."
+	einfo "You can find the database scripts in /usr/share/icinga/icinga-web/contrib/."
+	einfo
+	einfo "Additionally, you need to setup a database user."
+	einfo "The user must have default data privileges like SELECT, UPDATE, INSERT, DELETE."
+	einfo
+	einfo "Example for a MySQL database:"
+	einfo "  echo \"CREATE DATABASE icinga_web;\" | mysql"
+	einfo "  echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql"
+	einfo "  echo \"FLUSH PRIVILEGES;\" | mysql"
+	einfo
+	einfo "  cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web"
+	einfo
+
+	ewarn
+	ewarn "If you're upgrading from a previous release, you must upgrade your database schema."
+	ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/."
+	ewarn
+	ewarn "IMPORTANT: If you are upgrading from an older version and there are other versions in between,"
+	ewarn "           be advised that you need to apply those upgrade files with incremental steps!"
+	ewarn
+	ewarn "Example to upgrade a MySQL database:"
+	ewarn "  cat  /usr/share/icinga/icinga-web/contrib/updates/mysql_<oldversion>_to_<newversion>.sql | mysql icinga_web"
+	ewarn
+	ewarn "Don't forget to clear the config cache."
+	ewarn "  /usr/share/icinga/icinga-web/bin/clearcache.sh"
+	ewarn
+
+	einfo
+	einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
+	einfo
+
+	if use apache2 ; then
+		einfo
+		einfo "apache config was installed into"
+		einfo "/etc/apache2/modules.d//99_icinga-web.conf"
+		einfo
+		einfo "The apache config value for \'ServerTokens\' must be set to at"
+		einfo "least \'Min\'."
+		einfo
+	else
+		einfo
+		einfo "If you are not using apache you may need to change some"
+		einfo "permissions, so that your web server can access files and logs"
+		einfo
+	fi
+}