aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2018-07-03 11:48:26 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2018-07-03 11:48:26 +0900
commite746421c63219796486f356ace983b752a4766f9 (patch)
tree01f9cb13e53faf86781a3f9a82c97ececbf04f45
parenta241c33c76d99ca7c765e46b43c9cb373263077b (diff)
parent4e500d36c3fb89ad25a01e21b3ddf8bf21391abe (diff)
downloadmailman2-e746421c63219796486f356ace983b752a4766f9.tar.gz
mailman2-e746421c63219796486f356ace983b752a4766f9.tar.xz
mailman2-e746421c63219796486f356ace983b752a4766f9.zip
merge lp:mailman/2.1 up to rev 1787
-rw-r--r--Mailman/Utils.py2
-rw-r--r--NEWS11
-rw-r--r--templates/cs/listinfo.html2
3 files changed, 11 insertions, 4 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index d504ecce..01dfa9c0 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1543,7 +1543,7 @@ def banned_domain(email):
email = email.lower()
user, domain = ParseEmail(email)
- lookup = '%s.zen.spamhaus.org' % (domain)
+ lookup = '%s.dbl.spamhaus.org' % (domain)
resolver = dns.resolver.Resolver()
try:
diff --git a/NEWS b/NEWS
index 6e3a8a09..19dc5105 100644
--- a/NEWS
+++ b/NEWS
@@ -5,16 +5,23 @@ Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
Here is a history of user visible changes to Mailman.
+2.1.28 (xx-xxx-xxxx)
+
+ Bug fixes and other patches
+
+ - The BLOCK_SPAMHAUS_LISTED_DBL_SUBSCRIBE feature added in 2.1.27 was
+ not working. This is fixed. (LP: #1779774)
+
2.1.27 (22-Jun-2018)
Security
- Existing protections against malicious listowners injecting evil
scripts into listinfo pages have had a few more checks added.
- JVN#00846677/JPCERT#97432283
+ JVN#00846677/JPCERT#97432283/CVE-2018-0618
- A few more error messages have had their values HTML escaped.
- JVN#00846677/JPCERT#97432283
+ JVN#00846677/JPCERT#97432283/CVE-2018-0618
- The hash generated when SUBSCRIBE_FORM_SECRET is set could have been
the same as one generated at the same time for a different list and
diff --git a/templates/cs/listinfo.html b/templates/cs/listinfo.html
index 408b22b5..8da0066a 100644
--- a/templates/cs/listinfo.html
+++ b/templates/cs/listinfo.html
@@ -2,7 +2,7 @@
<!-- $Revision: 6023 $ -->
<HTML>
<HEAD>
- <TITLE>Informace o konferenci<MM-List-Name></TITLE>
+ <TITLE>Informace o konferenci <MM-List-Name></TITLE>
</HEAD>
<BODY BGCOLOR="#ffffff">