From 25cc98b264d294e178584016adb00a413b58ca76 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <eseyman@fedoraproject.org>
Date: Mon, 1 Feb 2010 11:01:52 +0000
Subject: [PATCH] Update to 3.4.5

---
 .cvsignore                       |  2 +-
 bugzilla-EL5-perl-versions.patch | 33 --------------------------------
 bugzilla.spec                    |  8 +++++---
 sources                          |  2 +-
 4 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 bugzilla-EL5-perl-versions.patch

diff --git a/.cvsignore b/.cvsignore
index 851a37e..b5354fa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bugzilla-3.4.4.tar.gz
+bugzilla-3.4.5.tar.gz
diff --git a/bugzilla-EL5-perl-versions.patch b/bugzilla-EL5-perl-versions.patch
deleted file mode 100644
index 4ca70e3..0000000
--- a/bugzilla-EL5-perl-versions.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruNp a/bugzilla-3.4.1/Bugzilla/Constants.pm b/bugzilla-3.4.1/Bugzilla/Constants.pm
---- a/bugzilla-3.4.1/Bugzilla/Constants.pm	2009-08-01 11:28:41.000000000 -0300
-+++ b/bugzilla-3.4.1/Bugzilla/Constants.pm	2009-08-04 01:26:18.761892048 -0300
-@@ -400,7 +400,7 @@ use constant DB_MODULE => {
-                     # Disallow development versions
-                     blacklist => ['_'],
-                     # For UTF-8 support
--                    version => '4.00',
-+                    version => '3.00',
-                 },
-                 name => 'MySQL'},
-     'pg'    => {db => 'Bugzilla::DB::Pg', db_version => '8.00.0000',
-diff -ruNp a/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm b/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm
---- a/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm	2009-07-24 15:58:46.000000000 -0300
-+++ b/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm	2009-08-04 01:27:02.852909164 -0300
-@@ -118,7 +118,7 @@ sub REQUIRED_MODULES {
-     {
-         package => 'Email-MIME',
-         module  => 'Email::MIME',
--        version => '1.861'
-+        version => '1.859'
-     },
-     {
-         package => 'Email-MIME-Encodings',
-@@ -129,7 +129,7 @@ sub REQUIRED_MODULES {
-     {
-         package => 'Email-MIME-Modifier',
-         module  => 'Email::MIME::Modifier',
--        version => '1.442'
-+        version => '1.441'
-     },
-     {
-         package => 'URI',
diff --git a/bugzilla.spec b/bugzilla.spec
index 7e9c441..31e4474 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.4.4
+Version: 3.4.5
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
@@ -12,7 +12,6 @@ Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
-Patch1: bugzilla-EL5-perl-versions.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -59,7 +58,6 @@ Contributed scripts and functions for Bugzilla
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p2
 
 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
 # create a wrapper script which runs the original perl_requires
@@ -165,6 +163,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Feb 01 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.5-1
+- Update to 3.4.5 (CVE-2009-3989, CVE-2009-3387)
+- Remove bugzilla-EL5-perl-versions.patch which is EPEL-specific
+
 * Thu Nov 19 2009 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.4-1
 - Update to 3.4.4 (CVE-2009-3386)
 
diff --git a/sources b/sources
index 40c7b89..31fb27a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a59031c15fb79e9096c0a350c2382cfe  bugzilla-3.4.4.tar.gz
+42c7f6bf31be3198cbf1f55fffaff441  bugzilla-3.4.5.tar.gz