[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20200401-12-gd047fed

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=d047fed3d38af7a0307f46d74b0bf7e78eaaeda6

commit d047fed3d38af7a0307f46d74b0bf7e78eaaeda6
Author: Jon Turney <[email protected]>
Date:   Wed Apr 15 17:11:54 2020 +0100

    Change From: address to cygwin-apps
    
    Change From: address to cygwin-apps list, so bounces and replies go
    there.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=241c7f410e624774156aec82add9962875d3d038

commit 241c7f410e624774156aec82add9962875d3d038
Author: Jon Turney <[email protected]>
Date:   Wed Apr 15 14:57:39 2020 +0100

    Also set the envelope-from for mails we send
    
    This should avoid mails being sent out with an envelope-from of
    [email protected], which leads to bounces arriving on our main mailing
    list.
    
    (Sending bounces to cygwin-no-reply is suboptimal, as it means we don't
    know when somethings going wrong with our mail delivery)


Diff:
---
 calm/buffering_smtp_handler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/calm/buffering_smtp_handler.py b/calm/buffering_smtp_handler.py
index 9d347df..a590b8b 100644
--- a/calm/buffering_smtp_handler.py
+++ b/calm/buffering_smtp_handler.py
@@ -35,7 +35,7 @@ class BufferingSMTPHandler(logging.handlers.BufferingHandler):
                  toaddrs,
                  subject,
                  mailhost=common_constants.MAILHOST,
-                 fromaddr='[email protected]',
+                 fromaddr='[email protected]',
                  logging_format='%(levelname)s: %(message)s'):
         logging.handlers.BufferingHandler.__init__(self, capacity=0)
         self.mailhost = mailhost
@@ -85,7 +85,7 @@ class BufferingSMTPHandler(logging.handlers.BufferingHandler):
                 print(msg)
                 print('-' * 40)
             elif len(self.toaddrs) > 0:
-                with subprocess.Popen(['/usr/sbin/sendmail', '-t', '-oi'], stdin=subprocess.PIPE) as p:
+                with subprocess.Popen(['/usr/sbin/sendmail', '-t', '-oi', '-f', self.fromaddr], stdin=subprocess.PIPE) as p:
                     p.communicate(m.as_bytes())
 
             self.buffer = []