Trunk merge

13 files changed, 63 insertions, 12 deletions

diff --git a/src/mailman/mta/aliases.py b/src/mailman/mta/aliases.py
index 402b9836b..1b5f37d44 100644
--- a/src/mailman/mta/aliases.py
+++ b/src/mailman/mta/aliases.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/base.py b/src/mailman/mta/base.py
index fbfcc1ff7..7b9180ea3 100644
--- a/src/mailman/mta/base.py
+++ b/src/mailman/mta/base.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/bulk.py b/src/mailman/mta/bulk.py
index 10445e167..da3026083 100644
--- a/src/mailman/mta/bulk.py
+++ b/src/mailman/mta/bulk.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/connection.py b/src/mailman/mta/connection.py
index afc48cf64..f5c330921 100644
--- a/src/mailman/mta/connection.py
+++ b/src/mailman/mta/connection.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/decorating.py b/src/mailman/mta/decorating.py
index de0384132..a23e188a1 100644
--- a/src/mailman/mta/decorating.py
+++ b/src/mailman/mta/decorating.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/deliver.py b/src/mailman/mta/deliver.py
index b05289e5c..de6b80a8c 100644
--- a/src/mailman/mta/deliver.py
+++ b/src/mailman/mta/deliver.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/exim4.py b/src/mailman/mta/exim4.py
new file mode 100644
index 000000000..1180b59eb
--- /dev/null
+++ b/src/mailman/mta/exim4.py
@@ -0,0 +1,51 @@
+# Copyright (C) 2013-2014 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Creation/deletion hooks for the Exim4 MTA."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'LMTP',
+    ]
+
+
+from mailman.interfaces.mta import IMailTransportAgentLifecycle
+from zope.interface import implementer
+
+
+
+@implementer(IMailTransportAgentLifecycle)
+class LMTP:
+    """Connect Mailman to Exim4 via LMTP.
+
+    See `IMailTransportAgentLifecycle`.
+    """
+
+    # Exim4 handles all configuration itself, by finding the list config file.
+    def __init__(self):
+        pass
+
+    def create(self, mlist):
+        pass
+
+    delete = create
+
+    def regenerate(self, directory=None):
+        """See `IMailTransportAgentLifecycle`."""
+        pass
diff --git a/src/mailman/mta/null.py b/src/mailman/mta/null.py
index 3b714b917..7a3624b31 100644
--- a/src/mailman/mta/null.py
+++ b/src/mailman/mta/null.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/personalized.py b/src/mailman/mta/personalized.py
index aa838a190..adc3c90a4 100644
--- a/src/mailman/mta/personalized.py
+++ b/src/mailman/mta/personalized.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/postfix.py b/src/mailman/mta/postfix.py
index 68c777e5b..bb709c6b4 100644
--- a/src/mailman/mta/postfix.py
+++ b/src/mailman/mta/postfix.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/tests/test_aliases.py b/src/mailman/mta/tests/test_aliases.py
index 9bb9c0f62..2c33c7821 100644
--- a/src/mailman/mta/tests/test_aliases.py
+++ b/src/mailman/mta/tests/test_aliases.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/tests/test_delivery.py b/src/mailman/mta/tests/test_delivery.py
index 0d424de75..0a910c13d 100644
--- a/src/mailman/mta/tests/test_delivery.py
+++ b/src/mailman/mta/tests/test_delivery.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
diff --git a/src/mailman/mta/verp.py b/src/mailman/mta/verp.py
index 499ada129..968ed58c3 100644
--- a/src/mailman/mta/verp.py
+++ b/src/mailman/mta/verp.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #