main/rt4: upgrade to 4.0.15

2 files changed, 17 insertions, 36 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 6168df1bcb..8e5df099c6 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
@@ -1,19 +1,13 @@
-From f2f3542e163c534a437944089b801f6134c6b02a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 6 Jul 2011 09:56:57 +0300
 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.
----
- lib/RT/Interface/Email.pm |   11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
 
-diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
-index 620ca60..8bd94eb 100644
---- a/lib/RT/Interface/Email.pm
-+++ b/lib/RT/Interface/Email.pm
-@@ -343,7 +343,10 @@ sub SendEmail {
+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') || '';
      chomp $msgid;
@@ -25,26 +19,13 @@ index 620ca60..8bd94eb 100644
      # 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')
-@@ -408,16 +411,16 @@ sub SendEmail {
-         if ( $args{'Bounce'} ) {
-             $args .= ' '. RT->Config->Get('SendmailBounceArguments');
-         } elsif ( RT->Config->Get('SetOutgoingMailFrom') ) {
--            my $OutgoingMailAddress;
-+            my $OutgoingMailAddress = $envelope_from;
- 
-             if ($TicketObj) {
-                 my $QueueName = $TicketObj->QueueObj->Name;
-                 my $QueueAddressOverride = RT->Config->Get('OverrideOutgoingMailFrom')->{$QueueName};
- 
+@@ -442,7 +445,8 @@
                  if ($QueueAddressOverride) {
--                    $OutgoingMailAddress = $QueueAddressOverride;
-+                    $OutgoingMailAddress ||= $QueueAddressOverride;
+                     $OutgoingMailAddress = $QueueAddressOverride;
                  } else {
--                    $OutgoingMailAddress = $TicketObj->QueueObj->CorrespondAddress;
-+                    $OutgoingMailAddress ||= $TicketObj->QueueObj->CorrespondAddress;
+-                    $OutgoingMailAddress ||= $TicketObj->QueueObj->CorrespondAddress
++                    $OutgoingMailAddress ||= $envelope_from
++                                             || $TicketObj->QueueObj->CorrespondAddress
+                                              || RT->Config->Get('CorrespondAddress');
                  }
              }
- 
--- 
-1.7.1
-
diff --git a/main/rt4/APKBUILD b/main/rt4/APKBUILD
index 008252694e..46b0487697 100644
--- a/main/rt4/APKBUILD
+++ b/main/rt4/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rt4
-pkgver=4.0.11
+pkgver=4.0.15
 pkgrel=0
 pkgdesc="Request Tracker - issue and bug tracker"
 pkgusers="rt4"
@@ -139,9 +139,9 @@ package() {
 
 }
 
-md5sums="ddf507e9ba9891746224817868c05a34  rt-4.0.11.tar.gz
-8efa0bcee373ee111ac08c53bac8354d  0001-email-allow-envelope-from-overriding-from-templates.patch"
-sha256sums="7f310de457c61d044efdda42c8231c12b12c3400f03565910a758a1b95602789  rt-4.0.11.tar.gz
-afebf39b5e0e8b80870accba0821682c171e181965cc7677407396a567c51458  0001-email-allow-envelope-from-overriding-from-templates.patch"
-sha512sums="aea33d2c493fbc4e987ef298e98b1799affa01cfe8e4211a38861e82c3d0f448d149015d9e7dd93d3806072aaefb2bdcc253ce2361039f9590d7acc99f2f91da  rt-4.0.11.tar.gz
-fbd33ca87930294ee3df0d55b622849506c03c250eb37be34738d769006287c93d8628077fb90486ab3229e32903a1663e280f04984deadcbadcf60b3c6ef824  0001-email-allow-envelope-from-overriding-from-templates.patch"
+md5sums="18355495de07b478e27d8b4aff121ae6  rt-4.0.15.tar.gz
+0f00f58ea2feb15ba0c56f4455feaae1  0001-email-allow-envelope-from-overriding-from-templates.patch"
+sha256sums="8a92e9ebb7b626cb5e17739dfa3f2e791caf1bfa170c4b069c0fa3b8fa78f3af  rt-4.0.15.tar.gz
+c751d831ec9ad54ae7afd0276cbb36ef57bac291ce4b215000b7364dca20a74d  0001-email-allow-envelope-from-overriding-from-templates.patch"
+sha512sums="e525b8be0d276a06caac82b01816b30be6245b3612a3f1e1ddf4149fd72b02d34ef82236ede67dbb3179e49a82a52acb3e5510531fd28d9c00c9dd29e8e7878c  rt-4.0.15.tar.gz
+a61cc81d025edf92598023f37517b06145a28edfdc31dfbc94ae2a1f8f13505d5512ad4e332376d46c1e4dd2fdb97569f127503eae3d4af6ce14f63e4e3c3f48  0001-email-allow-envelope-from-overriding-from-templates.patch"