-diff -urN postfix-beta-19990122-pl01.orig/conf/access postfix-beta-19990122-pl01/conf/access
---- postfix-beta-19990122-pl01.orig/conf/access Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/access Sat Feb 27 23:33:03 1999
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix access table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/access\fR
-+# \fBpostmap /etc/mail/access\fR
- # DESCRIPTION
- # The optional \fBaccess\fR table directs the Postfix SMTP server
- # to selectively reject or accept mail from or to specific hosts,
-diff -urN postfix-beta-19990122-pl01.orig/conf/canonical postfix-beta-19990122-pl01/conf/canonical
---- postfix-beta-19990122-pl01.orig/conf/canonical Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/canonical Sat Feb 27 23:33:03 1999
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix canonical table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/canonical\fR
-+# \fBpostmap /etc/mail/canonical\fR
- # DESCRIPTION
- # The optional \fBcanonical\fR file specifies an address mapping for
- # local and non-local addresses. The mapping is used by the
-diff -urN postfix-beta-19990122-pl01.orig/conf/main.cf postfix-beta-19990122-pl01/conf/main.cf
---- postfix-beta-19990122-pl01.orig/conf/main.cf Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/main.cf Sat Feb 27 23:33:13 1999
-@@ -5,6 +5,7 @@
- # that begin with whitespace continue the previous line. A value can
- # contain references to other $names or ${name}s.
-
-+#######################################################################
- # LOCAL PATHNAME INFORMATION
- #
- # The queue_directory specifies the location of the Postfix queue.
-@@ -18,20 +19,21 @@
- # Postfix support programs and daemons. This setting can be overruled
- # with the command_directory and daemon_directory parameters.
- #
--program_directory = /some/where/postfix/bin
-+#program_directory = /usr/libexec/postfix
-
- # The command_directory parameter specifies the location of all
- # postXXX commands. The default value is $program_directory.
- #
--#command_directory = /usr/sbin
-+command_directory = /usr/sbin
-
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--#daemon_directory = /usr/libexec/postfix
+diff -Nur postfix-2.0.16.orig/conf/main.cf postfix-2.0.16/conf/main.cf
+--- postfix-2.0.16.orig/conf/main.cf Sat Sep 6 02:30:35 2003
++++ postfix-2.0.16/conf/main.cf Mon Dec 1 14:26:08 2003
+@@ -37,7 +37,7 @@
+ # daemon programs (i.e. programs listed in the master.cf file). This
+ # directory must be owned by root.
+ #
+-daemon_directory = /usr/libexec/postfix
+daemon_directory = /usr/lib/postfix
-+#######################################################################
# QUEUE AND PROCESS OWNERSHIP
#
- # The mail_owner parameter specifies the owner of the Postfix queue
-@@ -40,14 +42,14 @@
- # OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In particular,
- # don't specify nobody or daemon. PLEASE USE A DEDICATED USER.
- #
--#mail_owner = postfix
-+mail_owner = postfix
-
- # The default_privs parameter specifies the default rights used by
- # the local delivery agent for delivery to external file or command.
+@@ -55,7 +55,7 @@
# These rights are used in the absence of a recipient user context.
# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
#
# INTERNET HOST AND DOMAIN NAMES
#
-@@ -66,6 +68,7 @@
+@@ -87,7 +87,7 @@
+ # myorigin also specifies the default domain name that is appended
+ # to recipient addresses that have no @domain part.
#
- #mydomain = domain.name
-
-+#######################################################################
- # SENDING MAIL
- #
- # The myorigin parameter specifies the domain that locally-posted
-@@ -78,6 +81,7 @@
- #myorigin = $myhostname
+-#myorigin = $myhostname
++myorigin = $myhostname
#myorigin = $mydomain
-+#######################################################################
# RECEIVING MAIL
-
- # The inet_interfaces parameter specifies the network interface
-@@ -113,6 +117,7 @@
- #mydestination = $myhostname, localhost.$mydomain, $mydomain,
- # mail.$mydomain, www.$mydomain, ftp.$mydomain
-
-+#######################################################################
- # INTERNET VERSUS INTRANET
- #
- # The relayhost parameter specifies the default host to send mail to
-@@ -132,6 +137,7 @@
- #relayhost = uucphost
- #relayhost = [mail.$mydomain:9999]
-
-+#######################################################################
- # DEFAULT TRANSPORT
- #
- # The default_transport parameter specifies the default message
-@@ -141,28 +147,167 @@
- #default_transport = smtp
- #default_transport = uucp
-
-+#######################################################################
- # ADDRESS REWRITING
- #
--# Insert text from sample-rewrite.cf if you need to do address
--# masquerading.
-+# address masquerading
-+# ^^^^^^^^^^^^^^^^^^^^
-+# The allow_percent_hack parameter controls the rewriting of the form
-+# "user%domain" to "user@domain". This is enabled by default.
- #
--# Insert text from sample-canonical.cf if you need to do address
--# rewriting, or if you need username->Firstname.Lastname mapping.
-+# allow_percent_hack = no
-+allow_percent_hack = yes
-
-+# The append_at_myorigin controls the rewriting of the form "user" to
-+# "user@$mydomain". This should not be turned off.
-+#
-+append_at_myorigin = yes
-+
-+# The append_dot_mydomain controls the rewriting of the form
-+# "user@host" to "user@host.$mydomain". This is enabled by default.
-+#
-+# append_dot_mydomain = no
-+append_dot_mydomain = yes
-+
-+# The empty_address_recipient specifies the destination for mail from
-+# <> that is undeliverable (typically, bounce notifications and
-+# other notifications). By default, such mail is sent to MAILER-DAEMON.
-+#
-+empty_address_recipient = MAILER-DAEMON
-+
-+# The masquerade_domains parameter gives an optional list of domains
-+# that must have their subdomain structure stripped off.
-+#
-+# By default, address masquerading is disabled.
-+#
-+# masquerade_domains = $mydomain
-+masquerade_domains =
-+
-+# The masquerade_exceptions parameter gives an optional list of user
-+# names that are not subjected to address masquerading.
-+#
-+# By default, address masquerading makes no exceptions.
-+#
-+#masquerade_exceptions = root
-+masquerade_exceptions =
-+
-+# The swap_bangpath parameter controls the rewriting of the form
-+# "site!user" to "user@site". This is necessary if your machine is
-+# connected to UUCP networks. It is enabled by default.
-+#
-+# swap_bangpath = no
-+swap_bangpath = yes
-+
-+# address rewriting, or if you need username->Firstname.Lastname mapping
-+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+# The canonical_maps parameter specifies optional address mapping
-+# lookup tables. The mapping is applied to both sender and recipient
-+# addresses, in both envelopes and in headers. This is typically used
-+# to clean up dirty addresses from legacy mail systems, or to replace
-+# login names by Firstname.Lastname. See canonical(5) for details.
-+#
-+# By default, no canonical address mapping is done.
-+#
-+# If you use this feature, run "postmap /etc/mail/canonical" to
-+# build the necessary DBM or DB file after every change. The changes
-+# will become visible after a minute or so. Use "postfix reload"
-+# to eliminate the delay.
-+#
-+# canonical_maps = dbm:/etc/mail/canonical
-+# canonical_maps = hash:/etc/mail/canonical
-+# canonical_maps = hash:/etc/mail/canonical, nis:canonical
-+# canonical_maps = hash:/etc/mail/canonical, netinfo:/canonical
-+canonical_maps =
-+
-+# The recipient_canonical_maps parameter specifies optional address
-+# mapping lookup tables for envelope and header RECIPIENT addresses.
-+#
-+# By default, no recipient-only address mapping is done.
-+#
-+# $recipient_canonical_maps is used before $canonical_maps lookups.
-+#
-+# recipient_canonical_maps = hash:/etc/mail/recipient_canonical
-+recipient_canonical_maps =
-+
-+# The sender_canonical_maps parameter specifies optional address
-+# mapping lookup tables for envelope and header SENDER addresses.
-+#
-+# For example, you want to rewrite the SENDER address user@ugly.domain
-+# to user@pretty.domain, while still being able to send mail to the
-+# RECIPIENT address user@ugly.domain.
-+#
-+# By default, no sender-only address mapping is done.
-+#
-+# $sender_canonical_maps is used before $canonical_maps lookups.
-+#
-+# sender_canonical_maps = hash:/etc/mail/sender_canonical
-+sender_canonical_maps =
-+
-+#######################################################################
- # ADDRESS REDIRECTION (VIRTUAL DOMAIN)
- #
--# Insert text from sample-virtual.cf if you need virtual domain support.
-+# This file contains example settings of Postfix configuration
-+# parameters that control virtual database lookups.
-
-+# The virtual_maps parameter specifies optional lookup tables to
-+# redirect specific addresses or even complete domains to another
-+# address. This is typically used to implement virtual domain support.
-+#
-+# By default, no address redirection is done.
-+#
-+# If you use this feature, run "postmap /etc/mail/virtual" to
-+# build the necessary DBM or DB file after change.
-+#
-+# It will take a minute or so before the change becomes visible.
-+# Use "postfix reload" to eliminate the delay.
-+#
-+# virtual_maps = dbm:/etc/mail/virtual
-+# virtual_maps = hash:/etc/mail/virtual
-+# virtual_maps = hash:/etc/mail/virtual, nis:virtual
-+# virtual_maps = hash:/etc/mail/virtual, netinfo:/virtual
-+virtual_maps =
-+
-+#######################################################################
- # "USER HAS MOVED" BOUNCE MESSAGES
- #
--# Insert text from sample-relocated.cf if you need "user has moved"
--# style bounce messages. Alternatively, you can bounce recipients
--# with an SMTP server access table. See sample-smtpd.cf.
-+# This file contains example settings of Postfix configuration
-+# parameters that control relocated database lookups.
-+
-+# The relocated_maps parameter specifies optional lookup tables with
-+# new contact information for users or even domains that no longer
-+# exist.
-+#
-+# By default, this feature is disabled.
-+#
-+# If you use this feature, run "postmap /etc/mail/relocated" to
-+# build the necessary DBM or DB file after change, then "postfix
-+# reload" to make the changes visible.
-+#
-+# relocated_maps = dbm:/etc/mail/relocated
-+# relocated_maps = hash:/etc/mail/relocated
-+# relocated_maps = hash:/etc/mail/relocated, nis:virtual
-+# relocated_maps = hash:/etc/mail/relocated, netinfo:/relocated
-+relocated_maps =
-
-+#######################################################################
- # TRANSPORT MAP
- #
--# Insert text from sample-transport.cf if you need explicit routing.
-+# This file contains example settings of Postfix configuration
-+# parameters that control the optional transport table lookups.
-
-+# The transport_maps parameter specifies optional tables with domain
-+# to (transport, nexthop) mappings. See transport(5) for syntax details.
-+#
-+# By default, this feature is disabled. Specify the types of databases
-+# to use. If you use this feature, run "postmap /etc/mail/transport"
-+# after change, then "postfix reload".
-+#
-+# transport_maps = dbm:/etc/mail/transport
-+# transport_maps = hash:/etc/mail/transport
-+# transport_maps = hash:/etc/mail/transport, nis:transport
-+# transport_maps = hash:/etc/mail/transport, netinfo:/transport
-+transport_maps =
-+#######################################################################
- # ALIAS DATABASE
- #
- # The alias_maps parameter specifies the list of alias databases used
-@@ -179,7 +324,7 @@
+@@ -377,7 +377,7 @@
# "postfix reload" to eliminate the delay.
#
#alias_maps = dbm:/etc/aliases
-#alias_maps = hash:/etc/aliases
+alias_maps = hash:/etc/mail/aliases
#alias_maps = hash:/etc/aliases, nis:mail.aliases
+ #alias_maps = netinfo:/aliases
- # The alias_database parameter specifies the alias database(s) that
-@@ -192,6 +337,7 @@
- #alias_database = hash:/etc/aliases
+@@ -388,7 +388,7 @@
+ #
+ #alias_database = dbm:/etc/aliases
+ #alias_database = dbm:/etc/mail/aliases
+-#alias_database = hash:/etc/aliases
++alias_database = hash:/etc/mail/aliases
#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-+#######################################################################
# ADDRESS EXTENSIONS (e.g., user+foo)
+@@ -416,7 +416,7 @@
+ # UNIX-style mailboxes are kept. The default setting depends on the
+ # system type.
#
- # The recipient_delimiter parameter specifies the separator between
-@@ -203,6 +349,7 @@
- #
- # recipient_delimiter = +
+-#mail_spool_directory = /var/mail
++mail_spool_directory = /var/mail
+ #mail_spool_directory = /var/spool/mail
-+#######################################################################
- # DELIVERY TO MAILBOX
- #
- # The home_mailbox parameter specifies the optional pathname of a
-@@ -210,7 +357,7 @@
- # deliver to the UNIX-style /var/spool/mail/user or /var/mail/user.
- # Specify "Maildir/" for qmail-style delivery (the / is required).
- #
--#home_mailbox = Mailbox
-+home_mailbox = Mailbox
- #home_mailbox = Maildir/
+ # The mailbox_command parameter specifies the optional external
+@@ -438,8 +438,8 @@
+ # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
+ # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
+ #
+-#mailbox_command = /some/where/procmail
+-#mailbox_command = /some/where/procmail -a "$EXTENSION"
++#mailbox_command = /usr/bin/procmail
++#mailbox_command = /usr/bin/procmail -a "$EXTENSION"
- # The mailbox_command specifies the optional external command to use
-@@ -222,6 +369,7 @@
- #
- #mailbox_command = /some/where/procmail
+ # The mailbox_transport specifies the optional transport in master.cf
+ # to use after processing aliases and .forward files. This parameter
+@@ -598,39 +598,12 @@
+ # echo where) | gdb $daemon_directory/$process_name $process_id 2>&1
+ # >$config_directory/$process_name.$process_id.log & sleep 5
-+#######################################################################
- # JUNK MAIL CONTROLS
- #
- # The controls listed here are only a very small subset. See the file
-@@ -260,7 +408,9 @@
- #
- #mynetworks = 168.100.189.0/28, 127.0.0.0/8
- #mynetworks = $config_directory/mynetworks
-+mynetworks = 127.0.0.0/8
++biff = no
+ # INSTALL-TIME CONFIGURATION INFORMATION
+ #
+ # The following parameters are used when installing a new Postfix version.
+-#
+-# sendmail_path: The full pathname of the Postfix sendmail command.
+-# This is the Sendmail-compatible mail posting interface.
+-#
+-sendmail_path =
+-
+-# newaliases_path: The full pathname of the Postfix newaliases command.
+-# This is the Sendmail-compatible command to build alias databases.
+-#
+-newaliases_path =
+-
+-# mailq_path: The full pathname of the Postfix mailq command. This
+-# is the Sendmail-compatible mail queue listing command.
+-#
+-mailq_path =
+-
+ # setgid_group: The group for mail submission and queue management
+ # 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 =
+-
+-# manpage_directory: The location of the Postfix on-line manual pages.
+-#
+-manpage_directory =
+-
+-# sample_directory: The location of the Postfix sample configuration files.
+-#
+-sample_directory =
+-
+-# readme_directory: The location of the Postfix README files.
+-#
+-readme_directory =
++setgid_group = maildrop
+diff -Nur postfix-2.0.16.orig/src/global/mail_params.h postfix-2.0.16/src/global/mail_params.h
+--- postfix-2.0.16.orig/src/global/mail_params.h Mon Dec 1 14:25:29 2003
++++ postfix-2.0.16/src/global/mail_params.h Mon Dec 1 14:26:08 2003
+@@ -64,7 +64,7 @@
+ extern gid_t var_owner_gid;
-+#######################################################################
- # SHOW SOFTWARE VERSION OR NOT
- #
- # The smtpd_banner parameter specifies the text that follows the 220
-@@ -273,8 +423,9 @@
- # having a machine meltdown.
- #
- #smtpd_banner = $myhostname ESMTP $mail_name
--#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
-+smtpd_banner = $myhostname ESMTP $mail_name from PLD (www.pld.org.pl)
+ #define VAR_SGID_GROUP "setgid_group"
+-#define DEF_SGID_GROUP "postdrop"
++#define DEF_SGID_GROUP "maildrop"
+ extern char *var_sgid_group;
+ extern gid_t var_sgid_gid;
-+#######################################################################
- # PARALLEL DELIVERY TO THE SAME DESTINATION
- #
- # How many parallel deliveries to the same user or domain? With local
-@@ -291,6 +442,7 @@
- local_destination_concurrency_limit = 2
- default_destination_concurrency_limit = 10
-
-+#######################################################################
- # DEBUGGING CONTROL
- #
- # The debug_peer_level parameter specifies the increment in verbose
-diff -urN postfix-beta-19990122-pl01.orig/conf/relocated postfix-beta-19990122-pl01/conf/relocated
---- postfix-beta-19990122-pl01.orig/conf/relocated Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/relocated Sat Feb 27 23:33:03 1999
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix relocated table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/relocated\fR
-+# \fBpostmap /etc/mail/relocated\fR
- # DESCRIPTION
- # The optional \fBrelocated\fR file provides the information that is
- # used in "user has moved to \fInew_location\fR" bounce messages.
-diff -urN postfix-beta-19990122-pl01.orig/conf/sample-canonical.cf postfix-beta-19990122-pl01/conf/sample-canonical.cf
---- postfix-beta-19990122-pl01.orig/conf/sample-canonical.cf Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/sample-canonical.cf Sat Feb 27 23:33:03 1999
-@@ -9,15 +9,15 @@
- #
- # By default, no canonical address mapping is done.
- #
--# If you use this feature, run "postmap /etc/postfix/canonical" to
-+# If you use this feature, run "postmap /etc/mail/canonical" to
- # build the necessary DBM or DB file after every change. The changes
- # will become visible after a minute or so. Use "postfix reload"
- # to eliminate the delay.
- #
--# canonical_maps = dbm:/etc/postfix/canonical
--# canonical_maps = hash:/etc/postfix/canonical
--# canonical_maps = hash:/etc/postfix/canonical, nis:canonical
--# canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical
-+# canonical_maps = dbm:/etc/mail/canonical
-+# canonical_maps = hash:/etc/mail/canonical
-+# canonical_maps = hash:/etc/mail/canonical, nis:canonical
-+# canonical_maps = hash:/etc/mail/canonical, netinfo:/canonical
- canonical_maps =
-
- # The recipient_canonical_maps parameter specifies optional address
-@@ -27,7 +27,7 @@
- #
- # $recipient_canonical_maps is used before $canonical_maps lookups.
- #
--# recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
-+# recipient_canonical_maps = hash:/etc/mail/recipient_canonical
- recipient_canonical_maps =
-
- # The sender_canonical_maps parameter specifies optional address
-@@ -41,5 +41,5 @@
- #
- # $sender_canonical_maps is used before $canonical_maps lookups.
- #
--# sender_canonical_maps = hash:/etc/postfix/sender_canonical
-+# sender_canonical_maps = hash:/etc/mail/sender_canonical
- sender_canonical_maps =
-diff -urN postfix-beta-19990122-pl01.orig/conf/sample-misc.cf postfix-beta-19990122-pl01/conf/sample-misc.cf
---- postfix-beta-19990122-pl01.orig/conf/sample-misc.cf Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/sample-misc.cf Sat Feb 27 23:33:03 1999
-@@ -220,9 +220,9 @@
- # By default, this feature is disabled.
- #
- # Specify the types and names of databases to use. After change,
--# run "postmap /etc/postfix/relocated", then "postfix reload".
-+# run "postmap /etc/mail/relocated", then "postfix reload".
- #
--# relocated_maps = hash:/etc/postfix/relocated
-+# relocated_maps = hash:/etc/mail/relocated
- relocated_maps =
-
- # The trigger_timeout parameter limits the time to send a trigger to
-diff -urN postfix-beta-19990122-pl01.orig/conf/sample-relocated.cf postfix-beta-19990122-pl01/conf/sample-relocated.cf
---- postfix-beta-19990122-pl01.orig/conf/sample-relocated.cf Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/sample-relocated.cf Sat Feb 27 23:33:03 1999
-@@ -7,12 +7,12 @@
- #
- # By default, this feature is disabled.
- #
--# If you use this feature, run "postmap /etc/postfix/relocated" to
-+# If you use this feature, run "postmap /etc/mail/relocated" to
- # build the necessary DBM or DB file after change, then "postfix
- # reload" to make the changes visible.
- #
--# relocated_maps = dbm:/etc/postfix/relocated
--# relocated_maps = hash:/etc/postfix/relocated
--# relocated_maps = hash:/etc/postfix/relocated, nis:virtual
--# relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated
-+# relocated_maps = dbm:/etc/mail/relocated
-+# relocated_maps = hash:/etc/mail/relocated
-+# relocated_maps = hash:/etc/mail/relocated, nis:virtual
-+# relocated_maps = hash:/etc/mail/relocated, netinfo:/relocated
- relocated_maps =
-diff -urN postfix-beta-19990122-pl01.orig/conf/sample-smtpd.cf postfix-beta-19990122-pl01/conf/sample-smtpd.cf
---- postfix-beta-19990122-pl01.orig/conf/sample-smtpd.cf Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/sample-smtpd.cf Sat Feb 27 23:33:03 1999
-@@ -140,7 +140,7 @@
- # Continue long lines by starting the next line with whitespace.
- #
- # smtpd_sender_restrictions = reject_unknown_address
--# smtpd_sender_restrictions = reject_unknown_address, hash:/etc/postfix/access
-+# smtpd_sender_restrictions = reject_unknown_address, hash:/etc/mail/access
- smtpd_sender_restrictions =
-
- # The smtpd_recipient_restrictions parameter specifies restrictions on
-diff -urN postfix-beta-19990122-pl01.orig/conf/sample-transport.cf postfix-beta-19990122-pl01/conf/sample-transport.cf
---- postfix-beta-19990122-pl01.orig/conf/sample-transport.cf Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/sample-transport.cf Sat Feb 27 23:33:03 1999
-@@ -5,11 +5,11 @@
- # to (transport, nexthop) mappings. See transport(5) for syntax details.
- #
- # By default, this feature is disabled. Specify the types of databases
--# to use. If you use this feature, run "postmap /etc/postfix/transport"
-+# to use. If you use this feature, run "postmap /etc/mail/transport"
- # after change, then "postfix reload".
- #
--# transport_maps = dbm:/etc/postfix/transport
--# transport_maps = hash:/etc/postfix/transport
--# transport_maps = hash:/etc/postfix/transport, nis:transport
--# transport_maps = hash:/etc/postfix/transport, netinfo:/transport
-+# transport_maps = dbm:/etc/mail/transport
-+# transport_maps = hash:/etc/mail/transport
-+# transport_maps = hash:/etc/mail/transport, nis:transport
-+# transport_maps = hash:/etc/mail/transport, netinfo:/transport
- transport_maps =
-diff -urN postfix-beta-19990122-pl01.orig/conf/sample-virtual.cf postfix-beta-19990122-pl01/conf/sample-virtual.cf
---- postfix-beta-19990122-pl01.orig/conf/sample-virtual.cf Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/sample-virtual.cf Sat Feb 27 23:33:03 1999
-@@ -7,14 +7,14 @@
- #
- # By default, no address redirection is done.
- #
--# If you use this feature, run "postmap /etc/postfix/virtual" to
-+# If you use this feature, run "postmap /etc/mail/virtual" to
- # build the necessary DBM or DB file after change.
- #
- # It will take a minute or so before the change becomes visible.
- # Use "postfix reload" to eliminate the delay.
- #
--# virtual_maps = dbm:/etc/postfix/virtual
--# virtual_maps = hash:/etc/postfix/virtual
--# virtual_maps = hash:/etc/postfix/virtual, nis:virtual
--# virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual
-+# virtual_maps = dbm:/etc/mail/virtual
-+# virtual_maps = hash:/etc/mail/virtual
-+# virtual_maps = hash:/etc/mail/virtual, nis:virtual
-+# virtual_maps = hash:/etc/mail/virtual, netinfo:/virtual
- virtual_maps =
-diff -urN postfix-beta-19990122-pl01.orig/conf/transport postfix-beta-19990122-pl01/conf/transport
---- postfix-beta-19990122-pl01.orig/conf/transport Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/transport Sat Feb 27 23:33:03 1999
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix transport table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/transport\fR
-+# \fBpostmap /etc/mail/transport\fR
- # DESCRIPTION
- # The optional \fBtransport\fR file specifies a mapping from domain
- # hierarchies to message delivery transports and/or relay hosts. The
-diff -urN postfix-beta-19990122-pl01.orig/conf/virtual postfix-beta-19990122-pl01/conf/virtual
---- postfix-beta-19990122-pl01.orig/conf/virtual Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/conf/virtual Sat Feb 27 23:33:03 1999
-@@ -4,7 +4,7 @@
- # SUMMARY
- # format of Postfix virtual table
- # SYNOPSIS
--# \fBpostmap /etc/postfix/virtual\fR
-+# \fBpostmap /etc/mail/virtual\fR
- # DESCRIPTION
- # The optional \fBvirtual\fR table specifies redirections for local
- # and non-local recipients or domains. The redirections are used by
-diff -urN postfix-beta-19990122-pl01.orig/global/mail_params.h postfix-beta-19990122-pl01/global/mail_params.h
---- postfix-beta-19990122-pl01.orig/global/mail_params.h Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/global/mail_params.h Sat Feb 27 23:33:03 1999
-@@ -157,7 +157,7 @@
+@@ -221,7 +221,7 @@
*/
#define VAR_CONFIG_DIR "config_directory"
#ifndef DEF_CONFIG_DIR
#endif
extern char *var_config_dir;
-diff -urN postfix-beta-19990122-pl01.orig/util/sys_defs.h postfix-beta-19990122-pl01/util/sys_defs.h
---- postfix-beta-19990122-pl01.orig/util/sys_defs.h Sat Feb 27 23:32:55 1999
-+++ postfix-beta-19990122-pl01/util/sys_defs.h Sat Feb 27 23:33:04 1999
-@@ -243,7 +243,7 @@
+diff -Nur postfix-2.0.16.orig/src/util/sys_defs.h postfix-2.0.16/src/util/sys_defs.h
+--- postfix-2.0.16.orig/src/util/sys_defs.h Thu Sep 11 02:33:31 2003
++++ postfix-2.0.16/src/util/sys_defs.h Mon Dec 1 14:26:08 2003
+@@ -491,7 +491,7 @@
#define HAS_FSYNC
#define HAS_DB
#define DEF_DB_TYPE "hash"
#define HAS_NIS
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
+diff -Nur postfix-2.0.16.orig/man/man1/postdrop.1 postfix-2.0.16/man/man1/postdrop.1
+--- postfix-2.0.16.orig/man/man1/postdrop.1 Tue Jun 10 02:16:04 2003
++++ postfix-2.0.16/man/man1/postdrop.1 Mon Dec 1 14:26:08 2003
+@@ -61,7 +61,7 @@
+ .na
+ .nf
+ /var/spool/postfix, mail queue
+-/etc/postfix, configuration files
++/etc/mail, configuration files
+ .SH CONFIGURATION PARAMETERS
+ .na
+ .nf
+diff -Nur postfix-2.0.16.orig/man/man1/postqueue.1 postfix-2.0.16/man/man1/postqueue.1
+--- postfix-2.0.16.orig/man/man1/postqueue.1 Tue Jan 7 22:16:13 2003
++++ postfix-2.0.16/man/man1/postqueue.1 Mon Dec 1 14:26:08 2003
+@@ -95,7 +95,7 @@
+ .na
+ .nf
+ /var/spool/postfix, mail queue
+-/etc/postfix, configuration files
++/etc/mail, configuration files
+ .SH CONFIGURATION PARAMETERS
+ .na
+ .nf
+diff -Nur postfix-2.0.16.orig/man/man1/sendmail.1 postfix-2.0.16/man/man1/sendmail.1
+--- postfix-2.0.16.orig/man/man1/sendmail.1 Tue Jun 10 02:16:04 2003
++++ postfix-2.0.16/man/man1/sendmail.1 Mon Dec 1 14:26:08 2003
+@@ -63,7 +63,7 @@
+ The message body MIME type: \fB7BIT\fR or \fB8BITMIME\fR.
+ .IP "\fB-C \fIconfig_file\fR (ignored :-)"
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+-files are kept in \fB/etc/postfix\fR.
++files are kept in \fB/etc/mail\fR.
+ .IP "\fB-F \fIfull_name\fR
+ Set the sender full name. This is used only with messages that
+ have no \fBFrom:\fR message header.
+@@ -208,7 +208,7 @@
+ .na
+ .nf
+ /var/spool/postfix, mail queue
+-/etc/postfix, configuration files
++/etc/mail, configuration files
+ .SH CONFIGURATION PARAMETERS
+ .na
+ .nf
+diff -Nur postfix-2.0.16.orig/man/man5/access.5 postfix-2.0.16/man/man5/access.5
+--- postfix-2.0.16.orig/man/man5/access.5 Tue Aug 12 18:13:05 2003
++++ postfix-2.0.16/man/man5/access.5 Mon Dec 1 14:27:35 2003
+@@ -8,11 +8,11 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpostmap /etc/postfix/access\fR
++\fBpostmap /etc/mail/access\fR
+
+-\fBpostmap -q "\fIstring\fB" /etc/postfix/access\fR
++\fBpostmap -q "\fIstring\fB" /etc/mail/access\fR
+
+-\fBpostmap -q - /etc/postfix/access <\fIinputfile\fR
++\fBpostmap -q - /etc/mail/access <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -25,7 +25,7 @@
+ that serves as input to the \fBpostmap\fR(1) command.
+ The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
+ is used for fast searching by the mail system. Execute the command
+-\fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
++\fBpostmap /etc/mail/access\fR in order to rebuild the indexed
+ file after changing the access table.
+
+ When the table is provided via other means such as NIS, LDAP
+diff -Nur postfix-2.0.16.orig/man/man5/canonical.5 postfix-2.0.16/man/man5/canonical.5
+--- postfix-2.0.16.orig/man/man5/canonical.5 Tue Aug 12 18:13:05 2003
++++ postfix-2.0.16/man/man5/canonical.5 Mon Dec 1 14:27:50 2003
+@@ -8,11 +8,11 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpostmap /etc/postfix/canonical\fR
++\fBpostmap /etc/mail/canonical\fR
+
+-\fBpostmap -q "\fIstring\fB" /etc/postfix/canonical\fR
++\fBpostmap -q "\fIstring\fB" /etc/mail/canonical\fR
+
+-\fBpostmap -q - /etc/postfix/canonical <\fIinputfile\fR
++\fBpostmap -q - /etc/mail/canonical <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -24,7 +24,7 @@
+ that serves as input to the \fBpostmap\fR(1) command.
+ The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
+ is used for fast searching by the mail system. Execute the command
+-\fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
++\fBpostmap /etc/mail/canonical\fR in order to rebuild the indexed
+ file after changing the text file.
+
+ When the table is provided via other means such as NIS, LDAP
+diff -Nur postfix-2.0.16.orig/man/man5/pcre_table.5 postfix-2.0.16/man/man5/pcre_table.5
+--- postfix-2.0.16.orig/man/man5/pcre_table.5 Mon Sep 8 14:36:26 2003
++++ postfix-2.0.16/man/man5/pcre_table.5 Mon Dec 1 14:28:06 2003
+@@ -8,11 +8,11 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpcre:/etc/postfix/\fIfilename\fR
++\fBpcre:/etc/mail/\fIfilename\fR
+
+-\fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
++\fBpostmap -q "\fIstring\fB" pcre:/etc/mail/\fIfilename\fR
+
+-\fBpostmap -q - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - pcre:/etc/mail/\fIfilename\fR <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+diff -Nur postfix-2.0.16.orig/man/man5/regexp_table.5 postfix-2.0.16/man/man5/regexp_table.5
+--- postfix-2.0.16.orig/man/man5/regexp_table.5 Fri Aug 1 01:03:34 2003
++++ postfix-2.0.16/man/man5/regexp_table.5 Mon Dec 1 14:28:18 2003
+@@ -8,11 +8,11 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBregexp:/etc/postfix/\fIfilename\fR
++\fBregexp:/etc/mail/\fIfilename\fR
+
+-\fBpostmap -q "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
++\fBpostmap -q "\fIstring\fB" regexp:/etc/mail/\fIfilename\fR
+
+-\fBpostmap -q - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - regexp:/etc/mail/\fIfilename\fR <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+diff -Nur postfix-2.0.16.orig/man/man5/relocated.5 postfix-2.0.16/man/man5/relocated.5
+--- postfix-2.0.16.orig/man/man5/relocated.5 Tue Aug 12 18:13:05 2003
++++ postfix-2.0.16/man/man5/relocated.5 Mon Dec 1 14:26:08 2003
+@@ -8,7 +8,7 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpostmap /etc/postfix/relocated\fR
++\fBpostmap /etc/mail/relocated\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -19,7 +19,7 @@
+ that serves as input to the \fBpostmap\fR(1) command.
+ The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
+ is used for fast searching by the mail system. Execute the command
+-\fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
++\fBpostmap /etc/mail/relocated\fR in order to rebuild the indexed
+ file after changing the relocated table.
+
+ When the table is provided via other means such as NIS, LDAP
+diff -Nur postfix-2.0.16.orig/man/man5/transport.5 postfix-2.0.16/man/man5/transport.5
+--- postfix-2.0.16.orig/man/man5/transport.5 Tue Aug 12 18:13:05 2003
++++ postfix-2.0.16/man/man5/transport.5 Mon Dec 1 14:28:30 2003
+@@ -8,11 +8,11 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpostmap /etc/postfix/transport\fR
++\fBpostmap /etc/mail/transport\fR
+
+-\fBpostmap -q "\fIstring\fB" /etc/postfix/transport\fR
++\fBpostmap -q "\fIstring\fB" /etc/mail/transport\fR
+
+-\fBpostmap -q - /etc/postfix/transport <\fIinputfile\fR
++\fBpostmap -q - /etc/mail/transport <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -39,7 +39,7 @@
+ that serves as input to the \fBpostmap\fR(1) command.
+ The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used
+ for fast searching by the mail system. Execute the command
+-\fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
++\fBpostmap /etc/mail/transport\fR in order to rebuild the indexed
+ file after changing the transport table.
+
+ When the table is provided via other means such as NIS, LDAP
+diff -Nur postfix-2.0.16.orig/man/man5/virtual.5 postfix-2.0.16/man/man5/virtual.5
+--- postfix-2.0.16.orig/man/man5/virtual.5 Tue Aug 12 19:47:26 2003
++++ postfix-2.0.16/man/man5/virtual.5 Mon Dec 1 14:28:53 2003
+@@ -8,11 +8,11 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpostmap /etc/postfix/virtual\fR
++\fBpostmap /etc/mail/virtual\fR
+
+-\fBpostmap -q "\fIstring\fB" /etc/postfix/virtual\fR
++\fBpostmap -q "\fIstring\fB" /etc/mail/virtual\fR
+
+-\fBpostmap -q - /etc/postfix/virtual <\fIinputfile\fR
++\fBpostmap -q - /etc/mail/virtual <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -41,7 +41,7 @@
+ that serves as input to the \fBpostmap\fR(1) command.
+ The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
+ is used for fast searching by the mail system. Execute the command
+-\fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
++\fBpostmap /etc/mail/virtual\fR in order to rebuild the indexed
+ file after changing the text file.
+
+ When the table is provided via other means such as NIS, LDAP
+@@ -119,15 +119,15 @@
+
+ Support for a virtual alias domain looks like:
+
+-/etc/postfix/main.cf:
++/etc/mail/main.cf:
+ .in +4
+-virtual_alias_maps = hash:/etc/postfix/virtual
++virtual_alias_maps = hash:/etc/mail/virtual
+
+ Note: some systems use \fBdbm\fR databases instead of \fBhash\fR.
+ See the output from \fBpostconf -m\fR for available database types.
+
+ .ti -4
+-/etc/postfix/virtual:
++/etc/mail/virtual:
+ .nf
+ .na
+ \fIvirtual-alias.domain anything\fR (right-hand content does not matter)
+diff -Nur postfix-2.0.16.orig/man/man8/cleanup.8 postfix-2.0.16/man/man8/cleanup.8
+--- postfix-2.0.16.orig/man/man8/cleanup.8 Tue Aug 12 18:04:43 2003
++++ postfix-2.0.16/man/man8/cleanup.8 Mon Dec 1 14:26:08 2003
+@@ -185,8 +185,8 @@
+ .SH FILES
+ .na
+ .nf
+-/etc/postfix/canonical*, canonical mapping table
+-/etc/postfix/virtual*, virtual mapping table
++/etc/mail/canonical*, canonical mapping table
++/etc/mail/virtual*, virtual mapping table
+ .SH LICENSE
+ .na
+ .nf
+diff -Nur postfix-2.0.16.orig/man/man8/master.8 postfix-2.0.16/man/man8/master.8
+--- postfix-2.0.16.orig/man/man8/master.8 Thu Dec 19 03:18:43 2002
++++ postfix-2.0.16/man/man8/master.8 Mon Dec 1 14:26:08 2003
+@@ -129,8 +129,8 @@
+ .SH FILES
+ .na
+ .nf
+-/etc/postfix/main.cf: global configuration file.
+-/etc/postfix/master.cf: master process configuration file.
++/etc/mail/main.cf: global configuration file.
++/etc/mail/master.cf: master process configuration file.
+ /var/spool/postfix/pid/master.pid: master lock file.
+ .SH SEE ALSO
+ .na
+diff -Nur postfix-2.0.16.orig/man/man8/proxymap.8 postfix-2.0.16/man/man8/proxymap.8
+--- postfix-2.0.16.orig/man/man8/proxymap.8 Wed May 21 21:21:42 2003
++++ postfix-2.0.16/man/man8/proxymap.8 Mon Dec 1 14:26:59 2003
+@@ -33,7 +33,7 @@
+ .sp
+ virtual_alias_maps =
+ .ti +4
+-proxy:mysql:/etc/postfix/virtual_alias.cf
++proxy:mysql:/etc/mail/virtual_alias.cf
+ .sp
+ The total number of connections is limited by the number of
+ proxymap server processes.
+diff -Nur postfix-2.0.16.orig/man/man8/tlsmgr.8 postfix-2.0.16/man/man8/tlsmgr.8
+--- postfix-2.0.16.orig/man/man8/tlsmgr.8 Mon Dec 1 14:25:29 2003
++++ postfix-2.0.16/man/man8/tlsmgr.8 Mon Dec 1 14:27:05 2003
+@@ -103,7 +103,7 @@
+ .IP \fBtls_random_exchange_name\fR
+ Name of the file written by tlsmgr and read by smtp and smtpd at
+ startup. The length is 1024 bytes. Default value is
+-/etc/postfix/prng_exch.
++/etc/mail/prng_exch.
+ .IP \fBtls_random_reseed_period\fR
+ Time in seconds until the next reseed from external sources is due.
+ This is the maximum value. The actual point in time is calculated
projects / packages / postfix.git / blobdiff