-diff -Nur postfix-1.1.2.orig/conf/main.cf postfix-1.1.2/conf/main.cf
---- postfix-1.1.2.orig/conf/main.cf Tue Jan 15 15:27:55 2002
-+++ postfix-1.1.2/conf/main.cf Wed Jan 30 13:09:30 2002
+diff -dur postfix-2.1.3.orig/conf/main.cf postfix-2.1.3/conf/main.cf
+--- postfix-2.1.3.orig/conf/main.cf 2004-06-06 23:53:58.000000000 +0200
++++ postfix-2.1.3/conf/main.cf 2004-06-22 14:23:20.533313840 +0200
@@ -38,7 +38,7 @@
- # default value is $program_directory. This directory must be owned
- # by root.
+ # 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
# INTERNET HOST AND DOMAIN NAMES
#
-@@ -84,7 +84,7 @@
- # a domain-wide alias database that aliases each user to
- # user@that.users.mailhost.
+@@ -88,7 +88,7 @@
+ # myorigin also specifies the default domain name that is appended
+ # to recipient addresses that have no @domain part.
#
-#myorigin = $myhostname
+myorigin = $myhostname
#myorigin = $mydomain
# RECEIVING MAIL
-@@ -296,7 +296,7 @@
+@@ -372,7 +372,7 @@
# "postfix reload" to eliminate the delay.
#
#alias_maps = dbm:/etc/aliases
#alias_maps = hash:/etc/aliases, nis:mail.aliases
#alias_maps = netinfo:/aliases
-@@ -307,7 +307,7 @@
+@@ -383,7 +383,7 @@
#
#alias_database = dbm:/etc/aliases
#alias_database = dbm:/etc/mail/aliases
#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
# ADDRESS EXTENSIONS (e.g., user+foo)
-@@ -335,7 +335,7 @@
+@@ -411,7 +411,7 @@
# UNIX-style mailboxes are kept. The default setting depends on the
# system type.
#
#mail_spool_directory = /var/spool/mail
# The mailbox_command parameter specifies the optional external
-@@ -357,8 +357,8 @@
+@@ -433,8 +433,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.
#
# The mailbox_transport specifies the optional transport in master.cf
# to use after processing aliases and .forward files. This parameter
-@@ -502,39 +502,12 @@
- PATH=/usr/bin:/usr/X11R6/bin
- xxgdb $daemon_directory/$process_name $process_id & sleep 5
+@@ -588,44 +588,22 @@
+ # echo where) | gdb $daemon_directory/$process_name $process_id 2>&1
+ # >$config_directory/$process_name.$process_id.log & sleep 5
+biff = no
# INSTALL-TIME CONFIGURATION INFORMATION
-# 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 =
-
+-# html_directory: The location of the Postfix HTML documentation.
+-#
+-html_directory =
+-
-# manpage_directory: The location of the Postfix on-line manual pages.
-#
-manpage_directory =
-
-# sample_directory: The location of the Postfix sample configuration files.
+-# This parameter is obsolete as of Postfix 2.1.
-#
-sample_directory =
--
++setgid_group = maildrop
+
-# readme_directory: The location of the Postfix README files.
-#
-readme_directory =
-+setgid_group = maildrop
-diff -Nur postfix-1.1.2.orig/src/global/mail_params.h postfix-1.1.2/src/global/mail_params.h
---- postfix-1.1.2.orig/src/global/mail_params.h Tue Jan 15 16:24:34 2002
-+++ postfix-1.1.2/src/global/mail_params.h Wed Jan 30 13:08:29 2002
-@@ -50,7 +50,7 @@
++# The unknown_address_reject_code parameter specifies the SMTP server
++# response when a client violates the reject_unknown_sender_domain
++# or reject_unknown_recipient_domain restrictions.
++#
++# Contrary to what Wietse thinks (450) this should be 550
++#
++unknown_address_reject_code = 550
++
+diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h
+--- postfix-2.1.3.orig/src/global/mail_params.h 2004-06-22 14:20:57.890585644 +0200
++++ postfix-2.1.3/src/global/mail_params.h 2004-06-22 14:21:17.963422126 +0200
+@@ -64,7 +64,7 @@
extern gid_t var_owner_gid;
#define VAR_SGID_GROUP "setgid_group"
extern char *var_sgid_group;
extern gid_t var_sgid_gid;
-@@ -203,7 +203,7 @@
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR "/etc/postfix"
-+#define DEF_CONFIG_DIR "/etc/mail"
- #endif
- extern char *var_config_dir;
-
-diff -Nur postfix-1.1.2.orig/src/util/sys_defs.h postfix-1.1.2/src/util/sys_defs.h
---- postfix-1.1.2.orig/src/util/sys_defs.h Thu Jan 3 20:20:56 2002
-+++ postfix-1.1.2/src/util/sys_defs.h Wed Jan 30 13:08:29 2002
-@@ -484,7 +484,7 @@
+#@@ -231,7 +231,7 @@
+# */
+# #define VAR_CONFIG_DIR "config_directory"
+# #ifndef DEF_CONFIG_DIR
+#-#define DEF_CONFIG_DIR "/etc/postfix"
+#+#define DEF_CONFIG_DIR "/etc/mail"
+# #endif
+# extern char *var_config_dir;
+#
+diff -dur 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 14:20:58.094573821 +0200
++++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 14:21:17.966421952 +0200
+@@ -550,7 +550,7 @@
#define HAS_FSYNC
#define HAS_DB
#define DEF_DB_TYPE "hash"