From 1570b39dc99262a97b4ec7b3e15d15e78d28cd85 Mon Sep 17 00:00:00 2001
From: Steve Muskiewicz <steve.muskiewicz@plexxi.com>
Date: Wed, 4 Dec 2019 11:06:29 -0500
Subject: [PATCH 1/3] Fix for #4795: add '-w 0' to base64 encoding of subject
 line to avoid line wrapping

Credit to @guzzijones for finding the fix here https://superuser.com/questions/1225134/why-does-the-base64-of-a-string-contain-n
---
 contrib/core/actions/send_mail/send_mail | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/core/actions/send_mail/send_mail b/contrib/core/actions/send_mail/send_mail
index 6011c43d49..465da4681c 100755
--- a/contrib/core/actions/send_mail/send_mail
+++ b/contrib/core/actions/send_mail/send_mail
@@ -65,7 +65,7 @@ if [[ -z $trimmed && $SEND_EMPTY_BODY -eq 1 ]] || [[ -n $trimmed ]]; then
 cat <<EOF
 TO: ${TO}
 FROM: ${FROM}
-SUBJECT: =?UTF-8?B?$(echo ${SUBJECT} | base64)?=
+SUBJECT: =?UTF-8?B?$(echo ${SUBJECT} | base64 -w 0)?=
 EOF
 
 if [[ -n $ATTACHMENTS ]]; then

From 0fffbdf00cf4d547d254bb4319d6bb5fcb42e976 Mon Sep 17 00:00:00 2001
From: Steve Muskiewicz <steve.muskiewicz@plexxi.com>
Date: Wed, 4 Dec 2019 11:48:11 -0500
Subject: [PATCH 2/3] PR feedback: bump core pack version to 1.0.1; update
 changelog for previous fix

---
 CHANGELOG.rst          | 3 +++
 contrib/core/pack.yaml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 16520cec70..3459ac4e48 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -85,6 +85,9 @@ Fixed
 * Update ``st2 execution get`` command to always include ``context.user``, ``start_timestamp`` and
   ``end_timestamp`` attributes. (improvement) #4739
 
+  Contributed by @stevemuskiewicz and @guzzijones
+* Fixed ``core.sendmail`` base64 encoding of longer subject lines (bug fix) #4795
+
 3.1.0 - June 27, 2019
 ---------------------
 
diff --git a/contrib/core/pack.yaml b/contrib/core/pack.yaml
index 5f2779f1fb..1334da4b91 100644
--- a/contrib/core/pack.yaml
+++ b/contrib/core/pack.yaml
@@ -1,7 +1,7 @@
 ---
 name : core
 description : Basic core actions.
-version : 1.0.0
+version : 1.0.1
 python_versions:
   - "2"
   - "3"

From 43fde90cbfb9ecc5e827143a26b7518f3d86742c Mon Sep 17 00:00:00 2001
From: Steve Muskiewicz <steve.muskiewicz@plexxi.com>
Date: Wed, 4 Dec 2019 14:03:13 -0500
Subject: [PATCH 3/3] fix line order in changelog

---
 CHANGELOG.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3459ac4e48..4bd79046c1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -85,9 +85,10 @@ Fixed
 * Update ``st2 execution get`` command to always include ``context.user``, ``start_timestamp`` and
   ``end_timestamp`` attributes. (improvement) #4739
 
-  Contributed by @stevemuskiewicz and @guzzijones
 * Fixed ``core.sendmail`` base64 encoding of longer subject lines (bug fix) #4795
 
+  Contributed by @stevemuskiewicz and @guzzijones
+
 3.1.0 - June 27, 2019
 ---------------------