bup and fixing bug 525570

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

3 files changed, 230 insertions, 16 deletions

diff --git a/net-analyzer/icinga-web/ChangeLog b/net-analyzer/icinga-web/ChangeLog
index 08f4b44a5c70..fa492ac20277 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.19 2014/02/19 18:18:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.20 2014/10/16 23:34:09 prometheanfire Exp $
+
+*icinga-web-1.11.2 (16 Oct 2014)
+
+  16 Oct 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-web-1.11.2.ebuild:
+  bup and fixing bug 525570
 
 *icinga-web-1.10.1 (19 Feb 2014)
 
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 760a56e91e7c..1f1e17fa82ec 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -3,27 +3,29 @@ Hash: SHA256
 
 DIST icinga-web-1.10.0.tar.gz 14245635 SHA256 fe1b43448bcb6a9e8f565f079122e51283539eb6be214e7001c65653686b7f56 SHA512 90537ea710dd6408349b734b0901918db595d2d7a281e9245a63ba0150a4b7df4fabbb71755966361440ca6096391470d7399ddd5f4b245d1203000b89d8b368 WHIRLPOOL c72004edb2a76efa4ccbea6363fddfa4c6d30c8c368fa57ee0f865d27927bdc5aea691b42c4415b5fe75a12d946768296feffbeb101ff8945377d92da20059bc
 DIST icinga-web-1.10.1.tar.gz 14247394 SHA256 b334c063cf4f53fcc1922d99161b5ea5c32c04749c0f9dfe091f376158273664 SHA512 e155c4c00fde20680ed3286fbf7af4db13dd566693ec677a61c719cf8a0b36862bc51741180aceba204e6f768000d8a6dc4548bfbf7165f28f8bbc81c79bc63c WHIRLPOOL d4cf2ea128c0e46bf07ce1ae677a4e718405b926250f4972790388d2b45cef5996e16ca5b83dcdd8f8c9a84831a76cb88b76d0839bdce87e222d6712463b6de9
+DIST icinga-web-1.11.2.tar.gz 14133733 SHA256 726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512 ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1 WHIRLPOOL bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
 DIST icinga-web-1.9.1.tar.gz 14635896 SHA256 aa5b1aa6962a727a6760f89ef19845a878b7e06ee723b8f1fd7821b6a6b578aa SHA512 42a3edddae5a287b87fd6d077ac303e7caa0b430af86e9046413e7d04d703cd3de7df881463eebb1e5216315056e06ce9f6dccbef93b6e55d1c3f5fe002447b9 WHIRLPOOL 8b5a6bf78794f722952566c82ae238640a716e61022fead31145bbc6fa40ca3bbf439aa593c5839b09873f7d43469cff28422ecd9b93e51cc7124859d1ae8257
 EBUILD icinga-web-1.10.0-r1.ebuild 6437 SHA256 d844725753842ae807ebc8c259371fbb11389fac53dc5c83b00e18918af16722 SHA512 857ab09762bc596551173146523b85cd85987f423cd3ff96dd4661a64a827264f903e830157e73dfd4d0d15c179ced49b28baa0a9da3f5f0a86aef2897451b37 WHIRLPOOL ee8b718ba900f83fe9d00b48686e718370e7ca36e25536be32ddba2e8e47bbeace978086bdc3b88103341eb22205fec72d9e83aa10f650a90fd90e32bfcd097c
 EBUILD icinga-web-1.10.0.ebuild 6434 SHA256 1464ef900bb49f81ec97645407a371eb8b6b84daf589bdd1705c28ea56e61c00 SHA512 c5edb18bcbbd265f5f45c490d094aebdb439b48fff3506dfdc168cd5529efa4dafe56ee91b2849fc50b3d0eca3b76c91f0c2b3fb6af7802ecd2807435513cc72 WHIRLPOOL 6d42f628623b30bb53db7c5a92694640ea9969320c5efaa06e448c4b6c9518d3319864b7b754a0015c0f80b11c8ecb9392b3fa5c991b6c7824081b8e091c21c7
 EBUILD icinga-web-1.10.1.ebuild 6463 SHA256 8ee432f4eaad4bdef18a8128c5f43aef1eb9157235793630352dd1d72be43b38 SHA512 9d43b719fcab0ce5f6c78684bc54c18950e923671d84107838ccff0fe80123851479ee30ed766bbe0bbe59aacf86b475afda7dd0a2242140c680211d93fc8f50 WHIRLPOOL 56fc1f5500bf6d20172fe6072d9802cc100869804a3e1755d242ae7247d424badc87c6b81abd07d4bc1c887e6f69d2fb3e2a4cf957b6be13232fc0ae30c0b29e
