From b8eca9d37daec6269641c5fac614561c77e6f283 Mon Sep 17 00:00:00 2001 From: martti Date: Wed, 6 Mar 2002 15:07:54 +0000 Subject: Updated postfix to 1.1.4 Major changes with release-20010228 =================================== Postfix produces DSN formatted bounced/delayed mail notifications. The human-readable text still exists, so that users will not have to be unnecessarily confused by all the ugliness of RFC 1894. Full DSN support will be later. This release introduces full content filtering through an external process. This involves an incompatible change in queue file format. Mail is delivered to content filtering software via an existing mail delivery agent, and is re-injected into Postfix via an existing mail submission agent. See examples in the FILTER_README file. Depending on how the filter is implemented, you can expect to lose a factor of 2 to 4 in delivery performance of SMTP transit mail, more if the content filtering software needs lots of CPU or memory. Specify "body_checks = regexp:/etc/postfix/body_checks" for a quick and dirty emergency content filter that looks at non-header lines one line at a time (including MIME headers inside the message body). Details in conf/sample-filter.cf. The header_checks and body_checks features can be used to strip out unwanted data. Specify IGNORE on the right-hand side and the data will disappear from the mail. Support for SASL (RFC 2554) authentication in the SMTP server and in the SMTP and LMTP clients. See the SASL_README file for more details. This file still needs better examples. Postfix now ships with an LMTP delivery agent that can deliver over local/remote TCP sockets and over local UNIX-domain sockets. The LMTP_README file gives example, but still needs to be revised. Fast "ETRN" and "sendmail -qR". Postfix maintains per-destination logfiles with information about what mail is queued for selected destinations. See the file ETRN_README for details. The mailbox locking style is now fully configurable at runtime. The new configuration parameter is called "mailbox_delivery_lock". Depending on the operating system type, mailboxes can be locked with one or more of "flock", "fcntl" or "dotlock". The command "postconf -l" shows the available locking styles. The default mailbox locking style is system dependent. This change affects all mailbox and all "/file/name" deliveries by the Postfix local delivery agent. --- mail/postfix/patches/patch-aa | 270 ++++-------------------------------------- mail/postfix/patches/patch-ab | 21 ++++ mail/postfix/patches/patch-ac | 13 ++ mail/postfix/patches/patch-af | 38 ++++-- 4 files changed, 86 insertions(+), 256 deletions(-) create mode 100644 mail/postfix/patches/patch-ab create mode 100644 mail/postfix/patches/patch-ac (limited to 'mail/postfix/patches') diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa index ad55a2847bd..e4ae0f21668 100644 --- a/mail/postfix/patches/patch-aa +++ b/mail/postfix/patches/patch-aa @@ -1,265 +1,39 @@ -$NetBSD: patch-aa,v 1.9 2001/06/07 09:23:20 itojun Exp $ +$NetBSD: patch-aa,v 1.10 2002/03/06 15:07:54 martti Exp $ ---- INSTALL.sh.orig Tue May 1 23:21:22 2001 -+++ INSTALL.sh Thu Jun 7 17:50:31 2001 -@@ -7,39 +7,39 @@ - umask 022 - - test -t 0 && --cat <&2 -- echo file from a previous Postfix installation. 1>&2 -- echo 1>&2 -- echo Use interactive installation instead. 1>&2 -- exit 1 --fi -+#test -f $CONFIG_DIRECTORY/main.cf && { -+# for name in daemon_directory command_directory queue_directory mail_owner -+# do -+# eval $name='"`bin/postconf -c $CONFIG_DIRECTORY -h $name`"' || kill $$ -+# done -+#} -+ -+#if [ -f $CONFIG_DIRECTORY/install.cf ] -+#then -+# . $CONFIG_DIRECTORY/install.cf -+#elif [ ! -t 0 -a -z "$install_root" ] -+#then -+# echo Non-interactive install needs the $CONFIG_DIRECTORY/install.cf 1>&2 -+# echo file from a previous Postfix installation. 1>&2 -+# echo 1>&2 -+# echo Use interactive installation instead. 1>&2 -+# exit 1 -+#fi - - # Override default settings. - --test -t 0 && --for name in daemon_directory command_directory \ -- queue_directory sendmail_path newaliases_path mailq_path mail_owner\ -- setgid manpages +-test -z "$non_interactive" && for name in install_root tempdir config_directory -do - while : - do +- echo +- eval echo Please specify \$${name}_prompt | ${FMT} - eval echo \$n "$name: [\$$name]\ \$c" - read ans - case $ans in - "") break;; -- *) eval $name=\$ans; break;; +- *) case $ans in +- /*) eval $name=$ans; break;; +- *) echo; echo $0: Error: $name should be an absolute path name. 1>&2;; +- esac;; - esac - done -done -+#test -t 0 && -+#for name in daemon_directory command_directory \ -+# queue_directory sendmail_path newaliases_path mailq_path mail_owner\ -+# setgid manpages -+#do -+# while : -+# do -+# eval echo \$n "$name: [\$$name]\ \$c" -+# read ans -+# case $ans in -+# "") break;; -+# *) eval $name=\$ans; break;; -+# esac -+# done -+#done - - # Sanity checks - -@@ -242,10 +239,10 @@ - - DAEMON_DIRECTORY=$install_root$daemon_directory - COMMAND_DIRECTORY=$install_root$command_directory --QUEUE_DIRECTORY=$install_root$queue_directory -+QUEUE_DIRECTORY=$queue_directory - SENDMAIL_PATH=$install_root$sendmail_path --NEWALIASES_PATH=$install_root$newaliases_path --MAILQ_PATH=$install_root$mailq_path -+#NEWALIASES_PATH=$install_root$newaliases_path -+#MAILQ_PATH=$install_root$mailq_path - MANPAGES=$install_root$manpages - - # Create any missing directories. -@@ -254,7 +251,7 @@ - test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1 - test -d $COMMAND_DIRECTORY || mkdir -p $COMMAND_DIRECTORY || exit 1 - test -d $QUEUE_DIRECTORY || mkdir -p $QUEUE_DIRECTORY || exit 1 --for path in $SENDMAIL_PATH $NEWALIASES_PATH $MAILQ_PATH -+for path in $SENDMAIL_PATH - do - dir=`echo $path|sed -e 's/[/][/]*[^/]*$//' -e 's/^$/\//'` - test -d $dir || mkdir -p $dir || exit 1 -@@ -274,8 +271,8 @@ - - test -f bin/sendmail && { - compare_or_replace a+x,go-w bin/sendmail $SENDMAIL_PATH || exit 1 -- compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH -- compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH -+# compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH -+# compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH - } - - if [ -f $CONFIG_DIRECTORY/main.cf ] -@@ -300,13 +297,13 @@ - "mail_owner = $mail_owner" \ - || exit 1 +- + # In case some systems special-case pathnames beginning with //. --(echo "# This file was generated by $0" --for name in sendmail_path newaliases_path mailq_path setgid manpages --do -- eval echo $name=\$$name --done) >$tempdir/junk || exit 1 --compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1 --rm -f $tempdir/junk -+#(echo "# This file was generated by $0" -+#for name in sendmail_path newaliases_path mailq_path setgid manpages -+#do -+# eval echo $name=\$$name -+#done) >$tempdir/junk || exit 1 -+#compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1 -+#rm -f $tempdir/junk + case $install_root in + /) install_root= + esac - # Use set-gid privileges instead of writable maildrop (optional). +-CONFIG_DIRECTORY=$install_root$config_directory ++CONFIG_DIRECTORY=conf + # If a parameter is not set via the command line or environment, + # try to use settings from installed configuration files. diff --git a/mail/postfix/patches/patch-ab b/mail/postfix/patches/patch-ab new file mode 100644 index 00000000000..53d75e28fd8 --- /dev/null +++ b/mail/postfix/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.4 2002/03/06 15:07:54 martti Exp $ + +--- src/util/sys_defs.h.orig Tue Feb 12 13:46:16 2002 ++++ src/util/sys_defs.h Tue Feb 12 13:47:13 2002 +@@ -52,11 +52,11 @@ + #define STATFS_IN_SYS_MOUNT_H + #define HAS_POSIX_REGEXP + #define HAS_ST_GEN /* struct stat contains inode generation number */ +-#define DEF_SENDMAIL_PATH "/usr/sbin/sendmail" +-#define DEF_MAILQ_PATH "/usr/bin/mailq" +-#define DEF_NEWALIAS_PATH "/usr/bin/newaliases" +-#define DEF_COMMAND_DIR "/usr/sbin" +-#define DEF_DAEMON_DIR "/usr/libexec/postfix" ++#define DEF_SENDMAIL_PATH "__PREFIX/sbin/sendmail" ++#define DEF_MAILQ_PATH "__PREFIX/bin/mailq" ++#define DEF_NEWALIAS_PATH "__PREFIX/bin/newaliases" ++#define DEF_COMMAND_DIR "__PREFIX/sbin" ++#define DEF_DAEMON_DIR "__PREFIX/libexec/postfix" + #endif + + #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) diff --git a/mail/postfix/patches/patch-ac b/mail/postfix/patches/patch-ac new file mode 100644 index 00000000000..8a499c52224 --- /dev/null +++ b/mail/postfix/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.4 2002/03/06 15:07:54 martti Exp $ + +--- src/virtual/Makefile.in.orig Wed Mar 6 15:52:14 2002 ++++ src/virtual/Makefile.in Wed Mar 6 15:52:19 2002 +@@ -11,7 +11,7 @@ + PROG = virtual + TESTPROG= + INC_DIR = ../../include +-LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a $(AUXLIBS) ++LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a + + .c.o:; $(CC) $(CFLAGS) -c $*.c + diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af index 042ae0170ae..a26dc6927fc 100644 --- a/mail/postfix/patches/patch-af +++ b/mail/postfix/patches/patch-af @@ -1,14 +1,14 @@ -$NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $ +$NetBSD: patch-af,v 1.8 2002/03/06 15:07:54 martti Exp $ ---- conf/main.cf.orig Fri Dec 15 07:44:19 2000 -+++ conf/main.cf Sat Jan 13 16:39:28 2001 +--- conf/main.cf.orig Fri Feb 1 03:12:04 2002 ++++ conf/main.cf Tue Mar 5 13:54:58 2002 @@ -1,3 +1,5 @@ -+# $NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $ ++# $NetBSD: patch-af,v 1.8 2002/03/06 15:07:54 martti Exp $ +# # Global Postfix configuration file. This file lists only a subset # of all 100+ parameters. See the sample-xxx.cf files for a full list. # -@@ -28,14 +30,19 @@ +@@ -31,14 +33,19 @@ # The command_directory parameter specifies the location of all # postXXX commands. The default value is $program_directory. # @@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $ # QUEUE AND PROCESS OWNERSHIP # -@@ -52,7 +59,7 @@ +@@ -56,7 +63,7 @@ # These rights are used in the absence of a recipient user context. # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. # @@ -39,7 +39,7 @@ $NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $ # INTERNET HOST AND DOMAIN NAMES # -@@ -440,8 +447,7 @@ +@@ -495,9 +502,8 @@ # the process marches on. If you use an X-based debugger, be sure to # set up your XAUTHORITY environment variable before starting Postfix. # @@ -49,4 +49,26 @@ $NetBSD: patch-af,v 1.7 2001/03/20 13:02:05 hubertf Exp $ +debugger_command = PATH=/usr/bin:/usr/X11R6/bin; \ + xxgdb $daemon_directory/$process_name $process_id & sleep 5 - # Other configurable parameters. + # INSTALL-TIME CONFIGURATION INFORMATION + # +@@ -522,16 +528,16 @@ + # commands. This must be a group name with a numerical group ID that + # is not shared with other accounts, not even with the Postfix account. + # +-setgid_group = ++setgid_group = maildrop + + # manpage_directory: The location of the Postfix on-line manual pages. + # +-manpage_directory = ++manpage_directory = __PREFIX/man + + # sample_directory: The location of the Postfix sample configuration files. + # +-sample_directory = ++sample_directory = __PREFIX/share/postfix + + # readme_directory: The location of the Postfix README files. + # +-readme_directory = ++readme_directory = __PREFIX/share/doc/postfix -- cgit v1.2.3