Version bump, added some fixes from upstream. Remove unsed version.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

5 files changed, 80 insertions, 12 deletions

diff --git a/www-apps/mantisbt/ChangeLog b/www-apps/mantisbt/ChangeLog
index 96369a685be5..3e3fb5734808 100644
--- a/www-apps/mantisbt/ChangeLog
+++ b/www-apps/mantisbt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/mantisbt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.75 2008/11/07 12:28:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.76 2008/11/28 14:47:44 pva Exp $
+
+*mantisbt-1.1.5 (28 Nov 2008)
+
+  28 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +files/mantisbt-1.1.5-caching.patch,
+  +files/mantisbt-1.1.5-extensions.patch, -mantisbt-1.1.4-r3.ebuild,
+  +mantisbt-1.1.5.ebuild:
+  Version bump, added some fixes from upstream. Remove unsed version.
 
 *mantisbt-1.1.4-r3 (07 Nov 2008)
 
diff --git a/www-apps/mantisbt/Manifest b/www-apps/mantisbt/Manifest
index 74099c53f5e8..732d6d80f5f9 100644
--- a/www-apps/mantisbt/Manifest
+++ b/www-apps/mantisbt/Manifest
@@ -1,8 +1,10 @@
 AUX mantisbt-1.1.4-r5687:5688.patch 7409 RMD160 f299f1743d76835b2ee29cd176e0aa22f876b1bd SHA1 30971f39add7fb97d64a5950b669d60e4bb2d481 SHA256 4227ff9e21c6a251481f543db1c013a401fe2d2b36b8cce9935ec0548c14cde4
+AUX mantisbt-1.1.5-caching.patch 1257 RMD160 1fe3181dd5847dba28bd68632de2c0c4a23fd592 SHA1 ce263070593cccc87ed16244fde883fb7d6d5245 SHA256 fe4cd73f5298ec1135d653034add8a341cab863d548e730e7db286d69ad40e7c
+AUX mantisbt-1.1.5-extensions.patch 917 RMD160 3b058f21dcdf975c8677dac28016e3e81ba79a26 SHA1 904d9b07a728b8733c01af80f39d6571ae7d01e6 SHA256 158efde1abe5cc70d2c92ed46fcf6839efa2a598e5905092a0e4f0586547560b
 AUX postinstall-en-1.0.0.txt 640 RMD160 1e0a077db936ab8c2a6bf06c9091d4b5194b0b9c SHA1 1fb4a3c4e32b7ddca4b37017e8c8101d8d0c83c7 SHA256 af60f6f6be915164f420f5e9ae04fa18d8bf85e73a9a59668ba4a6b7ba41900d
 DIST mantis-1.1.4.tar.gz 2584719 RMD160 e67d3aa48e65498b7a75909a5976f21db9554d75 SHA1 7e64529508d3e35b98ae49c12b808998e669ef76 SHA256 1a691e720b1992723c4234c0c2a96babff2fa2d09ccd0524a87d3ee554250264
-DIST mantisbt-1.1.4-r5687:5752.patch.bz2 409069 RMD160 c6525fb1257989dd9dd7e1c1a3d34d70c354a646 SHA1 b8d350fcd57be99a6436dc3c5be9cd7680ff638b SHA256 b2782e1169572466bf1b90374a9f825094a006a2a5bee027dc1d80926dee84d1
+DIST mantisbt-1.1.5.tar.gz 2411502 RMD160 91e76cd1d17aee213b87d325d7de16d76dcc3835 SHA1 8cdf50c0d7c6e138efe9a59e62effcd94b2a01a8 SHA256 8ca4489bd1d70dddd9c30dfea0c598790f5fe97fdf1087420cf4048448c7bc1a
 EBUILD mantisbt-1.1.4-r2.ebuild 1372 RMD160 bb1458eb80904edbb26cf8765abbd0e1417ad5c3 SHA1 e120d46bd473112fa137df30a02df77cfe97069c SHA256 f74ecbbd65e5f4beb2198423be1a21109a1ccb51e740560e51a4e13dbbbce10a
-EBUILD mantisbt-1.1.4-r3.ebuild 1410 RMD160 081602a37e742115aad9bc056e21a91ff02434ac SHA1 75cc59b837285f4e9be86c66e4c6cef410b2a225 SHA256 ff4ed033eefaac9e42849776a77bdb211d047a03ba8652798a40fabe3e508466
-MISC ChangeLog 11505 RMD160 39d77e433a690f1c2f01d4ab0c88fdae1581e5cc SHA1 cb1f41868a1fad24c8208515a94e58b95259abf7 SHA256 a23a5dfb672eb5bdb6a05311ec445f1c187a8af933615c5f689dfb605de1f73a
+EBUILD mantisbt-1.1.5.ebuild 1362 RMD160 0a10b2dee8c7f2ba245000bd46030075004d80ce SHA1 9fcb1221fb1bc34891cae668643faa2f7a147ffe SHA256 228a182c9833b3e7152d8fcc1079e2e93f622d23a476ba7001ae3b08c6809198
+MISC ChangeLog 11786 RMD160 a87f7ce78c4aef3a878050c6f1f5d39b04842779 SHA1 747c7a1848f8030c04043848029277e21c3464dd SHA256 f3175b6ab4951b425124548cbd1d893fb7eb2a45a6b70a979f727dfef815c86f
 MISC metadata.xml 246 RMD160 7bde3c3aeda481e076adaab65b51a338aee24fb2 SHA1 9d36ce4b3731cd84f9451c529c737544dc63e66d SHA256 675aa3e54d27d05c15ac139906703b5f0886742fd1ce1468c964ad57ab51085b
