- up for 2.1.0

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

diff --git a/postfix-master.cf_cyrus.patch b/postfix-master.cf_cyrus.patch
index 8c7f3bafb1e6e6392b3c09503ec304bc0b2c9266..d2a12a17730649b90ce651a803293384a6f5b6ee 100644 (file)
--- a/postfix-master.cf_cyrus.patch
+++ b/postfix-master.cf_cyrus.patch
@@ -1,11 +1,16 @@
 --- postfix-1.1.2/conf/master.cf.old   2002-03-02 20:13:56.000000000 -0300
 +++ postfix-1.1.2/conf/master.cf       2002-05-02 21:44:39.000000000 -0300
-@@ -90,7 +90,7 @@
- # The Cyrus deliver program has changed incompatibly.
+@@ -113,11 +113,11 @@
+ # The Cyrus deliver program has changed incompatibly, multiple times.
  #
- cyrus   unix  -       n       n       -       -       pipe
+ 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}
- uucp    unix  -       n       n       -       -       pipe
+ # Cyrus 2.1.5 (Amos Gouaux)
+ # 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}
+ uucp      unix  -       n       n       -       -       pipe
    flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
  ifmail    unix  -       n       n       -       -       pipe