From 7885eb2fb647bef094f700b061f2461e9d39d088 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 10 Sep 2007 14:01:16 +0000 Subject: [PATCH] - up to 2.4.5 Changed files: postfix-conf.patch -> 1.2 postfix-dynamicmaps.patch -> 1.11 postfix-master.cf_cyrus.patch -> 1.8 --- postfix-conf.patch | 23 +++++++++-------- postfix-dynamicmaps.patch | 47 +++++------------------------------ postfix-master.cf_cyrus.patch | 20 +++++++++------ 3 files changed, 31 insertions(+), 59 deletions(-) diff --git a/postfix-conf.patch b/postfix-conf.patch index 120b802..28db6ef 100644 --- a/postfix-conf.patch +++ b/postfix-conf.patch @@ -3,15 +3,18 @@ @@ -55,7 +55,7 @@ # Also specify in main.cf: maildrop_destination_recipient_limit=1 # - maildrop unix - n n - - pipe -- flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient} -+ flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} + #maildrop unix - n n - - pipe +-# flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient} ++# flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} # - # The Cyrus deliver program has changed incompatibly, multiple times. + # ==================================================================== # -@@ -76,4 +76,4 @@ - ifmail unix - n n - - pipe - flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) - bsmtp unix - n n - - pipe -- flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient -+ flags=Fq. user=foo argv=/usr/sbin/bsmtp -f $sender $nexthop $recipient +@@ -76,7 +76,7 @@ + # flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) + # + #bsmtp unix - n n - - pipe +-# flags=Fq. user=bsmtp argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient ++# flags=Fq. user=bsmtp argv=/usr/sbin/bsmtp -f $sender $nexthop $recipient + # + #scalemail-backend unix - n n - 2 pipe + # flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store diff --git a/postfix-dynamicmaps.patch b/postfix-dynamicmaps.patch index 5bc40a8..050cd1a 100644 --- a/postfix-dynamicmaps.patch +++ b/postfix-dynamicmaps.patch @@ -493,41 +493,6 @@ diff -durN postfix-2.1.3.orig/src/util/load_lib.h postfix-2.1.3/src/util/load_li +/*--*/ + +#endif -diff -durN postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_defs.h ---- postfix-2.1.3.orig/src/util/sys_defs.h 2004-06-22 15:38:57.190461088 +0200 -+++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 15:39:24.255859620 +0200 -@@ -560,6 +560,7 @@ - #define UNIX_DOMAIN_CONNECT_BLOCKS_FOR_ACCEPT - #define PREPEND_PLUS_TO_OPTSTRING - #define HAS_POSIX_REGEXP -+#define HAS_DLOPEN - #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail" - #define NATIVE_MAILQ_PATH "/usr/bin/mailq" - #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases" -@@ -596,6 +597,7 @@ - #define UNIX_DOMAIN_CONNECT_BLOCKS_FOR_ACCEPT /* unverified */ - #define PREPEND_PLUS_TO_OPTSTRING - #define HAS_POSIX_REGEXP -+#define HAS_DLOPEN - #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail" - #define NATIVE_MAILQ_PATH "/usr/bin/mailq" - #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases" -@@ -638,6 +640,7 @@ - #define USE_STATFS - #define STATFS_IN_SYS_VFS_H - #define HAS_POSIX_REGEXP -+#define HAS_SHL_LOAD - #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail" - #define NATIVE_MAILQ_PATH "/usr/bin/mailq" - #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases" -@@ -673,6 +676,7 @@ - #define USE_STATFS - #define STATFS_IN_SYS_VFS_H - #define HAS_POSIX_REGEXP -+#define HAS_SHL_LOAD - #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail" - #define NATIVE_MAILQ_PATH "/usr/bin/mailq" - #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases" diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mail_dict.c --- postfix-2.1.3.orig/src/global/mail_dict.c 2004-01-04 19:53:27.000000000 +0100 +++ postfix-2.1.3/src/global/mail_dict.c 2004-06-22 15:47:45.259202712 +0200 @@ -645,8 +610,8 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai username.c valid_hostname.c vbuf.c vbuf_print.c vstream.c \ vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \ write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ -- allascii.c load_file.c vstream_tweak.c -+ allascii.c load_file.c vstream_tweak.c load_lib.c +- allascii.c load_file.c killme_after.c vstream_tweak.c ++ allascii.c load_file.c killme_after.c vstream_tweak.c load_lib.c OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \ attr_print64.o attr_print_plain.o attr_scan0.o attr_scan64.o \ attr_scan_plain.o auto_clnt.o base64_code.o basename.o binhash.o \ @@ -662,8 +627,8 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai username.o valid_hostname.o vbuf.o vbuf_print.o vstream.o \ vstream_popen.o vstring.o vstring_vstream.o watchdog.o writable.o \ write_buf.o write_wait.o sane_basename.o format_tv.o allspace.o \ -- allascii.o load_file.o vstream_tweak.o -+ allascii.o load_file.o vstream_tweak.o load_lib.o +- allascii.o load_file.o killme_after.o vstream_tweak.o ++ allascii.o load_file.o killme_after.o vstream_tweak.o load_lib.o HDRS = argv.h attr.h attr_clnt.h auto_clnt.h base64_code.h binhash.h \ chroot_uid.h cidr_match.h clean_env.h connect.h ctable.h dict.h \ dict_cdb.h dict_cidr.h dict_db.h dict_dbm.h dict_env.h dict_ht.h \ @@ -671,8 +636,8 @@ diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mai sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \ stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \ username.h valid_hostname.h vbuf.h vbuf_print.h vstream.h vstring.h \ -- vstring_vstream.h watchdog.h format_tv.h load_file.h -+ vstring_vstream.h watchdog.h format_tv.h load_file.h load_lib.h +- vstring_vstream.h watchdog.h format_tv.h load_file.h killme_after.h ++ vstring_vstream.h watchdog.h format_tv.h load_file.h killme_after.h load_lib.h TESTSRC = fifo_open.c fifo_rdwr_bug.c fifo_rdonly_bug.c select_bug.c \ stream_test.c dup2_pass_on_exec.c DEFS = -I. -D$(SYSTYPE) diff --git a/postfix-master.cf_cyrus.patch b/postfix-master.cf_cyrus.patch index 2b7417a..1b2fb02 100644 --- 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 @@ +@@ -60,15 +60,15 @@ # 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} + #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} # - # See the Postfix UUCP_README file for configuration details. + #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} + # + # ==================================================================== # -- 2.44.0