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 ++++++++++------------
 main/rt4/APKBUILD                                  | 14 +++++++-------
 2 files changed, 17 insertions(+), 19 deletions(-)

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');
                  }
              }
diff --git a/main/rt4/APKBUILD b/main/rt4/APKBUILD
index b0a7182466..5333330504 100644
--- a/main/rt4/APKBUILD
+++ b/main/rt4/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rt4
-pkgver=4.2.7
+pkgver=4.2.9
 pkgrel=0
 pkgdesc="Request Tracker - issue and bug tracker"
 pkgusers="rt4"
@@ -172,15 +172,15 @@ package() {
 		"$pkgdir"/usr/local
 }
 
-md5sums="7bbb84476ea565eb53a3a1b99d5ff2a1  rt-4.2.7.tar.gz
-0f00f58ea2feb15ba0c56f4455feaae1  0001-email-allow-envelope-from-overriding-from-templates.patch
+md5sums="6d577abd9f5c374c18bff3550f3e7226  rt-4.2.9.tar.gz
+f05ff9fc3a6888e5b3f937697fbfd00f  0001-email-allow-envelope-from-overriding-from-templates.patch
 9c1cd44a5e177a73cf92f6790fe5cd78  rt-varpath.patch
 344258a3e066d23fb684b3013eb70cd0  rt-autoconf-version.patch"
-sha256sums="d1631333e6cf9d6fa7712da5160a5205aa581f88ca97e7a0092e5ce8aece8fea  rt-4.2.7.tar.gz
-c751d831ec9ad54ae7afd0276cbb36ef57bac291ce4b215000b7364dca20a74d  0001-email-allow-envelope-from-overriding-from-templates.patch
+sha256sums="1cbfe4f824637de45cc093ab87260ef9bbac11ba724b93c01f39a6d4e9592613  rt-4.2.9.tar.gz
+02db996b6f1b62b50364231b8ca4733bd95817c2a5c340b0934ba9f052ffbb50  0001-email-allow-envelope-from-overriding-from-templates.patch
 0d1905e29346d1a2a8e8bd5de7931721de872bccfdbb26421f3b6c00e39ca895  rt-varpath.patch
 8d7d8398af6a20f847e52408a2fb4b9ab15788cc84cd628fa65e11067df67250  rt-autoconf-version.patch"
-sha512sums="1b27d91b516d17ec8106a45b45b0f88f79d1786ed713ebda22af02faa7b3554956a5b579b985a6b5abdaababd9823746197a2bfa454e24caff439edb41c85035  rt-4.2.7.tar.gz
-a61cc81d025edf92598023f37517b06145a28edfdc31dfbc94ae2a1f8f13505d5512ad4e332376d46c1e4dd2fdb97569f127503eae3d4af6ce14f63e4e3c3f48  0001-email-allow-envelope-from-overriding-from-templates.patch
+sha512sums="a5a8b4cd1ca59a8e99a78634bd0fb6f4c9ac428b3088f5b3a8c87312a49b69273f332d3a6370c7be2d394ed2cd834f8b85b4bc1537f27e3687d79b17513d1aaa  rt-4.2.9.tar.gz
+eb850824299e40a98b547a41eb83efc4edd8e7a79a9704f6bd010f97261d0068dfdb7c435c294eba6fb244c8275d3fe076c173672e6ae329e5a8cb6337ccc782  0001-email-allow-envelope-from-overriding-from-templates.patch
 8a96b5482d649e373600e0b0e04abe382f61b0ed3ec463625163182fd71569c61c236e2cf48abd496f0d747b11b604acd1f958d8d891a2333bfde7450fb995d3  rt-varpath.patch
 cac79f231e1b1915962de8e4a86812fcaa0f1f64384a34557fac860c0fb0ae33d5dfd2371c30c07310391735e7348022e62bd5d453674a41ac7e77865d79dab9  rt-autoconf-version.patch"
-- 
cgit v1.2.3