Fixed inability to report issues in mantis, reported in bug #241940 by Marek Królikowski.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-openvz.git-777e816 i686

4 files changed, 68 insertions, 4 deletions

diff --git a/www-apps/mantisbt/ChangeLog b/www-apps/mantisbt/ChangeLog
index 5bafc197d173..1759fa9aa64d 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.65 2008/10/14 11:55:08 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.66 2008/10/15 17:07:41 pva Exp $
+
+*mantisbt-1.1.3-r1 (15 Oct 2008)
+
+  15 Oct 2008; Peter Volkov <pva@gentoo.org>
+  +files/mantisbt-1.1.3-up-to-r5674.patch, -mantisbt-1.1.3.ebuild,
+  +mantisbt-1.1.3-r1.ebuild:
+  Fixed inability to report issues in mantis, reported in bug #241940 by
+  Marek Królikowski.
 
 *mantisbt-1.1.3 (14 Oct 2008)
 
diff --git a/www-apps/mantisbt/Manifest b/www-apps/mantisbt/Manifest
index f0701412143c..2403306e60b1 100644
--- a/www-apps/mantisbt/Manifest
+++ b/www-apps/mantisbt/Manifest
@@ -1,8 +1,9 @@
 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 postinstall-en-1.0.0.txt 640 RMD160 1e0a077db936ab8c2a6bf06c9091d4b5194b0b9c SHA1 1fb4a3c4e32b7ddca4b37017e8c8101d8d0c83c7 SHA256 af60f6f6be915164f420f5e9ae04fa18d8bf85e73a9a59668ba4a6b7ba41900d
 DIST mantis-1.1.2.tar.gz 2582860 RMD160 251a7daee876468ebe63e72df72824a85680dcc8 SHA1 291026ca4135961faf97597280cdc2a766b89e3c SHA256 f352e21bbb21168425e0faee40a98d8c0745ada48cd508112a2985e8245a2e83
 DIST mantis-1.1.3.tar.gz 2584361 RMD160 458ec548a44aa3396ce1934f6126b6b96115c2a4 SHA1 65f674eec289fecbf6db79e25fd7bd99d887e87f SHA256 d55acd7274ed36330e218f6b470a51518b4699f288b1efcabe8371670c212e41
 EBUILD mantisbt-1.1.2-r1.ebuild 1394 RMD160 5ccf8467c6d983604e3fe2c32c12ba4cbc7f8cf5 SHA1 7feb30d4608e3b81cbbfd571741f97373d5d03ec SHA256 0ff6dfd9d935f7530b25b19d4235d70a4d1a4ae82af10392e9b696b4e9fcd266
-EBUILD mantisbt-1.1.3.ebuild 1319 RMD160 3f8e742640c502759eceac2adc615eef6bf1b051 SHA1 9698d3f7bbf00e8079899761a9183122c01dff5d SHA256 bbee0c7eb8908d0e8c56d1806eb2a5551dd15ee61628d59b40ee1b2503fe0563
-MISC ChangeLog 9584 RMD160 3aefcee6da55242a42be1be1cd679ab301b74879 SHA1 98ebc72dfc0b441e2ae8dc752c406b80603fdc1e SHA256 8ce66379ddb389ae0f9cfcfce68198c121a687195ec551827f6fbc36abc3c0a9
+EBUILD mantisbt-1.1.3-r1.ebuild 1367 RMD160 e834f15557ec4027f99b9fe3b3f394d7ea73db5b SHA1 cc0783e53efaffa8fc2595556dd0127bf2a61973 SHA256 5bdf5e07dfe1da8ec19870373178884f35f163f1b0f20cfe992e10bf4435292e
+MISC ChangeLog 9855 RMD160 52577471cf8f6874744d59143e7f32e73a9792cc SHA1 57934abdea0b5bdbe7a08d4a61abe28f3d4ad1b3 SHA256 4d30ca16c89466b0829961f7671ad803ffebb86161186fd4e03ae5eea1d470af
 MISC metadata.xml 246 RMD160 7bde3c3aeda481e076adaab65b51a338aee24fb2 SHA1 9d36ce4b3731cd84f9451c529c737544dc63e66d SHA256 675aa3e54d27d05c15ac139906703b5f0886742fd1ce1468c964ad57ab51085b
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
new file mode 100644
index 000000000000..8323bfbc65c3
--- /dev/null
+++ b/www-apps/mantisbt/files/mantisbt-1.1.3-up-to-r5674.patch
@@ -0,0 +1,54 @@
+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.ebuild b/www-apps/mantisbt/mantisbt-1.1.3-r1.ebuild
index 58a264af308f..37db2cb2ad55 100644
--- a/www-apps/mantisbt/mantisbt-1.1.3.ebuild
+++ b/www-apps/mantisbt/mantisbt-1.1.3-r1.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.3.ebuild,v 1.1 2008/10/14 11:55:08 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.1.3-r1.ebuild,v 1.1 2008/10/15 17:07:41 pva Exp $
 
 inherit eutils webapp depend.php
 
@@ -30,6 +30,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}-up-to-r5674.patch"
 	rm -r "${S}"/core/adodb/ # We use external adodb
 }