[bugzilla/el5: 35/35] update to 3.2.10

[Xavier Bachelot]

commit c035055ffb8402bcb0cf320bfce9ed2186afb972
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Tue May 3 00:38:27 2011 +0200

    update to 3.2.10

 bugzilla-EL5-perl-versions.patch |   12 ++++++------
 bugzilla-rw-paths.patch          |    2 +-
 bugzilla.spec                    |    8 ++++++--
 3 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/bugzilla-EL5-perl-versions.patch b/bugzilla-EL5-perl-versions.patch
index 93c7108..cd12361 100644
--- a/bugzilla-EL5-perl-versions.patch
+++ b/bugzilla-EL5-perl-versions.patch
@@ -17,12 +17,12 @@ diff -ruNp a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm b/bugzilla-3.2.4/Bu
          # Perl 5.10 requires CGI 3.33 due to a taint issue when
          # uploading attachments, see bug 416382.
          # Require CGI 3.21 for -httponly support, see bug 368502.
--        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.33' : '3.21'
-+        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.15' : '3.15'
+-        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.33' : '3.21',
++        version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.15' : '3.15',
+         # CGI::Carp in 3.46 and 3.47 breaks Template Toolkit
+         blacklist => ['^3\.46$', '^3\.47$'],
      },
-     {
-         package => 'TimeDate',
-@@ -92,7 +92,7 @@ sub REQUIRED_MODULES {
+@@ -97,7 +97,7 @@ sub REQUIRED_MODULES {
      {
          package => 'Email-MIME',
          module  => 'Email::MIME',
@@ -31,7 +31,7 @@ diff -ruNp a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm b/bugzilla-3.2.4/Bu
      },
      {
          package => 'Email-MIME-Encodings',
-@@ -103,7 +103,7 @@ sub REQUIRED_MODULES {
+@@ -108,7 +108,7 @@ sub REQUIRED_MODULES {
      {
          package => 'Email-MIME-Modifier',
          module  => 'Email::MIME::Modifier',
diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch
index a9ae59f..99b4586 100644
--- a/bugzilla-rw-paths.patch
+++ b/bugzilla-rw-paths.patch
@@ -11,8 +11,8 @@
 +        'datadir'     => "/var/lib/bugzilla/$datadir",
 +        'attachdir'   => "/var/lib/bugzilla/$datadir/attachments",
          'skinsdir'    => "$libpath/skins",
+         'graphsdir'   => "$libpath/graphs",
          # $webdotdir must be in the web server's tree somewhere. Even if you use a 
-         # local dot, we output images to there. Also, if $webdotdir is 
 @@ -475,8 +475,8 @@
          # change showdependencygraph.cgi to set image_url to the correct 
          # location.
diff --git a/bugzilla.spec b/bugzilla.spec
index caa0c9f..3386c9c 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,9 +4,9 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.2.6
+Version: 3.2.10
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -151,6 +151,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Tue May 03 2011 Xavier Bachelot <xavier at bachelot.org> - 3.2.10-1
+- Update to 3.2.10 for CVE-2010-4411, CVE-2010-4567, CVE-2010-4568,
+  CVE-2010-4569, CVE-2010-4570, CVE-2010-4572, CVE-2011-0046, CVE-2011-0048)
+
 * Tue Feb 02 2010 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.2.6-2
 - Use Linux requirements, not Windows'