Fixes #8712/#8738
---
.../0001-email-allow-envelope-from-overriding-from-templates.patch | 6 +++---
community/rt4/APKBUILD | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch b/community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch
index ae48036cc5..32b55b3082 100644
--- a/community/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch
@@ -1,4 +1,4 @@
-From 0fa9baf1004fb02a370cc78c1586f3207b1712b8 Mon Sep 17 00:00:00 2001
+From 16205e84a3b6de87dbe46a03174c2d75f1d1d544 Mon Sep 17 00:00:00 2001
From: Kory Prince <korylprince@gmail.com>
Date: Thu, 22 Mar 2018 13:00:02 -0500
Subject: [PATCH] email: allow envelope from overriding from templates
@@ -10,7 +10,7 @@ from if using sendmailpipe mail sending.
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
-index 7466c0f78..b90bc1a73 100644
+index 7466c0f78..04a88554c 100644
--- a/lib/RT/Interface/Email.pm
+++ b/lib/RT/Interface/Email.pm
@@ -740,7 +740,14 @@ sub MailError {
@@ -46,7 +46,7 @@ index 7466c0f78..b90bc1a73 100644
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');
++ 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;
diff --git a/community/rt4/APKBUILD b/community/rt4/APKBUILD
index 0eedb2ec7b..661cac47b2 100644
--- a/community/rt4/APKBUILD
@@ -175,6 +175,6 @@ package() {
}
sha512sums="23e318d10c49d39c1542664efa2b9f98d1dcd613c279dc8ceca0ad9aed89a5d989316e833492ed3281543ec85f6e0f5141a86f70852776bf0d54166aa126431e rt-4.4.2.tar.gz
-5782bc2732002d93fa66a87b86a25266e227ed90946a425f1f7b1aa09d028fa9562d9cf532ffa1f7e7c4b28f85b1f982c7629ac37621abe47b60e8d2e0d467b0 0001-email-allow-envelope-from-overriding-from-templates.patch
+b88f6a6c42510c6e95f4d206b93d5dcea001622619edc212018edd7f36c20a24acf812acf8f09dcb3413fcb1733b53ce3072c2097cdc18812e3a978ea04218d0 0001-email-allow-envelope-from-overriding-from-templates.patch
62308220d00e11059491533e87fb7378226609fcef332c31b2db75ba32bbbf3343cd0eb7fd53288f62700ee456669f216bd78550fb1cd7e5d4fe85ef41976c0c rt-varpath.patch
cac79f231e1b1915962de8e4a86812fcaa0f1f64384a34557fac860c0fb0ae33d5dfd2371c30c07310391735e7348022e62bd5d453674a41ac7e77865d79dab9 rt-autoconf-version.patch"
--
2.15.1
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---