Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/postfix Resolve conflicts.
details: https://anonhg.NetBSD.org/src/rev/f8b3e3d5d3fe
branches: trunk
changeset: 583662:f8b3e3d5d3fe
user: rpaulo <rpaulo%NetBSD.org@localhost>
date: Thu Aug 18 21:46:19 2005 +0000
description:
Resolve conflicts.
diffstat:
gnu/dist/postfix/conf/main.cf | 17 +-
gnu/dist/postfix/conf/master.cf | 101 +-
gnu/dist/postfix/conf/post-install | 79 +-
gnu/dist/postfix/conf/postfix-files | 36 +-
gnu/dist/postfix/conf/postfix-script | 72 +-
gnu/dist/postfix/makedefs | 86 +-
gnu/dist/postfix/man/man5/canonical.5 | 86 +-
gnu/dist/postfix/man/man5/postconf.5 | 1979 ++++++++++++++++++++++++++++----
gnu/dist/postfix/man/man5/virtual.5 | 60 +-
gnu/dist/postfix/man/man8/cleanup.8 | 62 +-
gnu/dist/postfix/man/man8/lmtp.8 | 13 +-
gnu/dist/postfix/man/man8/local.8 | 158 +-
12 files changed, 2214 insertions(+), 535 deletions(-)
diffs (truncated from 4979 to 300 lines):
diff -r 46e0a84efb87 -r f8b3e3d5d3fe gnu/dist/postfix/conf/main.cf
--- a/gnu/dist/postfix/conf/main.cf Thu Aug 18 21:33:04 2005 +0000
+++ b/gnu/dist/postfix/conf/main.cf Thu Aug 18 21:46:19 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: main.cf,v 1.11 2004/07/28 23:19:42 heas Exp $
+# $NetBSD: main.cf,v 1.12 2005/08/18 21:50:35 rpaulo Exp $
#
# Global Postfix configuration file. This file lists only a subset
# of all 300+ parameters. See the postconf(5) manual page for a
@@ -588,11 +588,24 @@
PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
xxgdb $daemon_directory/$process_name $process_id & sleep 5
-# If you don't have X installed on the Postfix machine, try:
+# If you can't use X, use this to capture the call stack when a
+# daemon crashes. The result is in a file in the configuration
+# directory, and is named after the process name and the process ID.
+#
# debugger_command =
# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont;
# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1
# >$config_directory/$process_name.$process_id.log & sleep 5
+#
+# Another possibility is to run gdb under a detached screen session.
+# To attach to the screen sesssion, su root and run "screen -r
+# <id_string>" where <id_string> uniquely matches one of the detached
+# sessions (from "screen -list").
+#
+# debugger_command =
+# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen
+# -dmS $process_name gdb $daemon_directory/$process_name
+# $process_id & sleep 1
# INSTALL-TIME CONFIGURATION INFORMATION
#
diff -r 46e0a84efb87 -r f8b3e3d5d3fe gnu/dist/postfix/conf/master.cf
--- a/gnu/dist/postfix/conf/master.cf Thu Aug 18 21:33:04 2005 +0000
+++ b/gnu/dist/postfix/conf/master.cf Thu Aug 18 21:46:19 2005 +0000
@@ -1,79 +1,8 @@
-# $NetBSD: master.cf,v 1.10 2004/07/28 23:19:42 heas Exp $
+# $NetBSD: master.cf,v 1.11 2005/08/18 21:50:35 rpaulo Exp $
#
#
-# Postfix master process configuration file. Each logical line
-# describes how a Postfix daemon program should be run.
-#
-# A logical line starts with non-whitespace, non-comment text.
-# Empty lines and whitespace-only lines are ignored, as are comment
-# lines whose first non-whitespace character is a `#'.
-# A line that starts with whitespace continues a logical line.
-#
-# The fields that make up each line are described below. A "-" field
-# value requests that a default value be used for that field.
-#
-# Service: any name that is valid for the specified transport type
-# (the next field). With INET transports, a service is specified as
-# host:port. The host part (and colon) may be omitted. Either host
-# or port may be given in symbolic form or in numeric form. Examples
-# for the SMTP server: localhost:smtp receives mail via the loopback
-# interface only; 10025 receives mail on port 10025.
-#
-# Transport type: "inet" for Internet sockets, "unix" for UNIX-domain
-# sockets, "fifo" for named pipes.
-#
-# Private: whether or not access is restricted to the mail system.
-# Default is private service. Internet (inet) sockets can't be private.
-#
-# Unprivileged: whether the service runs with root privileges or as
-# the owner of the Postfix system (the owner name is controlled by the
-# mail_owner configuration variable in the main.cf file). Only the
-# pipe, virtual and local delivery daemons require privileges.
-#
-# Chroot: whether or not the service runs chrooted to the mail queue
-# directory (pathname is controlled by the queue_directory configuration
-# variable in the main.cf file). Presently, all Postfix daemons can run
-# chrooted, except for the pipe, virtual and local delivery daemons.
-# The proxymap server can run chrooted, but doing so defeats most of
-# the purpose of having that service in the first place.
-# The files in the examples/chroot-setup subdirectory describe how
-# to set up a Postfix chroot environment for your type of machine.
-#
-# Wakeup time: automatically wake up the named service after the
-# specified number of seconds. A ? at the end of the wakeup time
-# field requests that wake up events be sent only to services that
-# are actually being used. Specify 0 for no wakeup. Presently, only
-# the pickup, queue manager and flush daemons need a wakeup timer.
-#
-# Max procs: the maximum number of processes that may execute this
-# service simultaneously. Default is to use a globally configurable
-# limit (the default_process_limit configuration parameter in main.cf).
-# Specify 0 for no process count limit.
-#
-# Command + args: the command to be executed. The command name is
-# relative to the Postfix program directory (pathname is controlled by
-# the daemon_directory configuration variable). Adding one or more
-# -v options turns on verbose logging for that service; adding a -D
-# option enables symbolic debugging (see the debugger_command variable
-# in the main.cf configuration file). See individual command man pages
-# for specific command-line options, if any.
-#
-# General main.cf options can be overridden for specific services.
-# To override one or more main.cf options, specify them as arguments
-# below, preceding each option by "-o". There must be no whitespace
-# in the option itself (separate multiple values for an option by
-# commas).
-#
-# In order to use the "uucp" message tranport below, set up entries
-# in the transport table.
-#
-# In order to use the "cyrus" message transport below, configure it
-# in main.cf as the mailbox_transport.
-#
-# SPECIFY ONLY PROGRAMS THAT ARE WRITTEN TO RUN AS POSTFIX DAEMONS.
-# ALL DAEMONS SPECIFIED HERE MUST SPEAK A POSTFIX-INTERNAL PROTOCOL.
-#
-# DO NOT SHARE THE POSTFIX QUEUE BETWEEN MULTIPLE POSTFIX INSTANCES.
+# Postfix master process configuration file. For details on the format
+# of the file, see the Postfix master(5) manual page.
#
# ==========================================================================
# service type private unpriv chroot wakeup maxproc command + args
@@ -82,11 +11,18 @@
#smtp inet n - n - - smtpd
#submission inet n - n - - smtpd
# -o smtpd_etrn_restrictions=reject
+# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+#smtps inet n - n - - smtpd
+# -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
+#submission inet n - n - - smtpd
+# -o smtpd_etrn_restrictions=reject
+# -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
#628 inet n - n - - qmqpd
pickup unix n - n 60 1 pickup
cleanup unix n - n - 0 cleanup
qmgr unix n - n 300 1 qmgr
#qmgr fifo n - n 300 1 oqmgr
+tlsmgr unix - - n 1000? 1 tlsmgr
rewrite unix - - n - - trivial-rewrite
bounce unix - - n - 0 bounce
defer unix - - n - 0 bounce
@@ -95,19 +31,30 @@
flush unix n - n 1000? 0 flush
proxymap unix - - n - - proxymap
smtp unix - - n - - smtp
+# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
relay unix - - n - - smtp
+ -o fallback_relay=
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
showq unix n - n - - showq
error unix - - n - - error
+discard unix - - n - - discard
local unix - n n - - local
virtual unix - n n - - virtual
lmtp unix - - n - - lmtp
#anvil unix - - n - 1 anvil
+#scache unix - - n - 1 scache
#
+# ====================================================================
# Interfaces to non-Postfix software. Be sure to examine the manual
# pages of the non-Postfix software to find out what options it wants.
#
+# Many of the following services use the Postfix pipe(8) delivery
+# agent. See the pipe(8) man page for information about ${recipient}
+# and other message envelope options.
+# ====================================================================
+#
# maildrop. See the Postfix MAILDROP_README file for details.
+# 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}
@@ -120,8 +67,14 @@
# 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}
+#
+# See the Postfix UUCP_README file for configuration details.
+#
uucp unix - n n - - pipe
flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
+#
+# Other external delivery methods.
+#
ifmail unix - n n - - pipe
flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
bsmtp unix - n n - - pipe
diff -r 46e0a84efb87 -r f8b3e3d5d3fe gnu/dist/postfix/conf/post-install
--- a/gnu/dist/postfix/conf/post-install Thu Aug 18 21:33:04 2005 +0000
+++ b/gnu/dist/postfix/conf/post-install Thu Aug 18 21:46:19 2005 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: post-install,v 1.7 2004/07/28 23:19:42 heas Exp $
+# $NetBSD: post-install,v 1.8 2005/08/18 21:50:35 rpaulo Exp $
#
# To view the formatted manual page of this file, type:
@@ -475,7 +475,12 @@
test -n "$set_permission" && {
chown $recursive $owner $path || exit 1
test -z "$group" || chgrp $recursive $group $path || exit 1
- chmod $recursive $mode $path || exit 1
+ if [ "$type" = "d" -a -n "$recursive" ]
+ then
+ find $path -type d -exec chmod $mode "{}" ";"
+ else
+ chmod $mode $path
+ fi || exit 1
}
done
IFS="$BACKUP_IFS"
@@ -566,22 +571,13 @@
}
done
- # With 20000 active queue files, the active queue directory should
- # be hashed, and so should the other directories, because they
- # can contain even more mail.
- #
- # Unfortunately, this sucks mailq performance on unloaded systems.
- #
- # If you don't want slow mailq, be sure to hash defer and deferred,
- # because those two directories can contain lots of files.
+ # File systems have improved since Postfix came out, and all we
+ # require now is that defer and deferred are hashed because those
+ # can contain lots of files.
found=`$POSTCONF -c $config_directory -h hash_queue_names`
missing=
- (echo "$found" | grep active >/dev/null) || missing="$missing active"
- (echo "$found" | grep bounce >/dev/null) || missing="$missing bounce"
(echo "$found" | grep defer >/dev/null) || missing="$missing defer"
- (echo "$found" | grep flush >/dev/null) || missing="$missing flush"
- (echo "$found" | grep incoming>/dev/null)|| missing="$missing incoming"
(echo "$found" | grep deferred>/dev/null)|| missing="$missing deferred"
test -n "$missing" && {
echo fixing main.cf hash_queue_names for missing $missing
@@ -600,7 +596,7 @@
if [ -z "$has_lrm" -a -z "$has_lrjc" ]
then
echo SAFETY: editing main.cf, setting $unknown_local=450.
- echo See the RELEASE_NOTES and LOCAL_RECIPIENT_README files for details.
+ echo See the LOCAL_RECIPIENT_README file for details.
$POSTCONF -e "$unknown_local = 450" || exit 1
fi
@@ -615,12 +611,53 @@
# Add missing anvil service to master.cf.
-# grep '^anvil.*anvil' $config_directory/master.cf >/dev/null || {
-# echo Editing $config_directory/master.cf, adding missing entry for anvil service
-# cat >>$config_directory/master.cf <<EOF || exit 1
-#anvil unix - - n - 1 anvil
-#EOF
-# }
+ grep '^anvil.*anvil' $config_directory/master.cf >/dev/null || {
+ echo Editing $config_directory/master.cf, adding missing entry for anvil service
+ cat >>$config_directory/master.cf <<EOF || exit 1
+anvil unix - - n - 1 anvil
+EOF
+ }
+
+ # Add missing scache service to master.cf.
+
+ grep '^scache.*scache' $config_directory/master.cf >/dev/null || {
+ echo Editing $config_directory/master.cf, adding missing entry for scache service
+ cat >>$config_directory/master.cf <<EOF || exit 1
+scache unix - - n - 1 scache
+EOF
+ }
+
+ # Add missing discard service to master.cf.
+
+ grep '^discard.*discard' $config_directory/master.cf >/dev/null || {
+ echo Editing $config_directory/master.cf, adding missing entry for discard service
+ cat >>$config_directory/master.cf <<EOF || exit 1
+discard unix - - n - - discard
+EOF
+ }
+
+ # Update the tlsmgr fifo->unix service.
+
+ grep "^tlsmgr[ ]*fifo[ ]" \
+ $config_directory/master.cf >/dev/null && {
+ echo Editing $config_directory/master.cf, updating the tlsmgr from fifo to unix service
+ ed $config_directory/master.cf <<EOF || exit 1
+/^tlsmgr[ ]*fifo[ ]/
+s/fifo/unix/
+p
+w
+q
+EOF
+ }
+
+ # Add missing tlsmgr service to master.cf.
+
+ grep '^tlsmgr.*tlsmgr' $config_directory/master.cf >/dev/null || {
+ echo Editing $config_directory/master.cf, adding missing entry for tlsmgr service
+ cat >>$config_directory/master.cf <<EOF || exit 1
+tlsmgr unix - - n 1000? 1 tlsmgr
Home |
Main Index |
Thread Index |
Old Index