aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Utils.py1
-rw-r--r--NEWS2
-rwxr-xr-xconfigure7
-rw-r--r--configure.in7
4 files changed, 10 insertions, 7 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 6e39c532..2615229b 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1096,6 +1096,7 @@ _badwords = [
r'\bonfilterchange\b',
r'\bonfinish\b',
r'\bonfocus(?:in|out)?\b',
+ r'\bonhashchange\b',
r'\bonhelp\b',
r'\boninput\b',
r'\bonkey(?:up|down|press)\b',
diff --git a/NEWS b/NEWS
index 85bb2288..24bd861b 100644
--- a/NEWS
+++ b/NEWS
@@ -115,7 +115,7 @@ Here is a history of user visible changes to Mailman.
confirmations of the same token. (LP: #1785854)
- Scrubbed application/octet-stream MIME parts will now be given a
- .bin extension instead of .obj.
+ .bin extension instead of .obj. CVE-2020-12137 (LP: #1886117)
- Added bounce recognition for a non-compliant opensmtpd DSN with
Action: error. (LP: #1805137)
diff --git a/configure b/configure
index 6749b007..59702c2f 100755
--- a/configure
+++ b/configure
@@ -2277,10 +2277,11 @@ if test "$havednspython" = "no"
then
as_fn_error $? "
-***** dnspython not found. It is required for the new
-***** dmarc_moderation_action featurer. Get it from
+***** dnspython <2.0 not found. It is required for the new
+***** dmarc_moderation_action feature. Get it from
***** <http://www.dnspython.org/> or
-***** <https://pypi.python.org/pypi/dnspython/>" "$LINENO" 5
+***** <https://pypi.python.org/pypi/dnspython/>
+***** You must get a version < 2.0" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $havednspython" >&5
$as_echo "$havednspython" >&6; }
diff --git a/configure.in b/configure.in
index e4956674..576b89b3 100644
--- a/configure.in
+++ b/configure.in
@@ -107,10 +107,11 @@ if test "$havednspython" = "no"
then
AC_MSG_ERROR([
-***** dnspython not found. It is required for the new
-***** dmarc_moderation_action featurer. Get it from
+***** dnspython <2.0 not found. It is required for the new
+***** dmarc_moderation_action feature. Get it from
***** <http://www.dnspython.org/> or
-***** <https://pypi.python.org/pypi/dnspython/>])
+***** <https://pypi.python.org/pypi/dnspython/>
+***** You must get a version < 2.0])
fi
AC_MSG_RESULT($havednspython)