- Utils.py Fixed a security hole which allowed a crafted URI to inject

  bogus apparent messages into the error log, possibly inducing an admin to
  visit a phishing site.

- options.py
  Topics.py
  Tagger.py
  MailList.py
  Utils.py
  Version.py
  versions.py
  The processing of Topics regular expressions has changed. Previously the
  Topics regexp was compiled in verbose mode but not documented as such
  which caused some confusion.  Also, the documentation indicated that topic
  keywords could be entered one per line, but these entries were not
  properly.  Topics regexps are now compiled in non-verbose mode and multi-
  line entries are 'ored'.  Existing Topics regexps will be converted when
  the list is updated so they will continue to work.

1 files changed, 9 insertions, 0 deletions

diff --git a/Mailman/versions.py b/Mailman/versions.py
index 531bb5cff..56dc840a2 100644
--- a/Mailman/versions.py
+++ b/Mailman/versions.py
@@ -307,6 +307,15 @@ def UpdateOldVars(l, stored_state):
             pass
         else:
             l.digest_members[k] = 0
+    #
+    # Convert pre 2.2 topics regexps which were compiled in verbose mode
+    # to a non-verbose equivalent.
+    #
+    if stored_state['data_version'] <= 97 and stored_state.has_key('topics'):
+        l.topics = []
+        for name, pattern, description, emptyflag in stored_state['topics']:
+            pattern = Utils.strip_verbose_pattern(pattern)
+            l.topics.append((name, pattern, description, emptyflag))