From 32611682337a9034b397a584e5cb07f5f682731e Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 8 Sep 2010 01:48:41 +0000
Subject: [PATCH] Bug 516457: Bump the Email::MIME requirement to avoid a
 memory leak that jobqueue.pl was hitting. r=LpSolit, a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@261184 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                  |  2 +-
 .../bugzilla/Bugzilla/Install/Requirements.pm      | 14 ++------------
 mozilla/webtools/bugzilla/Bugzilla/Mailer.pm       |  2 --
 .../webtools/bugzilla/docs/en/xml/installation.xml | 12 ------------
 4 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index f8818bc3e35..a267f60626a 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7463
\ No newline at end of file
+7464
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
index 25dc15665a9..5ed2d7dcd36 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
@@ -116,18 +116,8 @@ sub REQUIRED_MODULES {
     {
         package => 'Email-MIME',
         module  => 'Email::MIME',
-        version => '1.861'
-    },
-    {
-        package => 'Email-MIME-Encodings',
-        module  => 'Email::MIME::Encodings',
-        # Fixes bug 486206
-        version => '1.313',
-    },
-    {
-        package => 'Email-MIME-Modifier',
-        module  => 'Email::MIME::Modifier',
-        version => '1.442'
+        # This fixes a memory leak in walk_parts that affected jobqueue.pl.
+        version => '1.904'
     },
     {
         package => 'URI',
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
index c8a99b8730a..d4a41b7638d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
@@ -48,8 +48,6 @@ use Encode qw(encode);
 use Encode::MIME::Header;
 use Email::Address;
 use Email::MIME;
-# Loading this gives us encoding_set.
-use Email::MIME::Modifier;
 use Email::Send;
 
 sub MessageToMTA {
diff --git a/mozilla/webtools/bugzilla/docs/en/xml/installation.xml b/mozilla/webtools/bugzilla/docs/en/xml/installation.xml
index b498acb810c..f311149b6bc 100644
--- a/mozilla/webtools/bugzilla/docs/en/xml/installation.xml
+++ b/mozilla/webtools/bugzilla/docs/en/xml/installation.xml
@@ -353,18 +353,6 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            Email::MIME::Encodings (&min-email-mime-encodings-ver;)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Email::MIME::Modifier (&min-email-mime-modifier-ver;)
-          </para>
-        </listitem>
-
         <listitem>
           <para>
             Template (&min-template-ver;)