diff --git a/www-apps/mantisbt/files/mantisbt-1.1.5-caching.patch b/www-apps/mantisbt/files/mantisbt-1.1.5-caching.patch
new file mode 100644
index 000000000000..aa8b83e42204
--- /dev/null
+++ b/www-apps/mantisbt/files/mantisbt-1.1.5-caching.patch
@@ -0,0 +1,41 @@
+From: John Reese <jreese@leetcode.net>
+Date: Mon, 24 Nov 2008 14:11:42 +0000 (-0500)
+Subject: Revert 4ee424e1, fix #9754, #9869, #9323 by adding Last-Modified headers to match... 
+X-Git-Url: http://git.mantisbt.org/?p=mantisbt.git;a=commitdiff_plain;h=161a677ee2b986507a06dbb65a9dfe848bd21935
+
+Revert 4ee424e1, fix #9754, #9869, #9323 by adding Last-Modified headers to match Expires.
+
+Commit has been tested on:
+ FF 2.0.14
+ FF 3.0.4
+ IE 8.0.6001.18241
+ IE 6.0.2900.5122
+ GC 0.4.154.23
+ Opera 9.51.10081
+---
+
+diff --git a/core.php b/core.php
+index 32fb66f..03c13c6 100644
+--- a/core.php
++++ b/core.php
+@@ -159,9 +159,9 @@
+ 
+ 		if ( isset( $g_allow_browser_cache ) && ON == $g_allow_browser_cache ) {
+ 			switch ( $t_browser_name ) {
+-			#case 'IE':
+-			#	header( 'Cache-Control: private, proxy-revalidate' );
+-			#	break;
++			case 'IE':
++				header( 'Cache-Control: private, proxy-revalidate' );
++				break;
+ 			default:
+ 				header( 'Cache-Control: private, must-revalidate' );
+ 				break;
+@@ -172,6 +172,7 @@
+ 		}
+ 
+ 		header( 'Expires: ' . gmdate( 'D, d M Y H:i:s \G\M\T', time() ) );
++		header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s \G\M\T', time() ) );
+ 
+ 		# SEND USER-DEFINED HEADERS
+ 		foreach( config_get( 'custom_headers' ) as $t_header ) {
diff --git a/www-apps/mantisbt/files/mantisbt-1.1.5-extensions.patch b/www-apps/mantisbt/files/mantisbt-1.1.5-extensions.patch
new file mode 100644
index 000000000000..3e13e8007a25
--- /dev/null
+++ b/www-apps/mantisbt/files/mantisbt-1.1.5-extensions.patch
@@ -0,0 +1,21 @@
+From: John Reese <jreese@leetcode.net>
+Date: Tue, 25 Nov 2008 19:54:32 +0000 (-0500)
+Subject: Fix #9890: improper comparison of file extensions in file_download.php
+X-Git-Url: http://git.mantisbt.org/?p=mantisbt.git;a=commitdiff_plain;h=99903fda7b565afc30a9ae9e37f9cae2053430ff
+
+Fix #9890: improper comparison of file extensions in file_download.php
+---
+
+diff --git a/file_download.php b/file_download.php
+index 067b03a..8074cc4 100644
+--- a/file_download.php
++++ b/file_download.php
+@@ -91,7 +91,7 @@
+ 	header( 'Content-Length: ' . $v_filesize );
+ 	$t_filename = file_get_display_name( $v_filename );
+ 	$t_inline_files = explode(',', config_get('inline_file_exts', 'gif'));
+-	if ( in_array( file_get_extension($t_filename), $t_inline_files ) ) {
++	if ( in_array( strtolower( file_get_extension($t_filename) ), $t_inline_files ) ) {
+ 		$t_disposition = ''; //'inline;';
+ 	} else {
+ 		$t_disposition = ' attachment;';
diff --git a/www-apps/mantisbt/mantisbt-1.1.4-r3.ebuild b/www-apps/mantisbt/mantisbt-1.1.5.ebuild
index 95b25dec88eb..22b1d65ec015 100644
--- a/www-apps/mantisbt/mantisbt-1.1.4-r3.ebuild
+++ b/www-apps/mantisbt/mantisbt-1.1.5.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.1.4-r3.ebuild,v 1.1 2008/11/07 12:28:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.1.5.ebuild,v 1.1 2008/11/28 14:47:44 pva Exp $
 
 inherit eutils webapp depend.php
 
-MY_P=mantis-${PV}
-
 DESCRIPTION="PHP/MySQL/Web based bugtracking system"
 HOMEPAGE="http://www.mantisbt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mirror://gentoo/${P}-r5687:5752.patch.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -20,8 +17,6 @@ RDEPEND="
 	virtual/httpd-cgi
 	dev-php/adodb"
 
-S=${WORKDIR}/${MY_P}
-
 pkg_setup() {
 	webapp_pkg_setup
 	has_php
@@ -32,7 +27,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm -r "${S}/core/adodb/" # We use external adodb
-	epatch "${WORKDIR}/${P}-r5687:5752.patch"
+	epatch "${FILESDIR}/${P}-caching.patch"
+	epatch "${FILESDIR}/${P}-extensions.patch"
 }
 
 src_install() {