From f29d92fbc348b9ffd97239d01b12acd08cc5bff3 Mon Sep 17 00:00:00 2001
From: Erik Demaine <edemaine@mit.edu>
Date: Mon, 1 May 2017 09:45:08 -0400
Subject: [PATCH 1/4] Update to node4mailer@4.0.3 supporting Node 4.4.7

---
 packages/email/.npm/package/npm-shrinkwrap.json | 6 +++---
 packages/email/package.js                       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index aebb613b70..196835ba91 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "node4mailer": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/node4mailer/-/node4mailer-4.0.2.tgz",
-      "from": "node4mailer@4.0.2"
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/node4mailer/-/node4mailer-4.0.3.tgz",
+      "from": "node4mailer@4.0.3"
     },
     "stream-buffers": {
       "version": "0.2.5",
diff --git a/packages/email/package.js b/packages/email/package.js
index 7e5167f350..e8bc45e050 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,10 +1,10 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.2.1"
+  version: "1.2.2"
 });
 
 Npm.depends({
-  node4mailer: "4.0.2",
+  node4mailer: "4.0.3",
   "stream-buffers": "0.2.5"
 });
 

From 255e136c9a5957811c0161905ad06e1e1aba148d Mon Sep 17 00:00:00 2001
From: Erik Demaine <edemaine@mit.edu>
Date: Thu, 18 May 2017 21:11:02 -0400
Subject: [PATCH 2/4] Add warning when using smtp://...:465

---
 packages/email/email.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/email/email.js b/packages/email/email.js
index af3c633d69..94274cfb8a 100644
--- a/packages/email/email.js
+++ b/packages/email/email.js
@@ -28,6 +28,10 @@ var makeTransport = function (mailUrlString) {
                     mailUrlString + ") must be 'smtp' or 'smtps'");
   }
 
+  if (mailUrl.protocol === 'smtp:' && mailUrl.port === '465') {
+    Meteor._debug("$MAIL_URL is of the form smtp://...:465 -- did you mean smtps://...:465? (Note added 's' to enable SSL.)");
+  }
+
   // Allow overriding pool setting, but default to true.
   if (!mailUrl.query) {
     mailUrl.query = {};

From c4adc7986c706096e7b71bea2359db4177f1af50 Mon Sep 17 00:00:00 2001
From: Erik Demaine <edemaine@mit.edu>
Date: Thu, 18 May 2017 21:15:36 -0400
Subject: [PATCH 3/4] Update version number

---
 packages/email/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/email/package.js b/packages/email/package.js
index e8bc45e050..836e70f6f9 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.2.2"
+  version: "1.2.3"
 });
 
 Npm.depends({

From fba42daca8515dc0d9f3986747e0a3ece71d84e9 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Fri, 2 Jun 2017 18:07:51 +0300
Subject: [PATCH 4/4] Slight adjustment to smtp:// warning message.

Just to clarify that port 465 is typically a secure port and our
assumption is based on that (in case they're curious how we decided
to show the message).
---
 packages/email/email.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/email/email.js b/packages/email/email.js
index 94274cfb8a..40124cbd89 100644
--- a/packages/email/email.js
+++ b/packages/email/email.js
@@ -29,7 +29,9 @@ var makeTransport = function (mailUrlString) {
   }
 
   if (mailUrl.protocol === 'smtp:' && mailUrl.port === '465') {
-    Meteor._debug("$MAIL_URL is of the form smtp://...:465 -- did you mean smtps://...:465? (Note added 's' to enable SSL.)");
+    Meteor._debug("The $MAIL_URL is 'smtp://...:465'.  " +
+                  "You probably want 'smtps://' (The 's' enables TLS/SSL) " +
+                  "since '465' is typically a secure port.");
   }
 
   // Allow overriding pool setting, but default to true.