Version bump. Fixes security issue, bug #330481

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 12 insertions, 75 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/Manifest b/www-apps/mantisbt/Manifest
index f02e74fcb6e9..d23dabac28dc 100644
--- a/www-apps/mantisbt/Manifest
+++ b/www-apps/mantisbt/Manifest
@@ -1,9 +1,7 @@
 AUX postinstall-en-1.0.0.txt 640 RMD160 1e0a077db936ab8c2a6bf06c9091d4b5194b0b9c SHA1 1fb4a3c4e32b7ddca4b37017e8c8101d8d0c83c7 SHA256 af60f6f6be915164f420f5e9ae04fa18d8bf85e73a9a59668ba4a6b7ba41900d
 DIST mantisbt-1.1.8.tar.gz 2428447 RMD160 a455bafa1cdba82e6e848840ef654441a38ecf1a SHA1 98f8c6169d994f413a58cdc711792bd0c806f078 SHA256 fbbf3f8a2b7452e84d8e4eea5ea39f1cb34e7d162cd572d9aa6b82562c64f3ed
-DIST mantisbt-1.2.1-git20100511.patch.bz2 53215 RMD160 ce9a0cc73592d049e292bb9f71e831ec7afa0d80 SHA1 e742ade3267f9621e8b7d640a944aae8025b5b84 SHA256 1d8afb5b3019a0fa689ae924ab3fc815e409f48f2c2f9990d6e7f00f8b506525
-DIST mantisbt-1.2.1.tar.gz 3193962 RMD160 a76fec872297382cf841838169f3b42e3019cb30 SHA1 abf97cb1237d79c49256de801491355d6edbf2fe SHA256 6f690d4945e6a891bde6f14070bbdd6975590f1bc651c76e9c4742f248d70424
+DIST mantisbt-1.2.2.tar.gz 3221348 RMD160 db2a4b6f1ff0a664d8f50b0c7de29105e139ebb7 SHA1 6c9ca86e6cf07cf85ca6b5bd326d12ed691507d7 SHA256 2ba72618ed77120c1c39ed4721c6ea14a655c197a37ee20780bc336dd5b47ffa
 EBUILD mantisbt-1.1.8.ebuild 1277 RMD160 6cc6ae6a3cf5062c17353eba42cd76551c03f997 SHA1 65efa47b98393cfa8bd20c04049116b6607aa9c7 SHA256 e12f8365ea1d25646c79e6779bacda2775fba3e26753f04147334dac1e31b181
-EBUILD mantisbt-1.2.1-r1.ebuild 1772 RMD160 d04b2291f896eb96d7f6ed140238646ee9d272b5 SHA1 35e3d3359143e5a88ff93f2c954d640f8e8d6cb4 SHA256 a9e92a21ef5f18ccd851b27c21afca543eedf599211bcb638a219c6c71d1c453
-EBUILD mantisbt-1.2.1.ebuild 1802 RMD160 026aaac9db85b6c249e29f2fbd5eacecd63118ad SHA1 74f004750c4aa445cc594fc89d832c1b1a7978f7 SHA256 63472fa6672b55ef9d2008d1af636759cf148a1997f24eecb9f5b4e4df0fd6f2
-MISC ChangeLog 13617 RMD160 d785759619863e5bc7daa67b4dfef2a8c62ff5c8 SHA1 e086656900c502b0fb4fcb983dd0ebb5c909d95a SHA256 77e4a5aa097a551e10b86959114d477785a61669dd8c5fd1a8db296185d017cf
+EBUILD mantisbt-1.2.2.ebuild 1681 RMD160 a522204d1eac422505a3a9c4791d8b79eabc4530 SHA1 9c5642ce0d2732a6989a9bc40adbdd82e5fcca3a SHA256 5aa5db72ce6f7328ffaefec4f921d7e0d1920bcb02fae54c21f6913a3433c3ee
+MISC ChangeLog 13820 RMD160 4c9aced7dd89f00246bcf7ba125e9da992b2fd02 SHA1 cfb2568659797c5d5dd5fed7de561b27af6e91c8 SHA256 56f10ba63a192890cc52505000b0eb9cc206f51fd5595f94a3fd4a106f646aef
 MISC metadata.xml 246 RMD160 7bde3c3aeda481e076adaab65b51a338aee24fb2 SHA1 9d36ce4b3731cd84f9451c529c737544dc63e66d SHA256 675aa3e54d27d05c15ac139906703b5f0886742fd1ce1468c964ad57ab51085b
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}