1.1.5 is too close so upstream asked to test this revision to avoid history with previous releases. Please test it! Removed broken versions.

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

6 files changed, 18 insertions, 440 deletions

diff --git a/www-apps/mantisbt/ChangeLog b/www-apps/mantisbt/ChangeLog
index 99ea9bbf8322..96369a685be5 100644
--- a/www-apps/mantisbt/ChangeLog
+++ b/www-apps/mantisbt/ChangeLog
@@ -1,6 +1,15 @@
 # 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.74 2008/10/30 19:17:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.75 2008/11/07 12:28:51 pva Exp $
+
+*mantisbt-1.1.4-r3 (07 Nov 2008)
+
+  07 Nov 2008; Peter Volkov <pva@gentoo.org>
+  -files/mantisbt-1.1.2-svn-5369:5587.patch,
+  -files/mantisbt-1.1.3-up-to-r5674.patch, -mantisbt-1.1.3-r1.ebuild,
+  -mantisbt-1.1.4.ebuild, +mantisbt-1.1.4-r3.ebuild:
+  1.1.5 is too close so upstream asked to test this revision to avoid
+  history with previous releases. Please test it! Removed broken versions.
 
   30 Oct 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   mantisbt-1.1.4-r2.ebuild:
diff --git a/www-apps/mantisbt/Manifest b/www-apps/mantisbt/Manifest
index d12ca2c3700f..74099c53f5e8 100644
--- a/www-apps/mantisbt/Manifest
+++ b/www-apps/mantisbt/Manifest
@@ -1,11 +1,8 @@
-AUX mantisbt-1.1.2-svn-5369:5587.patch 13382 RMD160 03554fd4c6eba042f1d1253060ed36bb92b5bb91 SHA1 1a6ea33d529766bc8d6fc6e5de4b3f136c44b4c1 SHA256 ed3ccb362606177c73b8d04d62d2a3c5cf688c0ddb5f350d741e59dd57c1a030
-AUX mantisbt-1.1.3-up-to-r5674.patch 2360 RMD160 0d8e21a81ba5da1611bc03cd6e1b752ce6199fb5 SHA1 59984531ad9424b81b165450e45409f564b64a5e SHA256 5db7457deb46ddc932a7f6515b96c966dca45d22a8ab2502577ad13c72a31387
 AUX mantisbt-1.1.4-r5687:5688.patch 7409 RMD160 f299f1743d76835b2ee29cd176e0aa22f876b1bd SHA1 30971f39add7fb97d64a5950b669d60e4bb2d481 SHA256 4227ff9e21c6a251481f543db1c013a401fe2d2b36b8cce9935ec0548c14cde4
 AUX postinstall-en-1.0.0.txt 640 RMD160 1e0a077db936ab8c2a6bf06c9091d4b5194b0b9c SHA1 1fb4a3c4e32b7ddca4b37017e8c8101d8d0c83c7 SHA256 af60f6f6be915164f420f5e9ae04fa18d8bf85e73a9a59668ba4a6b7ba41900d
-DIST mantis-1.1.3.tar.gz 2584361 RMD160 458ec548a44aa3396ce1934f6126b6b96115c2a4 SHA1 65f674eec289fecbf6db79e25fd7bd99d887e87f SHA256 d55acd7274ed36330e218f6b470a51518b4699f288b1efcabe8371670c212e41
 DIST mantis-1.1.4.tar.gz 2584719 RMD160 e67d3aa48e65498b7a75909a5976f21db9554d75 SHA1 7e64529508d3e35b98ae49c12b808998e669ef76 SHA256 1a691e720b1992723c4234c0c2a96babff2fa2d09ccd0524a87d3ee554250264
