Version bump. Fixes security issue, bug #330481

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 9 insertions, 70 deletions

diff --git a/www-apps/mantisbt/ChangeLog b/www-apps/mantisbt/ChangeLog
index adb9e620702d..26a731a796e4 100644
--- a/www-apps/mantisbt/ChangeLog
+++ b/www-apps/mantisbt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/mantisbt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.88 2010/07/03 14:17:45 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.89 2010/08/01 05:35:50 pva Exp $
+
+*mantisbt-1.2.2 (30 Jul 2010)
+
+  30 Jul 2010; Peter Volkov <pva@gentoo.org> -mantisbt-1.2.1.ebuild,
+  -mantisbt-1.2.1-r1.ebuild, +mantisbt-1.2.2.ebuild:
+  Version bump. Fixes security issue, bug #330481
 
 *mantisbt-1.2.1-r1 (03 Jul 2010)
 
diff --git a/www-apps/mantisbt/mantisbt-1.2.1.ebuild b/www-apps/mantisbt/mantisbt-1.2.1.ebuild
deleted file mode 100644
index 78b1c336c68b..000000000000
--- a/www-apps/mantisbt/mantisbt-1.2.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.2.1.ebuild,v 1.3 2010/05/25 17:27:25 pva Exp $
-
-inherit eutils webapp depend.php
-
-DESCRIPTION="PHP/MySQL/Web based bugtracking system"
-HOMEPAGE="http://www.mantisbt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-mirror://gentoo/${P}-git20100511.patch.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/httpd-php
-	virtual/httpd-cgi
-	>=dev-php5/ezc-Base-1.8
-	>=dev-php5/ezc-Graph-1.5
-	>=dev-php/adodb-5.10"
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	require_php_with_use pcre
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}/${P}-git20100511.patch"
-	# Drop external libraries
-	rm -r "${S}/library/adodb/"
-	rm -r "${S}/library/ezc/"{Base,Graph}
-	sed -e 's:ezc/Base/src/base.php:ezc/Base/base.php:' \
-		-i "${S}"/plugins/MantisGraph/{core/graph_api.php,pages/summary_graph_cumulative_bydate2.php} \
-			|| die
-	# Fix incorrect filename
-	sed -e 's:config_default_inc.php:config_defaults_inc.php:' \
-		-i "${S}/lang/strings_russian.txt" || die
-}
-
-src_install() {
-	webapp_src_preinst
-	rm doc/{LICENSE,INSTALL}
-	dodoc doc/{CREDITS,CUSTOMIZATION,RELEASE} doc/en/*
-
-	rm -rf doc packages
-	mv config_inc.php.sample config_inc.php
-	cp -R . "${D}/${MY_HTDOCSDIR}"
-
-	webapp_configfile "${MY_HTDOCSDIR}/config_inc.php"
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en-1.0.0.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Note, that this branch of mantisbt does not work with PostgreSQL."
-	elog "If really need mantisbt to work with PostgreSQL you'll have to"
-	elog "install it manually from upstream svn repository:"
-	elog "https://sourceforge.net/svn/?group_id=14963"
-}
diff --git a/www-apps/mantisbt/mantisbt-1.2.1-r1.ebuild b/www-apps/mantisbt/mantisbt-1.2.2.ebuild
index 1c22bc7a0169..6ec5560bd9ff 100644
--- a/www-apps/mantisbt/mantisbt-1.2.1-r1.ebuild
+++ b/www-apps/mantisbt/mantisbt-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.2.1-r1.ebuild,v 1.1 2010/07/03 14:17:46 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.2.2.ebuild,v 1.1 2010/08/01 05:35:50 pva Exp $
 
 EAPI="2"
 
@@ -8,8 +8,7 @@ inherit eutils webapp depend.php
 
 DESCRIPTION="PHP/MySQL/Web based bugtracking system"
 HOMEPAGE="http://www.mantisbt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-mirror://gentoo/${P}-git20100511.patch.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -24,7 +23,6 @@ RDEPEND="
 	>=dev-php/adodb-5.10"
 
 src_prepare() {
-	epatch "${WORKDIR}/${P}-git20100511.patch"
 	# Drop external libraries
 	rm -r "${S}/library/adodb/"
 	rm -r "${S}/library/ezc/"{Base,Graph}