diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2020-11-06 19:39:13 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2020-11-06 19:39:13 +0900 |
| commit | 55410ed984edd70376a3121a0ac62dc89f8fbd50 (patch) | |
| tree | ae141042edd310f8613ae76ca45863c5ceed62f8 | |
| parent | be84d819ed263879454840b60592734690e1603c (diff) | |
| parent | 9dd4dc9131506dff9dd8744b254b69f15d1a729c (diff) | |
| download | mailman2-55410ed984edd70376a3121a0ac62dc89f8fbd50.tar.gz mailman2-55410ed984edd70376a3121a0ac62dc89f8fbd50.tar.xz mailman2-55410ed984edd70376a3121a0ac62dc89f8fbd50.zip | |
sync merge lp:mailman/2.1 up to r1862
| -rw-r--r-- | Mailman/Utils.py | 1 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.in | 7 |
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', @@ -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) @@ -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) |