+EBUILD icinga-web-1.11.2.ebuild 6499 SHA256 dea9a2673e4663b094cd095ecea385e0f8428cd0d79e815c787383551ba6700f SHA512 5d7dadf801b70ad1915a1a752c59674a7d6c2f17c7ead42a85a32db59d2eab5b2eeadd97acb6b773592707734e0494da438f94a559f9227c9c8061d769dbb259 WHIRLPOOL e4352cd26ff781d24b2ea8e85373324f7d21b63370880155113bcdf1e08c3975bea520af48f7d0f971dffbe0326c433c5b84c31fb16ca731e6abdb9dc25ae13d
 EBUILD icinga-web-1.9.1-r1.ebuild 6290 SHA256 05917ddc024198c8ea3617747e4f9d4cdea1964df243435e406f44d5b56ea585 SHA512 f64acc8d5cdf4acb43d7207239764061ed6223c39216f9904670b24c71005a82c1b63945e739d8796d8d7984ed2c3b68c041e5fef5d436399409df31571267a7 WHIRLPOOL b58f74c305bd04c85191105d4b600e788aa6c07362e5483ef15bf489aeb67ce14011a12606cbee9124220dc8f9d3864b9a5c5f1b5981c66454592882195937d0
-MISC ChangeLog 3571 SHA256 d870e1974c23793e683b3c8df2e635d8713977ee04d4585f4c33185b96e3f500 SHA512 ce3580dda6ec2a24e854491a8815a38207b3c3d6d77dee0c86d8adf3c203c88b38c057e4f9d47e9c721932338232605a66094663c84fdbd441793ebad4ee529d WHIRLPOOL 05fe255704c1f3b08e8affdd7c06366479a14c0ff67ebb1305a883ca6a936cb746fb9f80e1211db0a84415c89157b1c63be144124301b67c7eb310b5b72e85b8
+MISC ChangeLog 3720 SHA256 feee007ad00caaa97b20ca3ab52e4bacc9d2aee9785ef95c858bc17e05620ac8 SHA512 135974c33d8d0269a09eea005e64eda5bc2a2201ab2a01ba669351fd631a3d02f52bfc41920fd60207b3fc6c8b087358aa816fbd589cff3e608b3e7450fd75f7 WHIRLPOOL 80b65f29e84a17d0fb0980d866311a108c8464a28280bea0a647daeec1560684b939a19a4b295a94a1c85599cfe8e9be05a7091621fd06b3d6beedce519fb50c
 MISC metadata.xml 419 SHA256 49679fa6aac480dadb07969911c1ea1fd09b7fd67b28be3ffc121333426dac61 SHA512 31f0c6fe93a928fee82cd8fb970dafdaf7b9f830c44ca33621fac89998ee0ab416ef851ac76a8019dc8fba93db331ba627e2ae42257d80a9615d12b03fbeffe1 WHIRLPOOL 8cbed9673cc9bb5797643e4cdbfc6adc378d5baa3e877614b7b0d55ad4d659e979283d9323c57938a301aa787edd7a66fb3e2882b0eba4ff90c638b0344801e9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTBPVtAAoJECRx6z5ArFrD+/0P/RG251Ez0pL4FX/IKKaKTs8g
