[src/trunk]: src/gnu/dist/postfix/README_FILES Resolve conflicts.

[rpaulo <rpaulo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/46e0a84efb87
branches:  trunk
changeset: 583661:46e0a84efb87
user:      rpaulo <rpaulo%NetBSD.org@localhost>
date:      Thu Aug 18 21:33:04 2005 +0000

description:
Resolve conflicts.

diffstat:

 gnu/dist/postfix/README_FILES/INSTALL       |   55 +-
 gnu/dist/postfix/README_FILES/RELEASE_NOTES |  879 +++++++++++----------------
 2 files changed, 406 insertions(+), 528 deletions(-)

diffs (truncated from 1059 to 300 lines):

diff -r 731dfd4a49ce -r 46e0a84efb87 gnu/dist/postfix/README_FILES/INSTALL
--- a/gnu/dist/postfix/README_FILES/INSTALL     Thu Aug 18 21:07:25 2005 +0000
+++ b/gnu/dist/postfix/README_FILES/INSTALL     Thu Aug 18 21:33:04 2005 +0000
@@ -67,7 +67,7 @@
     % export MANPATH; MANPATH="`pwd`/man:$MANPATH"
     % setenv MANPATH "`pwd`/man:$MANPATH"
 
-Of particular interest is the postconf(5) manual page that lists all the 300+
+Of particular interest is the postconf(5) manual page that lists all the 400+
 configuration parameters. The HTML version of this text makes it easy to
 navigate around.
 
@@ -95,7 +95,7 @@
     OSF1.V3 - OSF1.V5 (Digital UNIX)
     Reliant UNIX 5.x
     Rhapsody 5.x
-    SunOS 4.1.4 (January 2004)
+    SunOS 4.1.4 (February 2005)
     SunOS 5.4 - 5.9 (Solaris 2.4..9)
     Ultrix 4.x (well, that was long ago)
 
@@ -168,10 +168,11 @@
     |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ |
     |SASL authentication               |SASL_README |Postfix 1.0 |
     |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ |
+    |STARTTLS session encryption       |TLS_README  |Postfix 2.2 |
+    |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ |
 
-Note: support for TLS (encrypted SMTP sessions and certificate based
-authentication) and for IP version 6 is still separate from Postfix but is
-expected to be merged soon.
+Note: IP version 6 support is compiled into Postfix on operating systems that
+have IPv6 support. See the IPV6_README file for details.
 
 44..44 -- OOvveerrrriiddiinngg bbuuiilltt--iinn ppaarraammeetteerr ddeeffaauulltt sseettttiinnggss
 
@@ -301,15 +302,6 @@
 
     Note: there should be no whitespace before "postfix:".
 
-  * Make sure there is a "postfix" alias in /etc/aliases, or whatever the
-    pathname of your aliases file is; the command "postconf alias_maps" will
-    tell you.
-
-        /etc/aliases:
-            postfix: root
-
-    Note: there should be no whitespace before "postfix:".
-
   * Create a group "postdrop" with a group id that is not used by any other
     user account. Not even by the postfix user account. My group file entry
     looks like:
@@ -608,16 +600,29 @@
 
 1100..88 -- CCrreeaattee tthhee aalliiaasseess ddaattaabbaassee
 
-Finally, if you haven't used Sendmail prior to using Postfix, you will have to
-build the alias database with one of the following commands:
+Postfix uses a Sendmail-compatible aliases(5) table to redirect mail for local
+(8) recipients. Typically, this information is kept in two files: in a text
+file /etc/aliases and in an indexed file /etc/aliases.db. The command "postconf
+alias_maps" will tell you the exact location of the text file.
+
+First, be sure to update the text file with aliases for root, postmaster and
+"postfix" that forward mail to a real person. Postfix has a sample aliases file
+/etc/postfix/aliases that you can adapt to local conditions.
+
+    /etc/aliases:
+        root: you
+        postmaster: root
+        postfix: root
+        bin: root
+        etcetera...
+
+Note: there should be no whitespace before the ":".
+
+Finally, build the indexed aliases file with one of the following commands:
 
     # newaliases
     # sendmail -bi
 
-Be sure to set up aliases for root and postmaster that forward mail to a real
-person. Postfix has a sample aliases file /etc/postfix/aliases that you can
-adapt to local conditions.
-
 1111 -- TToo cchhrroooott oorr nnoott ttoo cchhrroooott
 
 Postfix daemon processes can be configured (via master.cf) to run in a chroot
@@ -648,9 +653,15 @@
 Additionally, you almost certainly need to configure syslogd so that it listens
 on a socket inside the Postfix queue directory. Examples for specific systems:
 
-FreeBSD: syslogd -l /var/spool/postfix/var/run/log
+FreeBSD:
+
+    # mkdir -p /var/spool/postfix/var/run
+    # syslogd -l /var/spool/postfix/var/run/log
 
-Linux, OpenBSD: syslogd -a /var/spool/postfix/dev/log
+Linux, OpenBSD:
+
+    # mkdir -p /var/spool/postfix/dev
+    # syslogd -a /var/spool/postfix/dev/log
 
 1122 -- CCaarree aanndd ffeeeeddiinngg ooff tthhee PPoossttffiixx ssyysstteemm
 
diff -r 731dfd4a49ce -r 46e0a84efb87 gnu/dist/postfix/README_FILES/RELEASE_NOTES
--- a/gnu/dist/postfix/README_FILES/RELEASE_NOTES       Thu Aug 18 21:07:25 2005 +0000
+++ b/gnu/dist/postfix/README_FILES/RELEASE_NOTES       Thu Aug 18 21:33:04 2005 +0000
@@ -1,576 +1,443 @@
-In the text below, incompatible changes are labeled with the Postfix
-snapshot that introduced the change. If you upgrade from a later
-Postfix version, then you do not have to worry about that particular
-incompatibility.
+The stable Postfix release is called postfix-2.2.x where 2=major
+release number, 2=minor release number, x=patchlevel.  The stable
+release never changes except for patches that address bugs or
+emergencies. Patches change the patchlevel and the release date.
+
+New features are developed in snapshot releases. These are called
+postfix-2.3-yyyymmdd where yyyymmdd is the release date (yyyy=year,
+mm=month, dd=day).  Patches are never issued for snapshot releases;
+instead, a new snapshot is released.
+
+The mail_release_date configuration parameter (format: yyyymmdd)
+specifies the release date of a stable release or snapshot release.
+
+Main changes with Postfix version 2.2
+-------------------------------------
+
+This is a summary of the changes. These and more are detailed in
+the following sections of this document.
+
+- TLS and IPv6 support are now built into Postfix, based on code
+from third-party patches.
+
+- Extended query interface for LDAP, MySQL and PostgreSQL with free
+form SQL queries, and domain filters to reduce unnecessary lookups.
 
-The official Postfix release is called 2.1.x where 2=major release
-number, 1=minor release number, x=patchlevel.  Snapshot releases
-are called 2.2-yyyymmdd where yyyymmdd is the release date (yyyy=year,
-mm=month, dd=day).  The mail_release_date configuration parameter
-contains the release date (both for official release and snapshot
-release).  Patches are issued for the official release and change
-the patchlevel and the release date. Patches are never issued for
-snapshot releases.
+- SMTP client-side connection reuse. This can dramatically speed
+up deliveries to high-volume destinations that have some servers
+that respond, and some non-responding mail servers.
+
+- By default, Postfix no longer rewrites message headers in mail
+from remote clients. This includes masquerading, canonical mapping,
+replacing "!" and "%" by "@", and appending the local domain to
+incomplete addresses.  Thus, spam from poorly written software no
+longer looks like it came from a local user.
+
+- When your machine does not have its own domain name, Postfix can
+now replace your "home network" email address by your ISP account
+in outgoing SMTP mail, while leaving your email address unchanged
+when sending mail to someone on the local machine.
+
+- Compatibility workarounds: you can now selectively turn off ESMTP
+features such as AUTH or STARTTLS in the Postfix SMTP client or
+server, without having to "dumb down" other mail deliveries, and
+without having to use transport maps for outgoing mail.
+
+- Remote SMTP client resource control (the anvil server).  This
+allows you to limit the number of connections, or the number of
+MAIL FROM and RCPT TO commands that an SMTP client can send per
+unit time.
+
+- Support for CDB, SDBM and NIS+ databases is now built into Postfix
+(but the CDB and SDBM libraries are not).
+
+- New SMTP access control features, and more.
 
 Major changes - critical
 ------------------------
 
-If you run Postfix 2.0 or earlier then you must stop Postfix before
-upgrading. The master-child protocols have changed between Postfix
-1.1 and 2.0, and version 2.1 sometimes writes queue files that the
-2.0 and earlier queue managers complain about. If this happens move
-the files from the corrupt directory to the maildrop directory and
-give them another chance.
+BEFORE upgrading from an older release you MUST stop Postfix, unless
+you're running a Postfix 2.2 snapshot release that already has
+Postfix 2.2 IPV6 and TLS support.
+
+AFTER upgrading from an older release DO NOT copy the old
+master.cf/main.cf files over the new files.  Instead, you MUST let
+the Postfix installation procedure update the existing configuration
+files with new service entries.
+
+[Incompat 20041118] The master-child protocol has changed.  The
+Postfix master daemon will log warnings about partial status updates
+if you don't stop and start Postfix.
+
+[Incompat 20041023, 20041009] The queue manager to delivery agent
+protocol has changed. Mail will remain queued if you do not restart
+the queue manager.
+
+[Incompat 20050111] The upgrade procedure adds the tlsmgr service
+to the master.cf file. This service entry is not compatible with
+the Postfix/TLS patch.
+
+[Feature 20040919] The upgrade procedure adds the discard service
+to the master.cf file.
+
+[Feature 20040720] The upgrade procedure adds the scache (shared
+connection cache) service to the master.cf file.
+
+Major changes - IPv6 support
+----------------------------
 
-[Incompat 20021119] The Postfix upgrade procedure will add two new
-services to your master.cf file: "trace" and "verify". These servers
-can run inside a chroot jail, have no interaction with users, and
-don't talk to the network.  If Postfix complains that "trace" and
-"verify" are not found, you made the error of copying your old
-Postfix configuration files over the new ones. Execute "postfix
-upgrade-configuration" to repair the Postfix configuration files.
+[Feature 20050111] Postfix version 2.2 IP version 6 support based
+on the Postfix/IPv6 patch by Dean Strik and others.  IPv6 support
+is always compiled into Postfix on systems that have Postfix
+compatible IPv6 support. On other systems Postfix will simply use
+IP version 4 just like it did before. See the IPV6_README document
+for what systems are supported, and how to turn on IPv6 in main.cf.
+
+[Incompat 20050111] Postfix version 2.2 IPv6 support differs from
+the Postfix/IPv6 patch by Dean Strik in a few minor ways.
+
+- Network protocol support including DNS lookup is selected with
+the inet_protocols parameter instead of the inet_interfaces parameter.
+This is needed so that Postfix will not attempt to deliver mail via
+IPv6 when the system has no IPv6 connectivity.
 
-[Incompat 20040331] Support for the non-standard Errors-To:  message
-header is removed.  This also helps to stop potential attacks that
-rely on bouncing mail to a destination that is not directly reachable
-by the attacker. Specify "enable_errors_to = yes" to get the old
-behavior.
+- The lmtp_bind_address6 feature was omitted. The Postfix LMTP
+client will be absorbed into the SMTP client, so there is no reason
+to keep adding features to the LMTP client.
+
+- The CIDR-based address matching code was rewritten.  The new
+behavior is believed to be closer to expectation. The results may
+be incompatible with that of the Postfix/IPv6 patch.
 
-Queue files written by Postfix 2.1 may contain information that
-is incompatible with older Postfix versions:
+[Incompat 20050117] The Postfix SMTP server now requires that IPv6
+addresses in SMTP commands are specified as [ipv6:ipv6address], as
+described in RFC 2821.
+
+Major changes - TLS support
+---------------------------
+
+[Feature 20041210] Postfix version 2.2 TLS support, based on the
+Postfix/TLS patch by Lutz Jaenicke.  TLS support is not compiled
+in by default.  For more information about Postfix 2.2 TLS support,
+see the TLS_README document.
 
-[Incompat 20040120] Queue files creates with "sendmail -v" are no
-longer compatible with Postfix versions 2.0 and earlier. A new
-record type, "killed", was introduced in order to avoid repeated
-mail delivery reports from mail that could not be delivered due to
-a temporary error condition.
+[Incompat 20041210] Postfix version 2.2 TLS support differs from
+the Postfix/TLS patch by Lutz Jaenicke in a few minor ways.
+
+- main.cf: Use btree instead of sdbm for TLS session cache databases.
+
+  Session caches are now accessed only by the tlsmgr(8) process,
+  so there are no concurrency issues. Although Postfix still has
+  an SDBM client, the SDBM library (1000 lines of code) is no longer
+  included with Postfix.
+
+  TLS session caches can use any database that can store objects
+  of several kbytes or more, and that implements the sequence
+  operation. In most cases, btree databases should be adequate.
 
-[Incompat 20030125] This release adds a new queue file record type
-for the address specified in "REDIRECT user@domain" actions in
-access maps or header/body_checks. Queue files with these records
-will be rejected by older Postfix versions.
+  NOTE: You cannot use dbm databases. TLS session objects are too
+  large.
+
+- master.cf: Specify unix instead of fifo for the tlsmgr service type.
+  This change is automatically made by the Postfix upgrade procedure.
+
+  The smtp(8) and smtpd(8) processes use a client-server protocol
+  in order to access the tlsmgr(8)'s pseudo-random number generation
+  (PRNG) pool, and in order to access the TLS session cache databases.
+  Such a protocol cannot be run across fifos.
+
+[Feature 20050209] The Postfix SMTP server policy delegation protocol