[mantis] Update to 1.2.12
Gianluca Sforna
giallu at fedoraproject.org
Wed Nov 14 23:54:53 UTC 2012
commit d0f9c94afc80a49d5271393d56618447de7f02fb
Author: Gianluca Sforna <giallu at gmail.com>
Date: Thu Nov 15 00:54:22 2012 +0100
Update to 1.2.12
.gitignore | 1 +
... => mantis-1.2.12-install_no_write_config.patch | 18 +++++++++-------
...com.patch => mantis-1.2.12-no_example_com.patch | 21 +++++++++----------
mantis-1.2.12-use_systems_phpmailer.patch | 12 ++++++++++
mantis-1.2.3-use_systems_phpmailer.patch | 13 -----------
mantis.spec | 22 ++++++++++++++-----
sources | 2 +-
7 files changed, 50 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8b711c..02ece68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ mantisbt-1.1.8.tar.gz
/mantisbt-1.2.3.tar.gz
/mantisbt-1.2.4.tar.gz
/mantisbt-1.2.8.tar.gz
+/mantisbt-1.2.12.tar.gz
diff --git a/mantis-1.2.8-install_no_write_config.patch b/mantis-1.2.12-install_no_write_config.patch
similarity index 91%
rename from mantis-1.2.8-install_no_write_config.patch
rename to mantis-1.2.12-install_no_write_config.patch
index cd49ca2..db2e000 100644
--- a/mantis-1.2.8-install_no_write_config.patch
+++ b/mantis-1.2.12-install_no_write_config.patch
@@ -1,6 +1,7 @@
---- mantisbt-1.2.8.orig/admin/install.php 2011-09-06 16:23:10.000000000 +0200
-+++ mantisbt-1.2.8/admin/install.php 2011-09-07 12:07:59.139218945 +0200
-@@ -398,10 +398,18 @@
+diff -u -aur mantisbt-1.2.12.orig/admin/install.php mantisbt-1.2.12/admin/install.php
+--- mantisbt-1.2.12.orig/admin/install.php 2012-11-12 00:10:40.000000000 +0100
++++ mantisbt-1.2.12/admin/install.php 2012-11-15 00:24:29.567983203 +0100
+@@ -412,10 +412,18 @@
<?php if( !$g_database_upgrade ) {?>
<tr>
<td>
@@ -18,8 +19,8 @@
- <select name="db_type">
+ <select disabled="true" name="db_type">
<?php
- if( $f_db_type == 'mysql' ) {
- echo '<option value="mysql" selected="selected">MySQL (default)</option>';
+ // Build selection list of available DB types
+ $t_db_list = array(
@@ -451,7 +459,7 @@
Hostname (for Database Server)
</td>
@@ -67,7 +68,7 @@
- <span class="title">Write Configuration File(s)</span>
- </td>
-</tr>
-
+-
-<tr>
- <td bgcolor="#ffffff">
- <?php
@@ -86,7 +87,6 @@
- $t_config .= "\t\$g_database_name = '$f_database_name';\r\n";
- $t_config .= "\t\$g_db_username = '$f_db_username';\r\n";
- $t_config .= "\t\$g_db_password = '$f_db_password';\r\n";
-+ // FEDORA PATCH: Removed config_inc.php manipulation code
- if( $f_db_type == 'db2' ) {
- $t_config .= "\t\$g_db_schema = '$f_db_schema';\r\n";
@@ -130,10 +130,12 @@
- echo '<tr><td><pre>' . htmlentities( $t_config ) . '</pre></td></tr></table></tr>';
- }
- ?>
--
++ // FEDORA PATCH: Removed config_inc.php manipulation code
+
-</table>
-
-<?php
if( false == $g_failed ) {
$t_install_state++;
}
+Only in mantisbt-1.2.12/admin: install.php.orig
diff --git a/mantis-1.2.0-no_example_com.patch b/mantis-1.2.12-no_example_com.patch
similarity index 62%
rename from mantis-1.2.0-no_example_com.patch
rename to mantis-1.2.12-no_example_com.patch
index 5dfdffd..51ae26d 100644
--- a/mantis-1.2.0-no_example_com.patch
+++ b/mantis-1.2.12-no_example_com.patch
@@ -1,20 +1,19 @@
-diff --git a/config_inc.php.sample b/config_inc.php.sample
-index 9bfe76b..aa6e021 100644
---- a/config_inc.php.sample
-+++ b/config_inc.php.sample
-@@ -50,11 +50,11 @@ $g_phpMailer_method = PHPMAILER_METHOD_MAIL; # or PHPMAILER_METHOD_SMTP, PHPMAI
+diff -u -aur mantisbt-1.2.12.orig/config_inc.php.sample mantisbt-1.2.12/config_inc.php.sample
+--- mantisbt-1.2.12.orig/config_inc.php.sample 2012-11-12 00:10:40.000000000 +0100
++++ mantisbt-1.2.12/config_inc.php.sample 2012-11-15 00:27:19.247430384 +0100
+@@ -51,10 +51,10 @@
$g_smtp_host = 'localhost'; # used with PHPMAILER_METHOD_SMTP
$g_smtp_username = ''; # used with PHPMAILER_METHOD_SMTP
$g_smtp_password = ''; # used with PHPMAILER_METHOD_SMTP
-$g_administrator_email = 'administrator at example.com';
-$g_webmaster_email = 'webmaster at example.com';
-+$g_administrator_email = 'administrator at localhost';
-+$g_webmaster_email = 'webmaster at localhost';
- $g_from_name = 'Mantis Bug Tracker';
-$g_from_email = 'noreply at example.com'; # the "From: " field in emails
-$g_return_path_email = 'admin at example.com'; # the return address for bounced mail
++$g_administrator_email = 'administrator at localhost';
++$g_webmaster_email = 'webmaster at localhost';
+$g_from_email = 'noreply at localhost'; # the "From: " field in emails
+$g_return_path_email = 'admin at localhost'; # the return address for bounced mail
- $g_email_receive_own = OFF;
- $g_email_send_using_cronjob = OFF;
-
+ # $g_from_name = 'Mantis Bug Tracker';
+ # $g_email_receive_own = OFF;
+ # $g_email_send_using_cronjob = OFF;
+Only in mantisbt-1.2.12: .config_inc.php.sample.swp
diff --git a/mantis-1.2.12-use_systems_phpmailer.patch b/mantis-1.2.12-use_systems_phpmailer.patch
new file mode 100644
index 0000000..3c1da29
--- /dev/null
+++ b/mantis-1.2.12-use_systems_phpmailer.patch
@@ -0,0 +1,12 @@
+diff -u -aur mantisbt-1.2.12.orig/core/email_api.php mantisbt-1.2.12/core/email_api.php
+--- mantisbt-1.2.12.orig/core/email_api.php 2012-11-12 00:10:40.000000000 +0100
++++ mantisbt-1.2.12/core/email_api.php 2012-11-15 00:34:41.010358106 +0100
+@@ -53,7 +53,7 @@
+ /**
+ * requires PHPMailer library
+ */
+-require_once( 'phpmailer' . DIRECTORY_SEPARATOR . 'class.phpmailer.php' );
++require_once( 'PHPMailer/class.phpmailer.php' );
+
+ /**
+ * reusable object of class SMTP
diff --git a/mantis.spec b/mantis.spec
index 57fc3f9..4b8739e 100644
--- a/mantis.spec
+++ b/mantis.spec
@@ -5,8 +5,8 @@
Summary: Web-based issue tracking system
Name: mantis
-Version: 1.2.8
-Release: 3%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://www.mantisbt.org/
@@ -15,14 +15,14 @@ Source0: http://downloads.sourceforge.net/mantisbt/mantisbt-%{version}.tar.gz
Source1: mantis-README.Fedora
# Admin is supposed to edit /etc/mantis/config_inc.php
-Patch0: mantis-1.2.8-install_no_write_config.patch
+Patch0: mantis-1.2.12-install_no_write_config.patch
-Patch1: mantis-1.2.0-no_example_com.patch
+Patch1: mantis-1.2.12-no_example_com.patch
# We secure admin/ with httpd directives
Patch2: mantis-1.2.4-do_not_warn_on_admin_directory.patch
Patch3: mantis-1.2.3-use_systems_nusoap.patch
-Patch4: mantis-1.2.3-use_systems_phpmailer.patch
+Patch4: mantis-1.2.12-use_systems_phpmailer.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -153,6 +153,15 @@ rm -rf "${RPM_BUILD_ROOT}"
%changelog
+* Thu Nov 15 2012 Gianluca Sforna <giallu at gmail.com> - 1.2.12-1
+- New upstream release
+- Rebase patches
+- Fix CVE-2012-2691 (#830735)
+- Fix CVE-2012-2692 (#830737)
+- Fix CVE-2012-1118, CVE-2012-1119, CVE-2012-1120, CVE-2012-1121, CVE-2012-1122, CVE-2012-1123
+ (#800665)
+- Fix CVE-2012-5522 CVE-2012-5523 (#876371)
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
@@ -161,7 +170,8 @@ rm -rf "${RPM_BUILD_ROOT}"
* Wed Sep 7 2011 Gianluca Sforna <giallu at gmail.com> - 1.2.8-1
- New upstream release
-- Fixes several security issues CVE-2011-2938 (#731777)
+- Fix several security issues CVE-2011-2938 (#731777)
+- Fix CVE-2011-3356 CVE-2011-3357 CVE-2011-3358 CVE-2011-3578 (#735514)
- Rebase Patch0
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-2
diff --git a/sources b/sources
index e1cb1e7..4e5ea54 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-054035ba0ebfc8997e10e2bc75d39483 mantisbt-1.2.8.tar.gz
+8b84b024fc71c6327a481ce816df5325 mantisbt-1.2.12.tar.gz
More information about the scm-commits
mailing list