X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-ot0-f182.google.com (mail-ot0-f182.google.com [74.125.82.182]) by lists.alpinelinux.org (Postfix) with ESMTP id A1D605C4EE1 for ; Mon, 26 Mar 2018 14:17:46 +0000 (GMT) Received: by mail-ot0-f182.google.com with SMTP id l12-v6so20756644otj.7 for ; Mon, 26 Mar 2018 07:17:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=phklij40cLBoE6NaqTe5lfuVY/t3KPTLhjeocomUy5E=; b=d2NnP8d2zX3X19MdCzxcLspDP1dOpysLkR1u3UDRtqNPyC3leNMyiFQXyH8JgnFpb/ l+Kmt9nCwvsCisoBoYF+YuWnX2lEO9a/h/Y9oDtqkGoOfAnWJDhR1jAszrd1aj4sGuoG qPSOm5VvQ5TvwzAYg0lznDIOEhbJ7p+MaOXFFUyONxecYWUmWVaHL9oBuBJG7YNTO6zS YQc0U4Fy7GwA7WfC5ClTYEwqxLNBZJoRTDv0Vpat5yiqjSlpnsN5yOsyeZ+G+gkM3lcB buqQ/jVVRfYtOzlYCtOzpR2O0MTp02YC1tjH2Akxwgyr9tK3vULi2kICefOWoF+3XBo5 qSng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=phklij40cLBoE6NaqTe5lfuVY/t3KPTLhjeocomUy5E=; b=KC2ldy3otg5jbwmjcj1LSOCwgX8ww3lie0zcujeMrmr3+xgQBdM+nu6RmzdOUqqQyj qvPDz2xq50el71ZsaDIKYn+EvEXeiotQOJntoSr14/4SNMFpwAXYW6jj7w9XvmW3o4xd GXEjwP5Hr4xG5J9mU4CJsuD4BrSvCCGfjAa6TSKamCCPj3Pu1wZu06cv/UDqQAkqclbM d2Aior/nxRvBRgnnYEO/u2f550brQpdVYH5q3iWVDQI4yGm2tAbYgt8+Z/ezDcAGaPlt YqWz/L8dYxru3vNG08qzlgmh6Mbn5m36Eh6sDpKQLd0vsTsHbAYJ/3/MbD1mwY0PRmmQ JWWg== X-Gm-Message-State: AElRT7FkPTJSui2qwwjc/TZ2i3zl3+j1O8+nAj8sMeE/Rn9tCM51QrkO FGyOveCRfMitwFlebeiqFqbh/Aoq X-Google-Smtp-Source: AIpwx4/HOTTSQlUryis8UeYHEZKeToyxtm7A8+G4OOcCpHwn25Yq0kQHb+DTxC+4K8iIelxe+h/NlQ== X-Received: by 2002:a9d:5916:: with SMTP id t22-v6mr17600695oth.149.1522073865925; Mon, 26 Mar 2018 07:17:45 -0700 (PDT) Received: from arch-kory2.bullardisd.net (75-108-107-167.res.dyn.suddenlink.net. [75.108.107.167]) by smtp.gmail.com with ESMTPSA id e68sm329804oih.16.2018.03.26.07.17.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 07:17:44 -0700 (PDT) From: Kory Prince To: alpine-aports@lists.alpinelinux.org Cc: Kory Prince Subject: [alpine-aports] [PATCH] community/rt4: quiet chomp warnings Date: Mon, 26 Mar 2018 09:17:37 -0500 Message-Id: <20180326141737.22514-1-korylprince@gmail.com> X-Mailer: git-send-email 2.15.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: 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 +++ b/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 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 +++ b/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 ---