- up to 3.5.0

[packages/postfix.git] / postfix-master.cf_cyrus.patch

diff --git a/postfix-master.cf_cyrus.patch b/postfix-master.cf_cyrus.patch
index 2b7417afd2102958474938683174d702b54cb695..cd5e80b7a2603aef5456c26908fea3615639aeaf 100644 (file)
--- a/postfix-master.cf_cyrus.patch
+++ b/postfix-master.cf_cyrus.patch
@@ -1,16 +1,20 @@
 --- postfix-2.2.2/conf/master.cf.orig  2005-01-24 20:12:46.000000000 +0100
 +++ postfix-2.2.2/conf/master.cf       2005-04-26 11:46:51.000000000 +0200
-@@ -60,11 +60,11 @@
- # The Cyrus deliver program has changed incompatibly, multiple times.
- #
- old-cyrus unix  -       n       n       -       -       pipe
--  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
-+  flags=R user=cyrus argv=/usr/lib/cyrus/deliver -e -m ${extension} ${user}
- # Cyrus 2.1.5 (Amos Gouaux)
+@@ -98,14 +98,14 @@ postlog   unix-dgram n  -       n
  # Also specify in main.cf: cyrus_destination_recipient_limit=1
- cyrus     unix  -       n       n       -       -       pipe
--  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
-+  user=cyrus argv=/usr/lib/cyrus/deliver -e -r ${sender} -m ${extension} ${user}
  #
- # See the Postfix UUCP_README file for configuration details.
+ #cyrus     unix  -       n       n       -       -       pipe
+-#  flags=DRX user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
++#  flags=DRX user=cyrus argv=/usr/lib/cyrus//deliver -e -r ${sender} -m ${extension} ${user}
+ #
+ # ====================================================================
+ #
+ # Old example of delivery via Cyrus.
+ #
+ #old-cyrus unix  -       n       n       -       -       pipe
+-#  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
++#  flags=R user=cyrus argv=/usr/lib/cyrus/deliver -e -m ${extension} ${user}
+ #
+ # ====================================================================
  #
+