Fixed contrib/qmail-to-mailman.py to work with a user other than

'mailman' and to recognize more listname-* addresses.  (LP: #412293)

2 files changed, 11 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index d7cb9b85..7c76ca40 100755
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,9 @@ Here is a history of user visible changes to Mailman.
 
   Bug Fixes and other patches
 
+    - Fixed contrib/qmail-to-mailman.py to work with a user other than
+      'mailman' and to recognize more listname-* addresses.  (LP: #412293)
+
     - Fixed a possible UnicodeDecodeError in bin/sync_members.  (LP: #1243343)
 
     - Fixed Makefile to not include $DESTDIR in paths compiled into .pyc
diff --git a/contrib/qmail-to-mailman.py b/contrib/qmail-to-mailman.py
index 3e4e19d5..8c95a1d3 100644
--- a/contrib/qmail-to-mailman.py
+++ b/contrib/qmail-to-mailman.py
@@ -64,7 +64,8 @@ def main():
         sys.exit(100)
 
     local = string.lower(local)
-    local = re.sub("^mailman-","",local)
+    user = os.environ.get('USER', 'mailman')
+    local = re.sub('^%s-' % user, '', local)
 
     names = ("root", "postmaster", "mailer-daemon", "mailman-owner", "owner",
              "abuse")
@@ -77,10 +78,15 @@ def main():
     type = "post"
     types = (("-admin$", "bounces"),
              ("-bounces$", "bounces"),
+             ("-bounces[-+].*$", "bounces"),
+             ("-confirm$", "confirm"),
+             ("-confirm[-+].*$", "confirm"),
              ("-join$", "join"),
              ("-leave$", "leave"),
              ("-owner$", "owner"),
-             ("-request$", "request"))
+             ("-request$", "request"),
+             ("-subscribe$", "subscribe"),
+             ("-unsubscribe$", "unsubscribe"))
 
     for i in types:
         if re.search(i[0],local):