- updated

Changed files:
    postfix-master.cf_cyrus.patch -> 1.5
    postfix-pgsql.patch -> 1.3

diff --git a/postfix-master.cf_cyrus.patch b/postfix-master.cf_cyrus.patch
index d2a12a17730649b90ce651a803293384a6f5b6ee..4e4ca14d2a6dae9689c02ed2c1aeb70da6603781 100644 (file)
--- a/postfix-master.cf_cyrus.patch
+++ b/postfix-master.cf_cyrus.patch
@@ -1,13 +1,12 @@
 --- 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
-@@ -113,11 +113,11 @@
+@@ -107,10 +107,10 @@
  # 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)
- # 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}

diff --git a/postfix-pgsql.patch b/postfix-pgsql.patch
index 7d3b8d68f7a60089dcd6fb1fa35de0f25268a71d..596624c78ae54e5f88e09c309458357c54fb468c 100644 (file)
--- a/postfix-pgsql.patch
+++ b/postfix-pgsql.patch
@@ -99,16 +99,16 @@
  #include <dict_pcre.h>
  #include <dict_regexp.h>
  #include <dict_static.h>
-@@ -231,6 +232,9 @@
+@@ -230,6 +231,9 @@
  #ifdef HAS_MYSQL
      DICT_TYPE_MYSQL, dict_mysql_open,
  #endif
 +#ifdef HAS_PGSQL
 +    DICT_TYPE_PGSQL, dict_pgsql_open,
 +#endif
+ #ifndef MAX_DYNAMIC_MAPS
  #ifdef HAS_PCRE
      DICT_TYPE_PCRE, dict_pcre_open,
- #endif
 --- postfix-2.0.16.orig/src/util/dict_pgsql.c  1970-01-01 01:00:00.000000000 +0100
 +++ postfix-2.0.16/src/util/dict_pgsql.c       2003-11-08 20:11:44.000000000 +0100
 @@ -0,0 +1,675 @@