[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

[Matt Thode]

commit:     406ce4fb02787b1bd27faee9c66a54458d63d521
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 16:39:57 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 16:41:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406ce4fb

www-apps/icingaweb2: bup secfix

Fix a privilege escalation issue in the monitoring module for
authenticated users.

Package-Manager: portage-2.2.26

 www-apps/icingaweb2/Manifest                       |  4 +-
 www-apps/icingaweb2/icingaweb2-2.1.0.ebuild        | 65 ----------------------
 www-apps/icingaweb2/icingaweb2-2.1.2.ebuild        | 64 ---------------------
 ...gaweb2-2.3.1.ebuild => icingaweb2-2.3.2.ebuild} |  0
 4 files changed, 1 insertion(+), 132 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index da6bff0..5399c86 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,4 +1,2 @@
-DIST icingaweb2-2.1.0.tar.gz 9957758 SHA256 1fa15efe4056eca4012358d009da1b90c4b4dd3e18d446de33eeaa48728389fd SHA512 fa694bdaba51b82c33b8fd726807df4c626cd944f1d2949cc8768df3e9bbebdb78888f6aaeba2e88f1f843dab8608d69e1b69f6630e438ab9854d3c8b99f4502 WHIRLPOOL 6b3cba5a701757000909c664d115755efaf3564a77a34a71bc4baa96b058efe1d682867fbaedae22e6a1126aa3dfb47389f8474c42f5a45fbffebc77529a7261
-DIST icingaweb2-2.1.2.tar.gz 9800997 SHA256 869a4d0cf72506d098418f3c6bfd642b459dc5e68b5bf349b1e59fb20c3ee73d SHA512 00755ea4dff7084d7fb91cfb36ff14632f18f75231eeecbb09afb293a6a143d84df86dc36d5f4fe47cc36c633857d0897c62278d0fa0c95bd60972b43dd500c7 WHIRLPOOL a4c1662258337d747662e0d3d73f54324a981b595c319e88e094df85dff5d226f925010bbcd64f0cc5639c1ceb606bc7eeca89829faf2115278086295700e5cc
 DIST icingaweb2-2.2.0.tar.gz 9803668 SHA256 f240b35a4082b4835127608d0b11a27a4bf53bb0c88857344255225ce9611201 SHA512 e07948e284e59ac16f94191607d9da88b06e9e311af9f79b3fb19e1a7d943144515d4122dae4b01d09927b586ae4ccf15cce54e47e0e784882a422d6eb434f59 WHIRLPOOL 32734309b65e4ed0d04b060fadeef617ec9f7da7c227c563d76ede12e5839305b3a384f0b355aa8bc6a62d1220f4bf78f2299cddcbedcc7a9f2c1b1972dc5059
-DIST icingaweb2-2.3.1.tar.gz 9811978 SHA256 8fcf177275e84ccd803b8e13a1db43f859a49f3f830f1f234767517f1f69c03f SHA512 5e9e094d9e88e26bd52b84261b15cdfc8952dc32b99b3c2935eda12cc700589fc4b0b963e88d2456f62c3be24dc6c0b14eb0f5a57a31a0738068fac1f236235b WHIRLPOOL 645870e5ddd496a16cd36c35ba92e53e4255b8d93a377b4854b90afe987c5ddd0cc029e30c93499c28bef0045664eff764f4a6ecf5d627138f605b05e5748a0d
+DIST icingaweb2-2.3.2.tar.gz 9812433 SHA256 89abfec58726cadc0380897880190ece84f74f34152b1146ee7b24244337b76d SHA512 9cdea22df385e385077321ce482662b8e6529d0eef7be64880f695718431cf80de33e9dd40d480f3f284911aa58ef0d9d50a7ed52328d63612777569f9576052 WHIRLPOOL 98549205b00105e8b4516cbb3a51862eb710ef2b88506d9ff259ff9fb35c844be42efa21ad9acd657261a7e651ab386feed77295f787ca9cfc8eea2fb6f75d96

diff --git a/www-apps/icingaweb2/icingaweb2-2.1.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.1.0.ebuild
deleted file mode 100644
index f3aaa1a..0000000
--- a/www-apps/icingaweb2/icingaweb2-2.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx postgres"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-lang/php:*[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
-		dev-php/pecl-imagick
-		apache2? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use apache2 ; then
-		want_apache2
-		depend.apache_pkg_setup
-	fi
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache2
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	mkdir -p "${D}/usr/share/${PN}"
-	cp -R "${S}"/* "${D}/usr/share/${PN}"
-	chmod -R a+rX "${D}/usr/share/${PN}/public"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}

diff --git a/www-apps/icingaweb2/icingaweb2-2.1.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.1.2.ebuild
deleted file mode 100644
index 81d8276..0000000
--- a/www-apps/icingaweb2/icingaweb2-2.1.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx postgres"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
-		dev-php/pecl-imagick
-		apache2? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache2
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	mkdir -p "${D}/usr/share/${PN}"
-	cp -R "${S}"/* "${D}/usr/share/${PN}"
-	chmod -R a+rX "${D}/usr/share/${PN}/public"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}

diff --git a/www-apps/icingaweb2/icingaweb2-2.3.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.3.2.ebuild
similarity index 100%
rename from www-apps/icingaweb2/icingaweb2-2.3.1.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.3.2.ebuild