-IddUJumVeHVqtfb5PU+Wpl+6UZLcuANfvqtHfxC/WAzcWzY+TGWtMfeekpYJc372
-WnDfFUj9xSCx8HNP49bbe+V6HPFuambiSGpy0m/+gOkBZeqIm9RFc2XWiDemPzg/
-yK1CXlPy3tjaCWqKH/Ow7KR+8D54xgLMa/J0aWKC6qw9+AezkSj2og+SLxnj/3rN
-/wHEU6E5Qo9oZ6uMbmrxDXphvmQpyqte25Dye777hlQvnh+PwZ/VW66dbAdTYMEZ
-X0tg+tWQ7dDT/zHuNRSBUrgYAKjHd92xjWScILtuvf6hstuItFtQt7ILMP1DOP3e
-NzcpgtyAmeXIUdEkWYtsk/l3TTp1iaP/Fc53EwGY1lx6YVECCvukIN5kTjQUkODt
-74sh9ntVtUC/L06rShFW5etEnvc3bheYMUKHzrft9tcrxJgoBPqEqaCb+gXm/6OR
-A23ZBO8jc3AhtiFkk58rCtMp9aahC8dEWaMLBgOwbA0B0isDQAT1M40hZsDVyQVp
-L+MQdHEOzpfdY+D+/VC76ha56G7cWnQE/J5s71hS5Y+5Azdn2jf9IyokbGjGHAJL
-BbLYn4HGmRFDS3FaCjRqoE3AcY0H0t4m+3g439LLwd7wZ4pcuVbkZ/uDOHbvvuYz
-IIaNCGut4DNGmam5VH45
-=1qAe
+iQIcBAEBCAAGBQJUQFYSAAoJECRx6z5ArFrDEj0P/R2EOcYlGR7q4Rru7mbq1p9R
+XdXsmuGgrYgLGQ3l1xSirtSrU9Ru/uDYqsPDBSZ0SBAM8Es5Kjyh7QGRQQGO7JT0
+qE4HYxuIUm/TKFoonpInocvgEhkNrmEU30bnqj0plPaFKfczeK7p5gDwgxS7R/FL
+NBjqwipfgaVomudXa6pRZ+jCnvPPA/vbGbxxeFh37F8UQB7pz/hx+6Pnfs8yVq9M
+mqLtxBCVhDmwiXrPvV7wYNDhoA8LIIOXiy4LsePAgBg/3WP3WOPKNAcB9FN0bY/k
+qIiRvpOFe17WOHQa0Wl4Y0ZYCuKkMAGBOLnZH6wuITU3bnqjY7wrFYznhRxOWFdT
+SiOel+90wo8Hu8oWXKUjSNfGtuyrQy6fa63v/mmENUadbp7qLgoRO4dGO2Wtvv7I
+m9BrY6deNeB+kjZo8fE8RAYBYlnElxbi6fNkdzVYzNA1OGHxB4W849RpKZv/b5sF
+X80gGdEOkuYWEbKPmSTy1tm0pUeXy4tL7wX2Z03Vz++XItBMtUwVbXbCF7kxhEvT
+Y2sClKYIPIwb01ySXXc/q41DJaqBzLYDdX/h6lctCNRmj/xJIMIIQ56yCsVWbnIV
++3dClYHE3np1uQVr7wV8TF80h/nvczOlMDJOFOHXozL7zh6WrC1aL9Oz+CIZbo0X
+7+qgWDflqNWH5hITQOVk
+=R6pp
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga-web/icinga-web-1.11.2.ebuild b/net-analyzer/icinga-web/icinga-web-1.11.2.ebuild
new file mode 100644
index 000000000000..486f8e654ebc
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.11.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2014 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.11.2.ebuild,v 1.1 2014/10/16 23:34:09 prometheanfire Exp $
+
+EAPI="5"
+
+inherit depend.apache eutils user multilib
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="https://github.com/icinga/${PN}/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+		dev-db/libdbi-drivers[mysql?,postgres?]
+		|| ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
+		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
+	sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
+	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 -j1 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 "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+		rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed"
+		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
+}