-EBUILD mantisbt-1.1.3-r1.ebuild 1367 RMD160 b6a680f3d1c6e6c3cfade5ffc3881306f307f71a SHA1 d200d1d063fd1e9e8302f8c94969ef7c4699b8f5 SHA256 5df0c0917a869edd3a57dbe35e7da370057a1bc3e49234ad39b3b2e7d5b69f13
+DIST mantisbt-1.1.4-r5687:5752.patch.bz2 409069 RMD160 c6525fb1257989dd9dd7e1c1a3d34d70c354a646 SHA1 b8d350fcd57be99a6436dc3c5be9cd7680ff638b SHA256 b2782e1169572466bf1b90374a9f825094a006a2a5bee027dc1d80926dee84d1
 EBUILD mantisbt-1.1.4-r2.ebuild 1372 RMD160 bb1458eb80904edbb26cf8765abbd0e1417ad5c3 SHA1 e120d46bd473112fa137df30a02df77cfe97069c SHA256 f74ecbbd65e5f4beb2198423be1a21109a1ccb51e740560e51a4e13dbbbce10a
-EBUILD mantisbt-1.1.4.ebuild 1322 RMD160 af574b629fcdeda4c42a9a8c3911a5dafa0faca1 SHA1 7253d24a864224deddf4116209f17eb603de472d SHA256 62002c23d433073442607395d33fb834019398b25c37aecfc9379281a862929b
-MISC ChangeLog 11119 RMD160 499c881a1de7b84b47ad9cb9d4b5da7382b6b309 SHA1 36f280a2e99de4b55028810c7b28d397339a5b65 SHA256 f3fabf68a9555e5f56753c3f91c546813fb2677f3434ca1e298f86c35b1c5c86
+EBUILD mantisbt-1.1.4-r3.ebuild 1410 RMD160 081602a37e742115aad9bc056e21a91ff02434ac SHA1 75cc59b837285f4e9be86c66e4c6cef410b2a225 SHA256 ff4ed033eefaac9e42849776a77bdb211d047a03ba8652798a40fabe3e508466
+MISC ChangeLog 11505 RMD160 39d77e433a690f1c2f01d4ab0c88fdae1581e5cc SHA1 cb1f41868a1fad24c8208515a94e58b95259abf7 SHA256 a23a5dfb672eb5bdb6a05311ec445f1c187a8af933615c5f689dfb605de1f73a
 MISC metadata.xml 246 RMD160 7bde3c3aeda481e076adaab65b51a338aee24fb2 SHA1 9d36ce4b3731cd84f9451c529c737544dc63e66d SHA256 675aa3e54d27d05c15ac139906703b5f0886742fd1ce1468c964ad57ab51085b
