Version bump, remove old.

Package-Manager: portage-2.2_rc31/cvs/Linux i686

6 files changed, 12 insertions, 348 deletions

diff --git a/www-apps/mantisbt/ChangeLog b/www-apps/mantisbt/ChangeLog
index e507dd1f4e0f..7f0bf3670590 100644
--- a/www-apps/mantisbt/ChangeLog
+++ b/www-apps/mantisbt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/mantisbt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.79 2009/01/04 17:31:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.80 2009/04/22 17:02:21 pva Exp $
+
+*mantisbt-1.1.7 (22 Apr 2009)
+
+  22 Apr 2009; Peter Volkov <pva@gentoo.org>
+  -files/mantisbt-1.1.4-r5687:5688.patch,
+  -files/mantisbt-1.1.5-caching.patch,
+  -files/mantisbt-1.1.5-extensions.patch, -mantisbt-1.1.4-r2.ebuild,
+  -mantisbt-1.1.5.ebuild, +mantisbt-1.1.7.ebuild:
+  Version bump, remove old.
 
   04 Jan 2009; Markus Meier <maekke@gentoo.org> mantisbt-1.1.6.ebuild:
   amd64/x86 stable, bug #252659
diff --git a/www-apps/mantisbt/files/mantisbt-1.1.4-r5687:5688.patch b/www-apps/mantisbt/files/mantisbt-1.1.4-r5687:5688.patch
deleted file mode 100644
index eed4dad1a5e4..000000000000
--- a/www-apps/mantisbt/files/mantisbt-1.1.4-r5687:5688.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-Index: lang/strings_english.txt
-===================================================================
---- lang/strings_english.txt	(revision 5688)
-+++ lang/strings_english.txt	(revision 5719)
-@@ -298,9 +298,11 @@
- $MANTIS_ERROR[ERROR_TAG_ALREADY_ATTACHED] = 'That tag already attached to that bug.';
- $MANTIS_ERROR[ERROR_TOKEN_NOT_FOUND] = 'Token could not be found.';
- $MANTIS_ERROR[ERROR_SESSION_HANDLER_INVALID] = 'Invalid session handler.';
--$MANTIS_ERROR[ERROR_SESSION_VAR_NOT_FOUND] = 'Session variable \'%s\' not found.';
-+$MANTIS_ERROR[ERROR_SESSION_VAR_NOT_FOUND] = 'Session variable "%s" not found.';
-+$MANTIS_ERROR[ERROR_SESSION_NOT_VALID] = 'Your session has become invalidated.';
- $MANTIS_ERROR[ERROR_FORM_TOKEN_INVALID] = 'Invalid form security token.  Did you submit the form twice by accident?';
- $MANTIS_ERROR[ERROR_INVALID_REQUEST_METHOD] = 'This page cannot be accessed using this method.';
-+$MANTIS_ERROR[ERROR_INVALID_SORT_FIELD] = 'Invalid sort field.';
- 
- $s_login_error = 'Your account may be disabled or blocked or the username/password you entered is incorrect.';
- $s_login_cookies_disabled = 'Your browser either doesn\'t know how to handle cookies, or refuses to handle them.';
-Index: account_page.php
-===================================================================
---- account_page.php	(revision 5688)
-+++ account_page.php	(revision 5719)
-@@ -94,6 +94,9 @@
- <div align="center">
- <form method="post" action="account_update.php">
- <?php  echo form_security_field( 'account_update' )?>
-+<?php if ( isset( $g_session_pass_id ) ) { ?>
-+<input type="hidden" name="session_id" value="<?php echo session_id() ?>"/>
-+<?php } ?>
- <table class="width75" cellspacing="1">
- 
- 	<!-- Headings -->
-Index: core/utility_api.php
-===================================================================
---- core/utility_api.php	(revision 5688)
-+++ core/utility_api.php	(revision 5719)
-@@ -192,10 +192,20 @@
- 			$t_factor = 1;
- 		}
- 
-+		if( empty( $p_array ) ) {
-+			return $p_array;
-+		}
-+		if( !is_array( current($p_array ) ) ) {
-+			error_parameters( 'tried to multisort an invalid multi-dimensional array' );
-+			trigger_error(ERROR_GENERIC, ERROR);
-+		}
-+
- 		// Security measure: see http://www.mantisbt.org/bugs/view.php?id=9704 for details
--		if ( array_key_exists( $p_key, $p_array ) ) {
--			$t_function = create_function( '$a, $b', "return $t_factor * strnatcasecmp( \$a['$p_key'], \$b['$p_key'] );" );
-+		if( array_key_exists( $p_key, current($p_array) ) ) {
-+			$t_function = create_function( '$a, $b', "return $t_factor * strnatcasecmp( \$a['" . $p_key . "'], \$b['" . $p_key . "'] );" );
- 			uasort( $p_array, $t_function );
-+		} else {
-+			trigger_error(ERROR_INVALID_SORT_FIELD, ERROR);
- 		}
- 		return $p_array;
- 	}
-Index: core/session_api.php
-===================================================================
---- core/session_api.php	(revision 5688)
-+++ core/session_api.php	(revision 5719)
-@@ -48,7 +48,7 @@
-  * to PHP's session.* settings in 'php.ini'.
-  */
- class MantisPHPSession extends MantisSession {
--	function __construct() {
-+	function __construct( $p_session_id=null ) {
- 		$t_session_save_path = config_get_global( 'session_save_path' );
- 		if ( $t_session_save_path ) {
- 			session_save_path( $t_session_save_path );
-@@ -60,6 +60,11 @@
- 		} else {
- 			session_set_cookie_params( 0, config_get( 'cookie_path' ), config_get( 'cookie_domain' ), false );
- 		}
-+
-+		if ( !is_null( $p_session_id ) ) {
-+			session_id( $p_session_id );
-+		}
-+
- 		session_start();
- 		$this->id = session_id();
- 	}
-@@ -102,13 +107,14 @@
- 
- /**
-  * Initialize the appropriate session handler.
-+ * @param string Session ID
-  */
--function session_init() {
-+function session_init( $p_session_id=null ) {
- 	global $g_session, $g_session_handler;
- 
- 	switch( strtolower( $g_session_handler ) ) {
- 		case 'php':
--			$g_session = new MantisPHPSession();
-+			$g_session = new MantisPHPSession( $p_session_id );
- 			break;
- 
- 		case 'adodb':
-@@ -119,9 +125,42 @@
- 			trigger_error( ERROR_SESSION_HANDLER_INVALID, ERROR );
- 			break;
- 	}
-+
-+	session_validate( $g_session );
- }
- 
- /**
-+ * Validate the legitimacy of a session.
-+ * Checks may include last-known IP address, or more.
-+ * Triggers an error when the session is invalid.
-+ * @param object Session object
-+ */
-+function session_validate( $p_session ) {
-+	$t_user_ip = '';
-+	if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-+		$t_user_ip = trim( $_SERVER['REMOTE_ADDR'] );
-+	}
-+
-+	if ( is_null( $t_last_ip = $p_session->get( 'last_ip', null ) ) ) {
-+		# First session usage
-+		$p_session->set( 'last_ip', $t_user_ip );
-+
-+	} else {
-+		# Check a continued session request
-+		if ( $t_user_ip != $t_last_ip ) {
-+			session_clean();
-+
-+			trigger_error( ERROR_SESSION_NOT_VALID, WARNING );
-+
-+			$t_url = config_get_global( 'path' ) . config_get_global( 'default_home_page' );
-+			echo "\t<meta http-equiv=\"Refresh\" content=\"4;URL=$t_url\" />\n";
-+
-+			die();
-+		}
-+	}
-+}
-+
-+/**
-  * Get arbitrary data from the session.
-  * @param string Session variable name
-  * @param mixed Default value
-@@ -190,4 +229,11 @@
- 
- 
- ##### Initialize the session
--session_init();
-+$t_session_id = gpc_get_string( 'session_id', '' );
-+
-+if ( empty( $t_session_id ) ) {
-+	session_init();
-+} else {
-+	session_init( $t_session_id );
-+}
-+
-Index: core/constant_inc.php
-===================================================================
---- core/constant_inc.php	(revision 5688)
-+++ core/constant_inc.php	(revision 5719)
-@@ -195,6 +195,7 @@
- 	define( 'ERROR_HANDLER_ACCESS_TOO_LOW',				17 );
- 	define( 'ERROR_PAGE_REDIRECTION',				18 );
- 	define( 'ERROR_INVALID_REQUEST_METHOD',		    19 );
-+	define( 'ERROR_INVALID_SORT_FIELD',				20 );
- 
- 	# ERROR_CONFIG_*
- 	define( 'ERROR_CONFIG_OPT_NOT_FOUND',			100 );
-@@ -326,6 +327,7 @@
- 	# ERROR_SESSION_*
- 	define ( 'ERROR_SESSION_HANDLER_INVALID', 2700);
- 	define ( 'ERROR_SESSION_VAR_NOT_FOUND',   2701);
-+	define ( 'ERROR_SESSION_NOT_VALID',	      2702);
- 
- 	# ERROR_FORM_*
- 	define ( 'ERROR_FORM_TOKEN_INVALID',	2800 );
-@@ -422,4 +424,3 @@
- 	define( 'SPONSORSHIP_REQUESTED',      1 );
- 	define( 'SPONSORSHIP_PAID',           2 );
- 
--?>
-Index: verify.php
-===================================================================
---- verify.php	(revision 5688)
-+++ verify.php	(revision 5719)
-@@ -40,6 +40,11 @@
- 	# force logout on the current user if already authenticated
- 	if( auth_is_user_authenticated() ) {
- 		auth_logout();
-+
-+		# (Re)initialize session
-+		session_regenerate_id();
-+		session_init();
-+		$g_session_pass_id = ON;
- 	}
- 
- 	$t_calculated_confirm_hash = auth_generate_confirm_hash( $f_user_id );
-@@ -49,7 +54,6 @@
- 	}
- 
- 	# set a temporary cookie so the login information is passed between pages.
--	auth_logout();
- 	auth_set_cookies( $f_user_id, false );
- 
- 	user_reset_failed_login_count_to_zero( $f_user_id );
-@@ -61,4 +65,4 @@
- 	user_increment_failed_login_count( $f_user_id );
- 
- 	include ( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'account_page.php' );
--?>
-+
-Index: core.php
-===================================================================
---- core.php	(revision 5688)
-+++ core.php	(revision 5719)
-@@ -145,7 +145,7 @@
- 	require_once( $t_core_path.'database_api.php' );
- 
- 	# Basic browser detection
--	$t_user_agent = $_SERVER['HTTP_USER_AGENT'];
-+	$t_user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'none';
- 
- 	$t_browser_name = 'Normal';
- 	if ( strpos( $t_user_agent, 'MSIE' ) ) {
diff --git a/www-apps/mantisbt/files/mantisbt-1.1.5-caching.patch b/www-apps/mantisbt/files/mantisbt-1.1.5-caching.patch
deleted file mode 100644
index aa8b83e42204..000000000000
--- a/www-apps/mantisbt/files/mantisbt-1.1.5-caching.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 3e13e8007a25..000000000000
--- a/www-apps/mantisbt/files/mantisbt-1.1.5-extensions.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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-r2.ebuild b/www-apps/mantisbt/mantisbt-1.1.4-r2.ebuild
deleted file mode 100644
index bc29070e1eac..000000000000
--- a/www-apps/mantisbt/mantisbt-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-r2.ebuild,v 1.3 2008/10/30 19:17:28 dertobi123 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"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	virtual/httpd-php
-	virtual/httpd-cgi
-	dev-php/adodb"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	require_php_with_use pcre
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -r "${S}/core/adodb/" # We use external adodb
-	epatch "${FILESDIR}/${P}-r5687:5688.patch"
-}
-
-src_install() {
-	webapp_src_preinst
-	rm doc/{LICENSE,INSTALL}
-	dodoc doc/*
-
-	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.1.5.ebuild b/www-apps/mantisbt/mantisbt-1.1.7.ebuild
index 22b1d65ec015..a86bf025905d 100644
--- a/www-apps/mantisbt/mantisbt-1.1.5.ebuild
+++ b/www-apps/mantisbt/mantisbt-1.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.1.5.ebuild,v 1.1 2008/11/28 14:47:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.1.7.ebuild,v 1.1 2009/04/22 17:02:21 pva Exp $
 
 inherit eutils webapp depend.php
 
@@ -27,8 +27,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm -r "${S}/core/adodb/" # We use external adodb
-	epatch "${FILESDIR}/${P}-caching.patch"
-	epatch "${FILESDIR}/${P}-extensions.patch"
 }
 
 src_install() {