From f4d32eaea96ffd135248adf9910d8c487562fcda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 31 Oct 2014 08:17:21 +0200
Subject: main/rt4: upgrade to 4.2.9

---
 ...w-envelope-from-overriding-from-templates.patch | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch')

diff --git a/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch b/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch
index 8e5df099c6..d82d58ab50 100644
--- a/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch
+++ b/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch
@@ -4,28 +4,26 @@ Subject: [PATCH] email: allow envelope from overriding from templates
 Add X-RT-Envelope-From header that will override the envelope
 from if using sendmailpipe mail sending.
 
-diff -ru rt-4.0.15.orig/lib/RT/Interface/Email.pm rt-4.0.15/lib/RT/Interface/Email.pm
---- rt-4.0.15.orig/lib/RT/Interface/Email.pm	2013-07-25 23:09:24.000000000 +0300
-+++ rt-4.0.15/lib/RT/Interface/Email.pm	2013-07-27 10:17:42.508546335 +0300
-@@ -376,7 +376,10 @@
- 
-     my $msgid = $args{'Entity'}->head->get('Message-ID') || '';
+diff -ru rt-4.2.9.orig/lib/RT/Interface/Email.pm rt-4.2.9/lib/RT/Interface/Email.pm
+--- rt-4.2.9.orig/lib/RT/Interface/Email.pm	2014-10-23 18:49:38.000000000 -0300
++++ rt-4.2.9/lib/RT/Interface/Email.pm	2014-10-31 08:14:48.557121324 -0200
+@@ -370,6 +370,9 @@
+     my $msgid = Encode::decode( "UTF-8", $args{'Entity'}->head->get('Message-ID') || '' );
      chomp $msgid;
--    
-+
+     
 +    my $envelope_from = $args{'Entity'}->head->get('X-RT-Envelope-From');
 +    chomp $envelope_from;
 +
      # If we don't have any recipients to send to, don't send a message;
      unless ( $args{'Entity'}->head->get('To')
          || $args{'Entity'}->head->get('Cc')
-@@ -442,7 +445,8 @@
+@@ -447,7 +450,8 @@
                  if ($QueueAddressOverride) {
                      $OutgoingMailAddress = $QueueAddressOverride;
                  } else {
--                    $OutgoingMailAddress ||= $TicketObj->QueueObj->CorrespondAddress
+-                    $OutgoingMailAddress ||= $Queue->CorrespondAddress
 +                    $OutgoingMailAddress ||= $envelope_from
-+                                             || $TicketObj->QueueObj->CorrespondAddress
-                                              || RT->Config->Get('CorrespondAddress');
++			|| $Queue->CorrespondAddress
+                         || RT->Config->Get('CorrespondAddress');
                  }
              }
-- 
cgit v1.2.3