diff --git a/www-apps/mantisbt/files/mantisbt-1.1.2-svn-5369:5587.patch b/www-apps/mantisbt/files/mantisbt-1.1.2-svn-5369:5587.patch
deleted file mode 100644
index 5ef56e5fc727..000000000000
--- a/www-apps/mantisbt/files/mantisbt-1.1.2-svn-5369:5587.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Index: doc/ChangeLog
-===================================================================
---- doc/ChangeLog	(revision 5369)
-+++ doc/ChangeLog	(revision 5587)
-@@ -2,6 +2,8 @@
- 
- 2008.06.17  -  1.1.2
- ====================
-+This release focused on fixing few security issues; also includes assorted fixes for translations, usability and compatibility (most notably, with postgres) and a nasty memory leak on the string API causing incomplete rendering of pages. All users are advised to upgrade.
-+
- - 0008974: [security] XSS Vulnerability in filters (thraxisp) - closed.
- - 0008975: [security] CSRF Vulnerabilities in user_create (jreese) - closed.
- - 0008976: [security] Remote Code Execution in adm_config (giallu) - closed.
-Index: config_defaults_inc.php
-===================================================================
---- config_defaults_inc.php	(revision 5369)
-+++ config_defaults_inc.php	(revision 5587)
-@@ -149,6 +149,9 @@
- 	#   'memcached' -> Memcached storage sessions
- 	$g_session_handler = 'php';
- 
-+	# Session save path.  If false, uses default value as set by session handler.
-+	$g_session_save_path = false;
-+
- 	#############################
- 	# Configuration Settings
- 	#############################
-@@ -1938,4 +1941,4 @@
- 	
- 	# The twitter account password.
- 	$g_twitter_password = '';
--?>
-+
-Index: bug_graph_bystatus.php
-===================================================================
---- bug_graph_bystatus.php	(revision 5369)
-+++ bug_graph_bystatus.php	(revision 5587)
-@@ -148,6 +148,8 @@
- 	}
- 	
-     ksort($t_view_status);
-+    $t_label_string = lang_get('orct'); //use the (open/resolved/closed/total) label
-+    $t_label_strings = explode('/', substr($t_label_string, 1, strlen($t_label_string)-2));
-     
-     // add headers for table
-     if ($f_show_as_table) {
-@@ -159,9 +161,9 @@
-     	html_body_begin();
- 	    echo '<table class="width100"><tr><td></td>';
-         if ($f_summary) {
--            echo '<th>' . lang_get_defaulted('open') . '</th>';
--            echo '<th>' . lang_get_defaulted('resolved') . '</th>';
--            echo '<th>' . lang_get_defaulted('closed') . '</th>';
-+            echo '<th>' . $t_label_strings[0] . '</th>';
-+            echo '<th>' . $t_label_strings[1] . '</th>';
-+            echo '<th>' . $t_label_strings[2] . '</th>';
-         } else {
-             foreach ( $t_view_status as $t_status => $t_label ) {
-                 echo '<th>'.$t_label.' ('.$t_status.')</th>';
-@@ -176,9 +178,9 @@
- 	$t_labels = array();
- 	$i = 0;
-     if ($f_summary) {
--        $t_labels[++$i] = lang_get_defaulted('open');
--        $t_labels[++$i] = lang_get_defaulted('resolved');
--        $t_labels[++$i] = lang_get_defaulted('closed');
-+        $t_labels[++$i] = $t_label_strings[0];
-+        $t_labels[++$i] = $t_label_strings[1];
-+        $t_labels[++$i] = $t_label_strings[2];
-     } else {
-         foreach ( $t_view_status as $t_status => $t_label ) {
-             $t_labels[++$i] = isset($t_status_labels[$t_status]) ? $t_status_labels[$t_status] : lang_get_defaulted($t_label);
-@@ -228,6 +230,6 @@
-     	html_body_end();
-     	html_end();
-     } else {
--	    graph_bydate( $t_metrics, $t_labels, lang_get( 'by_category' ), $f_width, $f_width * $t_ar );
-+	    graph_bydate( $t_metrics, $t_labels, lang_get( 'by_status' ), $f_width, $f_width * $t_ar );
- 	}
- ?>
-\ No newline at end of file
-Index: manage_user_prune.php
-===================================================================
---- manage_user_prune.php	(revision 5369)
-+++ manage_user_prune.php	(revision 5587)
-@@ -1,4 +1,4 @@
--2<?php
-+<?php
- # Mantis - a php based bugtracking system
- 
- # Copyright (C) 2000 - 2002  Kenzaburo Ito - kenito@300baud.org
-Index: manage_proj_edit_page.php
-===================================================================
---- manage_proj_edit_page.php	(revision 5369)
-+++ manage_proj_edit_page.php	(revision 5587)
-@@ -527,7 +527,8 @@
- 				<td class="center">
- 				<?php
- 					# You need global permissions to edit custom field defs
--					print_button( "manage_proj_custom_field_remove.php?field_id={$t_field_id}&amp;project_id={$f_project_id}", lang_get( 'remove_link' ) );
-+					$t_remove_token = form_security_param( 'manage_proj_custom_field_remove' );
-+					print_button( "manage_proj_custom_field_remove.php?field_id={$t_field_id}&amp;project_id={$f_project_id}$t_remove_token", lang_get( 'remove_link' ) );
- 				?>
- 				</td>
- 			</tr>
-Index: core/bug_api.php
-===================================================================
---- core/bug_api.php	(revision 5369)
-+++ core/bug_api.php	(revision 5587)
-@@ -1264,9 +1264,6 @@
- 					# the relationship type is already set. Nothing to do
- 				}
- 				else if ( $t_id_relationship > 0 ) {
--					# there is already a relationship between them -> we have to update it and not to add a new one
--					helper_ensure_confirmed( lang_get( 'replace_relationship_sure_msg' ), lang_get( 'replace_relationship_button' ) );
--
- 					# Update the relationship
- 					relationship_update( $t_id_relationship, $p_bug_id, $p_duplicate_id, BUG_DUPLICATE );
- 
-Index: core/print_api.php
-===================================================================
---- core/print_api.php	(revision 5369)
-+++ core/print_api.php	(revision 5587)
-@@ -304,7 +304,7 @@
- 		?>
- 		<input type="hidden" id="tag_separator" value="<?php echo config_get( 'tag_separator' ) ?>" />
- 		<input type="text" name="tag_string" id="tag_string" size="40" value="<?php echo string_attribute( $p_string ) ?>" />
--		<select <?php echo helper_get_tab_index() ?> name="tag_select" id="tag_select">
-+		<select <?php echo helper_get_tab_index() ?> name="tag_select" id="tag_select" onchange="tag_string_append( this.options[ this.selectedIndex ].text );">
- 			<?php print_tag_option_list( $p_bug_id ); ?>
- 		</select>
- 		<?php
-@@ -334,7 +334,7 @@
- 
- 		echo '<option value="0">',lang_get( 'tag_existing' ),'</option>';
- 		while ( $row = db_fetch_array( $result ) ) {
--			echo '<option value="',$row['id'],'" onclick="tag_string_append(\'',$row['name'],'\')">',$row['name'],'</option>';
-+			echo '<option value="',$row['id'],'">',$row['name'],'</option>';
- 		}
- 	}
- 
-Index: core/user_api.php
-===================================================================
---- core/user_api.php	(revision 5369)
-+++ core/user_api.php	(revision 5587)
-@@ -655,10 +655,22 @@
- 		} else {
- 			$t_default_image = config_get( 'default_avatar' );
- 			$t_size = 80;
--			$t_avatar_url = "http://www.gravatar.com/avatar.php?gravatar_id=" . md5( $t_email ) .
--				"&amp;default=" . urlencode( $t_default_image ) .
--				"&amp;size=" . $t_size .
--				"&amp;rating=G";
-+
-+			$t_use_ssl = false;
-+			if ( isset( $_SERVER['HTTPS'] ) && ( strtolower( $_SERVER['HTTPS'] ) != 'off' ) ) {
-+				$t_use_ssl = true;
-+			}
-+
-+			if ( !$t_use_ssl ) {
-+				$t_gravatar_domain = 'http://www.gravatar.com/';
-+			} else {
-+				$t_gravatar_domain = 'https://secure.gravatar.com/';
-+			}
-+
-+			$t_avatar_url = $t_gravatar_domain . 'avatar.php?gravatar_id=' . md5( $t_email ) .
-+				'&amp;default=' . urlencode( $t_default_image ) .
-+				'&amp;size=' . $t_size .
-+				'&amp;rating=G';
- 			$t_result = array( $t_avatar_url, $t_size, $t_size );
- 		}
- 
-Index: core/bugnote_api.php
-===================================================================
---- core/bugnote_api.php	(revision 5369)
-+++ core/bugnote_api.php	(revision 5587)
-@@ -99,7 +99,7 @@
- 	# Add a bugnote to a bug
- 	#
- 	# return the ID of the new bugnote
--	function bugnote_add ( $p_bug_id, $p_bugnote_text, $p_time_tracking = '0:00', $p_private = false, $p_type = 0, $p_attr = '', $p_user_id = null ) {
-+	function bugnote_add ( $p_bug_id, $p_bugnote_text, $p_time_tracking = '0:00', $p_private = false, $p_type = 0, $p_attr = '', $p_user_id = null, $p_send_email = TRUE ) {
- 		$c_bug_id            	= db_prepare_int( $p_bug_id );
- 		$c_bugnote_text      	= db_prepare_string( $p_bugnote_text );
- 		$c_time_tracking	= db_prepare_time( $p_time_tracking );
-Index: core/session_api.php
-===================================================================
---- core/session_api.php	(revision 5369)
-+++ core/session_api.php	(revision 5587)
-@@ -49,6 +49,15 @@
-  */
- class MantisPHPSession extends MantisSession {
- 	function __construct() {
-+		$t_session_save_path = config_get_global( 'session_save_path' );
-+		if ( $t_session_save_path ) {
-+			session_save_path( $t_session_save_path );
-+		}
-+
-+		session_cache_limiter( 'private_no_expire' );
-+		if ( isset( $_SERVER['HTTPS'] ) && ( strtolower( $_SERVER['HTTPS'] ) != 'off' ) ) {
-+			session_set_cookie_params( 0, config_get( 'cookie_path' ), config_get( 'cookie_domain' ), true, true );
-+		}
- 		session_start();
- 		$this->id = session_id();
- 	}
-Index: core/string_api.php
-===================================================================
---- core/string_api.php	(revision 5369)
-+++ core/string_api.php	(revision 5587)
-@@ -306,7 +306,7 @@
- 		if ( !isset( $string_process_bug_link_callback[$p_include_anchor][$p_detail_info][$p_fqdn] ) ) {
- 			if ($p_include_anchor) {
- 				$string_process_bug_link_callback[$p_include_anchor][$p_detail_info][$p_fqdn] = create_function('$p_array','
--										if (bug_exists( (int)$p_array[2] ) ) { 
-+										if ( bug_exists( (int)$p_array[2] ) && access_has_bug_level( VIEWER, (int)$p_array[2] ) ) {
- 											return $p_array[1] . string_get_bug_view_link( (int)$p_array[2], null, ' . ($p_detail_info ? 'true' : 'false') . ', ' . ($p_fqdn ? 'true' : 'false') . ');
- 										} else {    	
- 											return $p_array[0];
-Index: bug_update.php
-===================================================================
---- bug_update.php	(revision 5369)
-+++ bug_update.php	(revision 5587)
-@@ -31,8 +31,6 @@
- 	require_once( $t_core_path.'bugnote_api.php' );
- 	require_once( $t_core_path.'custom_field_api.php' );
- 
--	form_security_validate( 'bug_update' );
--
- 	$f_bug_id = gpc_get_int( 'bug_id' );
- 	$f_update_mode = gpc_get_bool( 'update_mode', FALSE ); # set if called from generic update page
- 	$f_new_status	= gpc_get_int( 'status', bug_get_field( $f_bug_id, 'status' ) );
-@@ -140,6 +138,8 @@
- 		}
- 	}
- 
-+	form_security_validate( 'bug_update' );
-+
- 	$t_notify = true;
- 	$t_bug_note_set = false;
- 	if ( ( $t_old_bug_status != $t_bug_data->status ) && ( FALSE == $f_update_mode ) ) {
-Index: manage_config_work_threshold_page.php
-===================================================================
---- manage_config_work_threshold_page.php	(revision 5369)
-+++ manage_config_work_threshold_page.php	(revision 5587)
-@@ -322,6 +322,7 @@
- 	
- 	if ( $t_show_submit && ( 0 < count( $t_overrides ) ) ) {
-         echo "<div class=\"right\"><form name=\"threshold_config_action\" method=\"post\" action=\"manage_config_revert.php\">\n";
-+		echo form_security_field( 'manage_config_revert' );
-         echo "<input name=\"revert\" type=\"hidden\" value=\"" . implode( ',', $t_overrides ) . "\"></input>";
-         echo "<input name=\"project\" type=\"hidden\" value=\"$t_project_id\"></input>";
-         echo "<input name=\"return\" type=\"hidden\" value=\"" . $_SERVER['PHP_SELF'] ."\"></input>";
-Index: adm_config_set.php
-===================================================================
---- adm_config_set.php	(revision 5369)
-+++ adm_config_set.php	(revision 5587)
-@@ -81,7 +81,7 @@
- 		# 2. simple arrays with the form: array( a, b, c, d )
- 		# 3. associative arrays with the form: array( a=>1, b=>2, c=>3, d=>4 )
- 		$t_full_string = trim( $f_value );
--		if ( preg_match('/array\((.*)\)/', $t_full_string, $t_match ) === 1 ) {
-+		if ( preg_match('/array[\s]*\((.*)\)/', $t_full_string, $t_match ) === 1 ) {
- 			// we have an array here
- 			$t_values = split( ',', trim( $t_match[1] ) );
- 			foreach ( $t_values as $key => $value ) {
-Index: roadmap_page.php
-===================================================================
---- roadmap_page.php	(revision 5369)
-+++ roadmap_page.php	(revision 5587)
-@@ -195,7 +195,7 @@
- 				$t_issue_id = $t_issue_ids[$k];
- 				$t_issue_parent = $t_issue_parents[$k];
- 				
--				if ( in_array( $t_issue_id, $t_cycle_ids ) || in_array( $t_parent_id, $t_cycle_ids ) ) {
-+				if ( in_array( $t_issue_id, $t_cycle_ids ) || in_array( $t_issue_parent, $t_cycle_ids ) ) {
- 					$t_cycle = true;
- 				} else {
- 					$t_cycle = false;
-Index: core.php
-===================================================================
---- core.php	(revision 5369)
-+++ core.php	(revision 5587)
-@@ -144,15 +144,33 @@
- 	# OPENED ANYWHERE ELSE.
- 	require_once( $t_core_path.'database_api.php' );
- 
-+	# Basic browser detection
-+	$t_user_agent = $_SERVER['HTTP_USER_AGENT'];
-+
-+	$t_browser_name = 'Normal';
-+	if ( strpos( $t_user_agent, 'MSIE' ) ) {
-+		$t_browser_name = 'IE';
-+	}
-+
- 	# Headers to prevent caching
- 	#  with option to bypass if running from script
- 	global $g_bypass_headers, $g_allow_browser_cache;
- 	if ( !isset( $g_bypass_headers ) && !headers_sent() ) {
--		if ( ! isset( $g_allow_browser_cache ) ) {
--			header( 'Pragma: no-cache' );
-+
-+		if ( isset( $g_allow_browser_cache ) ) {
-+			switch ( $t_browser_name ) {
-+			case 'IE':
-+				header( 'Cache-Control: private, proxy-revalidate' );
-+				break;
-+			default:
-+				header( 'Cache-Control: private, must-revalidate' );
-+				break;
-+			}
-+
-+		} else {
- 			header( 'Cache-Control: no-store, no-cache, must-revalidate' );
--			header( 'Cache-Control: post-check=0, pre-check=0', false );
- 		}
-+
- 		header( 'Expires: ' . gmdate( 'D, d M Y H:i:s \G\M\T', time() ) );
- 
- 		# SEND USER-DEFINED HEADERS
diff --git a/www-apps/mantisbt/files/mantisbt-1.1.3-up-to-r5674.patch b/www-apps/mantisbt/files/mantisbt-1.1.3-up-to-r5674.patch
deleted file mode 100644
index 8323bfbc65c3..000000000000
--- a/www-apps/mantisbt/files/mantisbt-1.1.3-up-to-r5674.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: bug_report_page.php
-===================================================================
---- bug_report_page.php	(revision 5664)
-+++ bug_report_page.php	(revision 5674)
-@@ -112,6 +112,7 @@
- <br />
- <div align="center">
- <form name="report_bug_form" method="post" <?php if ( file_allow_bug_upload() ) { echo 'enctype="multipart/form-data"'; } ?> action="bug_report.php">
-+<?php echo form_security_field( 'bug_report' ) ?>
- <table class="width75" cellspacing="1">
- 
- 
-Index: bug_report_advanced_page.php
-===================================================================
---- bug_report_advanced_page.php	(revision 5664)
-+++ bug_report_advanced_page.php	(revision 5674)
-@@ -131,6 +131,7 @@
- <br />
- <div align="center">
- <form name="report_bug_form" method="post" <?php if ( file_allow_bug_upload() ) { echo 'enctype="multipart/form-data"'; } ?> action="bug_report.php">
-+<?php echo form_security_field( 'bug_report' ) ?>
- <table class="width75" cellspacing="1">
- 
- 
-Index: config_defaults_inc.php
-===================================================================
---- config_defaults_inc.php	(revision 5664)
-+++ config_defaults_inc.php	(revision 5674)
-@@ -85,7 +85,8 @@
- 		}
- 
- 		if ( isset( $_SERVER['HTTP_X_FORWARDED_HOST'] ) ) { // Support ProxyPass
--			$t_host = $_SERVER['HTTP_X_FORWARDED_HOST'];
-+			$t_hosts = split( ',', $_SERVER['HTTP_X_FORWARDED_HOST'] );
-+			$t_host = $t_hosts[0];
- 		} else if ( isset( $_SERVER['HTTP_HOST'] ) ) {
- 			$t_host = $_SERVER['HTTP_HOST'];
- 		} else if ( isset( $_SERVER['SERVER_NAME'] ) ) {
-Index: core/session_api.php
-===================================================================
---- core/session_api.php	(revision 5664)
-+++ core/session_api.php	(revision 5674)
-@@ -56,9 +56,9 @@
- 
- 		session_cache_limiter( 'private_no_expire' );
- 		if ( isset( $_SERVER['HTTPS'] ) && ( strtolower( $_SERVER['HTTPS'] ) != 'off' ) ) {
--			session_set_cookie_params( 0, config_get( 'cookie_path' ), config_get( 'cookie_domain' ), true, true );
-+			session_set_cookie_params( 0, config_get( 'cookie_path' ), config_get( 'cookie_domain' ), true );
- 		} else {
--			session_set_cookie_params( 0, config_get( 'cookie_path' ), config_get( 'cookie_domain' ), false, true );
-+			session_set_cookie_params( 0, config_get( 'cookie_path' ), config_get( 'cookie_domain' ), false );
- 		}
- 		session_start();
- 		$this->id = session_id();
diff --git a/www-apps/mantisbt/mantisbt-1.1.3-r1.ebuild b/www-apps/mantisbt/mantisbt-1.1.3-r1.ebuild
deleted file mode 100644
index ef3bf8ff8a24..000000000000
--- a/www-apps/mantisbt/mantisbt-1.1.3-r1.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.3-r1.ebuild,v 1.3 2008/10/16 18:46:24 maekke 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}"
-	epatch "${FILESDIR}/${P}-up-to-r5674.patch"
-	rm -r "${S}"/core/adodb/ # We use external adodb
-}
-
-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.4.ebuild b/www-apps/mantisbt/mantisbt-1.1.4-r3.ebuild
index c47470d5ea87..95b25dec88eb 100644
--- a/www-apps/mantisbt/mantisbt-1.1.4.ebuild
+++ b/www-apps/mantisbt/mantisbt-1.1.4-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2008/10/19 14:36:27 maekke Exp $
+# $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 $
 
 inherit eutils webapp depend.php
 
@@ -8,10 +8,11 @@ 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"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	mirror://gentoo/${P}-r5687:5752.patch.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
@@ -31,6 +32,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	rm -r "${S}/core/adodb/" # We use external adodb
+	epatch "${WORKDIR}/${P}-r5687:5752.patch"
 }
 
 src_install() {