merge lp:mailman 2.1 up to rev 1775 (to comform diff before proposing merge)

3 files changed, 28 insertions, 10 deletions

diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index e8a6bbf0..3e5a6232 100755
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1059,8 +1059,14 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
         syslog('subscribe', '%s: new%s %s, %s', self.internal_name(),
                kind, formataddr((name, email)), whence)
         if ack:
-            self.SendSubscribeAck(email, self.getMemberPassword(email),
-                                  digest, text)
+            lang = self.preferred_language
+            otrans = i18n.get_translation()
+            i18n.set_language(lang)
+            try:
+                self.SendSubscribeAck(email, self.getMemberPassword(email),
+                                      digest, text)
+            finally:
+                i18n.set_translation(otrans)
         if admin_notif:
             lang = self.preferred_language
             otrans = i18n.get_translation()
diff --git a/NEWS b/NEWS
index 7494695a..e0c67bb0 100644
--- a/NEWS
+++ b/NEWS
@@ -85,7 +85,10 @@ Here is a history of user visible changes to Mailman.
       required.  (LP: #1769374)
 
     - Quoting in the mailman-config command has been changed from double to
-      single quotes to allow double-quoted parameters.  (LP:1774986)
+      single quotes to allow double-quoted parameters.  (LP: #1774986)
+
+    - Approving a held subscription for a user with a 'different' preferred
+      language no longer corrupts the results page.  (LP: #1777222)
 
   Miscellaneous
 
@@ -162,7 +165,7 @@ Here is a history of user visible changes to Mailman.
   i18n
 
     - The Russian translation has been updated by Sergey Matveev.
-      (LP:#1708016)
+      (LP: #1708016)
 
   Bug fixes and other patches
 
@@ -235,7 +238,7 @@ Here is a history of user visible changes to Mailman.
   Bug fixes and other patches
 
     - The list-owner@virtual.domain addresses are now added to virtual-mailman
-      as they are exposed in 'list created' emails.  (LP: 1694384)
+      as they are exposed in 'list created' emails.  (LP: #1694384)
 
     - The 'list run by' addresses in web page footers are now just the
       list-owner address.  (LP: #1694384)
@@ -810,7 +813,7 @@ Here is a history of user visible changes to Mailman.
 
     - Fixed a bug in bin/rmlist that would throw an exception or just fail to
       remove held message files for a list with regexp special characters in
-      its name.  (LP:#1414864)
+      its name.  (LP: #1414864)
 
     - When applying DMARC mitigations, CookHeaders now adds the original From:
       to Cc: rather than Reply-To: in some cases to make MUA 'reply' and
@@ -959,10 +962,10 @@ Here is a history of user visible changes to Mailman.
       names that look like email addresses.  (LP: #1304511)
 
     - Added the list name to the vette log "held message approved" entry.
-      (LP: 1295875)
+      (LP: #1295875)
 
     - Added the CGI module name to various "No such list" error log entries.
-      (LP: 1295875)
+      (LP: #1295875)
 
     - Modified contrib/mmdsr to report module name if present in "No such list
       error log entries.
diff --git a/contrib/mmdsr b/contrib/mmdsr
index bf5e71c9..5eeeb34d 100644
--- a/contrib/mmdsr
+++ b/contrib/mmdsr
@@ -207,6 +207,11 @@
 #		Updated on: Sun Jun  4 17:12:54 PDT 2017
 #		Added -a to default (e)grep to account for logs that may
 #		have non-ascii and be seen as binary.
+#
+# 0.0.28	Update by Mark Sapiro <mark@msapiro.net>
+#		Updated on: Fri Jun 15 20:20:36 PDT 2018
+#		Added report of new security log.
+#		Augmented 0.0.24 to do <letters> as well as <digits>.
 
 ###############################################################################
 # Set up locations of standard commands, directories, etc....
@@ -275,7 +280,7 @@ MAX_DATA_LINES=100
 # Mailman Log files to check for errors.
 # No need to specify path, only log file name.
 ###############################################################################
-ERR_LOGS="error fromusenet locks mischief post qrunner smtp-failure vette"
+ERR_LOGS="error fromusenet locks mischief security post qrunner smtp-failure vette"
 
 ###############################################################################
 # Mailman Log files to summarize.
@@ -499,6 +504,10 @@ do
 	    echo "------------------------------" >> $TMP
 	    $EGREP -vi '(Login failure with private rosters|Unsub attempt of non-member|Reminder attempt of non-member)' $TMPLOG | $SED 's/^.* ([0-9]*) //' | $SORT | $UNIQ -c | $SORT -nr >> $TMP
 
+	elif [ "${LOG}" = "security" ] ; then
+
+	    $GREP 'Authorization failed' $TMPLOG | $SED 's/^.* ([0-9]*) //' | $SORT | $UNIQ -c | $SORT -nr >> $TMP
+
 	elif [ "${LOG}" = "post" ] ; then
 
 	    $GREP -vi 'success' $TMPLOG | $SED 's/^.* ([0-9]*) //' | $SORT | $UNIQ -c | $SORT -nr >> $TMP
@@ -548,7 +557,7 @@ do
 	    echo "" >> $TMP
 	    echo "Banned Subscriptions" >> $TMP
 	    echo "------------------------------" >> $TMP
-	    $GREP -i 'banned subscription' $TMPLOG | $AWK '{ print $6 " " $9 }' | $SED -e 's/\+[0-9][0-9]*@/+<digits>@/' | $SORT | $UNIQ -c | $SORT -nr >> $TMP
+	    $GREP -i 'banned subscription' $TMPLOG | $AWK '{ print $6 " " $9 }' | $SED -e 's/\+[0-9][0-9]*@/+<digits>@/' -e 's/\+[a-z][a-z]*@/+<letters>@/' | $SORT | $UNIQ -c | $SORT -nr >> $TMP
 
 	    echo "" >> $TMP
 	    echo "DMARC lookups" >> $TMP