[Pkg-mailman-hackers] Bug#838288: mailman: diff for NMU version 1:2.1.23-1.1

[Florz at florz.net]

Control: tags 838288 + pending

Dear maintainer,

I've prepared an NMU for mailman (versioned as 1:2.1.23-1.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru mailman-2.1.23/debian/changelog mailman-2.1.23/debian/changelog
--- mailman-2.1.23/debian/changelog	2016-09-13 18:01:59.000000000 +0200
+++ mailman-2.1.23/debian/changelog	2017-09-02 00:42:19.000000000 +0200
@@ -1,3 +1,10 @@
+mailman (1:2.1.23-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fixed broken dependencies in SpamAssassin.py (Closes: #838288)
+
+ -- Florian Schlegel <Florz at florz.net>  Sat, 02 Sep 2017 00:42:19 +0200
+
 mailman (1:2.1.23-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru mailman-2.1.23/debian/contrib/SpamAssassin.py mailman-2.1.23/debian/contrib/SpamAssassin.py
--- mailman-2.1.23/debian/contrib/SpamAssassin.py	2016-09-13 18:01:59.000000000 +0200
+++ mailman-2.1.23/debian/contrib/SpamAssassin.py	2017-09-02 00:42:19.000000000 +0200
@@ -28,7 +28,6 @@
 from Mailman import Errors
 from Mailman.Logging.Syslog import syslog
 from Mailman.Handlers import Hold
-from Mailman.Handlers.Moderate import matches_p
 
 SPAMD_HOST    = getattr(mm_cfg, 'SPAMASSASSIN_HOST', '')
 DISCARD_SCORE = getattr(mm_cfg, 'SPAMASSASSIN_DISCARD_SCORE', 10)
@@ -78,7 +77,7 @@
     if MEMBER_BONUS != 0:
         for sender in msg.get_senders():
             if mlist.isMember(sender) or \
-                   matches_p(sender, mlist.accept_these_nonmembers, mlist.internal_name()):
+                   mlist.GetPattern(sender, mlist.accept_these_nonmembers, at_list='accept_these_nonmembers'):
                 score -= MEMBER_BONUS
                 break