Update to 1.1.2 (yes they are finally using versions)

Submitted by:	Vivek Khera

13 files changed, 124 insertions, 172 deletions

diff --git a/mail/postfix21/files/install.cf b/mail/postfix21/files/install.cf
deleted file mode 100644
index 35755340e207..000000000000
--- a/mail/postfix21/files/install.cf
+++ /dev/null
@@ -1,6 +0,0 @@
-sendmail_path=/usr/sbin/sendmail
-newaliases_path=/usr/bin/newaliases
-mailq_path=/usr/bin/mailq
-setgid=maildrop
-manpages=!!PREFIX!!/man
-sendmail_path=/usr/sbin/sendmail
diff --git a/mail/postfix21/files/patch-aa b/mail/postfix21/files/patch-aa
index 7bc09d76c408..51b40396bd5e 100644
--- a/mail/postfix21/files/patch-aa
+++ b/mail/postfix21/files/patch-aa
@@ -1,114 +1,86 @@
-*** ./conf/main.cf.orig	Thu May 17 14:41:17 2001
---- ./conf/main.cf	Thu Jan 17 16:23:31 2002
+*** ./conf/main.cf.orig	Fri Jan  4 13:09:04 2002
+--- ./conf/main.cf	Tue Jan  8 22:41:50 2002
 ***************
-*** 32,36 ****
+*** 31,44 ****
+  # The command_directory parameter specifies the location of all
   # postXXX commands.  The default value is $program_directory.
   #
 ! command_directory = /usr/sbin
   
   # The daemon_directory parameter specifies the location of all Postfix
---- 32,36 ----
-  # postXXX commands.  The default value is $program_directory.
-  #
-! command_directory = !!PREFIX!!/sbin
-  
-  # The daemon_directory parameter specifies the location of all Postfix
-***************
-*** 39,43 ****
+  # 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
   
   # QUEUE AND PROCESS OWNERSHIP
---- 39,43 ----
+  #
+--- 31,44 ----
+  # The command_directory parameter specifies the location of all
+  # postXXX commands.  The default value is $program_directory.
+  #
+! command_directory = !!PREFIX!!/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 = !!PREFIX!!/libexec/postfix
   
   # QUEUE AND PROCESS OWNERSHIP
-***************
-*** 56,60 ****
-  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
-  #
-! #default_privs = nobody
-  
-  # INTERNET HOST AND DOMAIN NAMES
---- 56,60 ----
-  # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
   #
-! default_privs = nobody
-  
-  # INTERNET HOST AND DOMAIN NAMES
 ***************
-*** 286,290 ****
-  #
-  #alias_database = dbm:/etc/aliases
-! #alias_database = dbm:/etc/mail/aliases
-  #alias_database = hash:/etc/aliases
-  #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
---- 286,290 ----
-  #
-  #alias_database = dbm:/etc/aliases
-! #alias_database = dbm:/etc/aliases
-  #alias_database = hash:/etc/aliases
-  #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-***************
-*** 305,310 ****
+*** 325,332 ****
+  #
   # The home_mailbox parameter specifies the optional pathname of a
   # mailbox file relative to a user's home directory. The default
 ! # mailbox file is /var/spool/mail/user or /var/mail/user.  Specify
 ! # "Maildir/" for qmail-style delivery (the / is required).
   #
   #home_mailbox = Mailbox
---- 305,310 ----
+  #home_mailbox = Maildir/
+--- 325,332 ----
+  #
   # The home_mailbox parameter specifies the optional pathname of a
   # mailbox file relative to a user's home directory. The default
-! # mailbox file is /var/mail/user.  Specify "Maildir/" for 
+! # mailbox file is /var/mail/user.  Specify "Maildir/" for
 ! # qmail-style delivery (the / is required).
   #
   #home_mailbox = Mailbox
+  #home_mailbox = Maildir/
 ***************
-*** 315,319 ****
-  # system type.
-  #
-! # mail_spool_directory = /var/mail
-  # mail_spool_directory = /var/spool/mail
-  
---- 315,319 ----
-  # system type.
+*** 424,430 ****
   #
-! mail_spool_directory = /var/mail
-  # mail_spool_directory = /var/spool/mail
-  
-***************
-*** 396,401 ****
-  # mostly a waste of cycles.
+  # See also the body_checks example in the sample-filter.cf file.
   #
-! #header_checks = regexp:/etc/postfix/filename
-! #header_checks = pcre:/etc/postfix/filename
+! #header_checks = regexp:/etc/postfix/header_checks
   
   # FAST ETRN SERVICE
---- 396,401 ----
-  # mostly a waste of cycles.
   #
-! #header_checks = regexp:!!PREFIX!!/etc/postfix/filename
-! #header_checks = pcre:!!PREFIX!!/etc/postfix/filename
+--- 424,430 ----
+  #
+  # See also the body_checks example in the sample-filter.cf file.
+  #
+! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks
   
   # FAST ETRN SERVICE
+  #
 ***************
-*** 471,477 ****
-  # set up your XAUTHORITY environment variable before starting Postfix.
+*** 525,531 ****
+  # 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.
   #
-! debugger_command =
-! 	 PATH=/usr/bin:/usr/X11R6/bin
-! 	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
+! setgid_group =
   
-  # Other configurable parameters.
---- 471,477 ----
-  # set up your XAUTHORITY environment variable before starting Postfix.
+  # manpage_path: The location of the Postfix on-line manual pages.
+  #
+--- 525,531 ----
+  # 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.
   #
-! # debugger_command =
-! # 	 PATH=/usr/bin:/usr/X11R6/bin
-! # 	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
+! setgid_group = maildrop
   
-  # Other configurable parameters.
+  # manpage_path: The location of the Postfix on-line manual pages.
+  #
diff --git a/mail/postfix21/files/patch-ah b/mail/postfix21/files/patch-ah
index c8c769e8f815..a8c70a15a78d 100644
--- a/mail/postfix21/files/patch-ah
+++ b/mail/postfix21/files/patch-ah
@@ -12,33 +12,33 @@
 ***************
 *** 19,24 ****
   #
-! # 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/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 = 
 --- 19,24 ----
   #
-! # canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical
-! # canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical
-! # canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical
-! # canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical
+! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical
+! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical
+! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical
+! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical
   canonical_maps = 
 ***************
 *** 32,34 ****
   #
-! # recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
+! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
   recipient_canonical_maps = 
 --- 32,34 ----
   #
-! # recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical
+! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical
   recipient_canonical_maps = 
 ***************
 *** 46,48 ****
   #
-! # sender_canonical_maps = hash:/etc/postfix/sender_canonical
+! #sender_canonical_maps = hash:/etc/postfix/sender_canonical
   sender_canonical_maps = 
 --- 46,48 ----
   #
-! # sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical
+! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical
   sender_canonical_maps = 
diff --git a/mail/postfix21/files/patch-aj b/mail/postfix21/files/patch-aj
index 2f27afd4a13a..241d48132551 100644
--- a/mail/postfix21/files/patch-aj
+++ b/mail/postfix21/files/patch-aj
@@ -14,11 +14,11 @@
   # Specify the types and names of databases to use.  After change,
 ! # run "postmap /etc/postfix/relocated", then "postfix reload".
   #
-! # relocated_maps = hash:/etc/postfix/relocated
+! #relocated_maps = hash:/etc/postfix/relocated
   relocated_maps =
 --- 263,267 ----
   # Specify the types and names of databases to use.  After change,
 ! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload".
   #
-! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
+! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
   relocated_maps =
diff --git a/mail/postfix21/files/patch-ak b/mail/postfix21/files/patch-ak
index 249a427016f2..250dd411a4bd 100644
--- a/mail/postfix21/files/patch-ak
+++ b/mail/postfix21/files/patch-ak
@@ -12,15 +12,15 @@
 ***************
 *** 16,21 ****
   #
-! # 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/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 = 
 --- 16,21 ----
   #
-! # relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated
-! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
-! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual
-! # relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated
+! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated
+! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
+! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual
+! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated
   relocated_maps = 
diff --git a/mail/postfix21/files/patch-al b/mail/postfix21/files/patch-al
index d363aba1d02e..799206da0c96 100644
--- a/mail/postfix21/files/patch-al
+++ b/mail/postfix21/files/patch-al
@@ -2,10 +2,10 @@
 --- ./conf/sample-smtpd.cf	Thu Jun  1 22:11:22 2000
 ***************
 *** 183,185 ****
-  # smtpd_sender_restrictions = reject_unknown_sender_domain
-! # smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access
+  #smtpd_sender_restrictions = reject_unknown_sender_domain
+! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access
   smtpd_sender_restrictions = 
 --- 183,185 ----
-  # smtpd_sender_restrictions = reject_unknown_sender_domain
-! # smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access
+  #smtpd_sender_restrictions = reject_unknown_sender_domain
+! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access
   smtpd_sender_restrictions = 
diff --git a/mail/postfix21/files/patch-am b/mail/postfix21/files/patch-am
index 3328cc42ab77..2d395fa9ca03 100644
--- a/mail/postfix21/files/patch-am
+++ b/mail/postfix21/files/patch-am
@@ -6,18 +6,18 @@
 ! # to use.  If you use this feature, run "postmap /etc/postfix/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/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 = 
 --- 10,18 ----
   # By default, this feature is disabled. Specify the types of databases
 ! # to use.  If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport"
   # after change, then "postfix reload".
   # 
-! # transport_maps = dbm:!!PREFIX!!/etc/postfix/transport
-! # transport_maps = hash:!!PREFIX!!/etc/postfix/transport
-! # transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport
-! # transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport
+! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport
+! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport
+! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport
+! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport
   transport_maps = 
diff --git a/mail/postfix21/files/patch-an b/mail/postfix21/files/patch-an
index 4da6a093d4f3..af5ac7cc031b 100644
--- a/mail/postfix21/files/patch-an
+++ b/mail/postfix21/files/patch-an
@@ -12,15 +12,15 @@
 ***************
 *** 18,23 ****
   #
-! # 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/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 = 
 --- 18,23 ----
   #
-! # virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual
-! # virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual
-! # virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual
-! # virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual
+! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual
+! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual
+! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual
+! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual
   virtual_maps = 
diff --git a/mail/postfix21/files/patch-ec b/mail/postfix21/files/patch-ec
index 1854b63342d7..5f5d1ad9cadc 100644
--- a/mail/postfix21/files/patch-ec
+++ b/mail/postfix21/files/patch-ec
@@ -1,20 +1,41 @@
-*** ./src/global/mail_params.h.orig	Wed May 31 19:18:31 2000
---- ./src/global/mail_params.h	Thu Jun  1 22:17:10 2000
+*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
+--- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
 ***************
-*** 155,157 ****
+*** 51,55 ****
+  
+  #define VAR_SGID_GROUP		"setgid_group"
+! #define DEF_SGID_GROUP		"postdrop"
+  extern char *var_sgid_group;
+  extern gid_t var_sgid_gid;
+--- 51,55 ----
+  
+  #define VAR_SGID_GROUP		"setgid_group"
+! #define DEF_SGID_GROUP		"maildrop"
+  extern char *var_sgid_group;
+  extern gid_t var_sgid_gid;
+***************
+*** 170,174 ****
+  #define VAR_PROGRAM_DIR		"program_directory"
   #ifndef DEF_PROGRAM_DIR
 ! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
   #endif
---- 155,157 ----
+  
+--- 170,174 ----
+  #define VAR_PROGRAM_DIR		"program_directory"
   #ifndef DEF_PROGRAM_DIR
 ! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
   #endif
+  
 ***************
-*** 189,191 ****
+*** 204,208 ****
+  #define VAR_CONFIG_DIR		"config_directory"
   #ifndef DEF_CONFIG_DIR
 ! #define DEF_CONFIG_DIR		"/etc/postfix"
   #endif
---- 189,191 ----
+  extern char *var_config_dir;
+--- 204,208 ----
+  #define VAR_CONFIG_DIR		"config_directory"
   #ifndef DEF_CONFIG_DIR
 ! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
   #endif
+  extern char *var_config_dir;
diff --git a/mail/postfix21/files/patch-ga b/mail/postfix21/files/patch-ga
deleted file mode 100644
index 60a6dd578564..000000000000
--- a/mail/postfix21/files/patch-ga
+++ /dev/null
@@ -1,11 +0,0 @@
-*** MYSQL_README.orig	Fri Aug  4 02:40:21 2000
---- MYSQL_README	Fri Aug  4 02:40:04 2000
-***************
-*** 1,3 ****
---- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled
-+ *** at compile time.
-+ 
-  [Code contributed by Scott Cotton and Joshua Marcus, IC Group, Inc.]
-  
-  We've written code to add a mysql map type.  It utilizes the mysql
diff --git a/mail/postfix21/files/patch-gb b/mail/postfix21/files/patch-gb
deleted file mode 100644
index 98816d155122..000000000000
--- a/mail/postfix21/files/patch-gb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** LDAP_README.orig	Fri Aug  4 02:40:27 2000
---- LDAP_README	Fri Aug  4 02:40:05 2000
-***************
-*** 1,3 ****
---- 1,6 ----
-+ *** Note for FreeBSD users: this feature must be specifically enabled
-+ *** at compile time.
-+ 
-  BUILDING WITH LDAP SUPPORT
-  ==========================
-  
diff --git a/mail/postfix21/files/patch-post-install b/mail/postfix21/files/patch-post-install
new file mode 100644
index 000000000000..92b2d4c2c6eb
--- /dev/null
+++ b/mail/postfix21/files/patch-post-install
@@ -0,0 +1,11 @@
+--- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
++++ ./conf/post-install	Fri Jan 18 12:32:54 2002
+@@ -183,7 +183,7 @@
+ 
+ umask 022
+ 
+-PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
++PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
+ SHELL=/bin/sh
+ IFS=" 	
+ "
diff --git a/mail/postfix21/files/patch-src::cleanup_message.c b/mail/postfix21/files/patch-src::cleanup_message.c
deleted file mode 100644
index 9136591841bf..000000000000
--- a/mail/postfix21/files/patch-src::cleanup_message.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./src/cleanup/cleanup_message.c.orig	Tue Nov 27 16:55:39 2001
-+++ ./src/cleanup/cleanup_message.c	Tue Nov 27 16:58:43 2001
-@@ -269,6 +269,10 @@
- 		state->errs |= CLEANUP_STAT_CONT;
- 	    } else if (strcasecmp(value, "IGNORE") == 0) {
- 		return;
-+	    } else if (strcasecmp(value, "WARN") == 0) {
-+		msg_info("%s: warning: header %.200s; from=<%s> to=<%s>",
-+			state->queue_id, header, state->sender,
-+			state->recip ? state->recip : "unknown");
- 	    }
- 	}
-     }
-@@ -498,6 +502,10 @@
- 		    state->errs |= CLEANUP_STAT_CONT;
- 		} else if (strcasecmp(value, "IGNORE") == 0) {
- 		    return;
-+		} else if (strcasecmp(value, "WARN") == 0) {
-+		    msg_info("%s: warning: body %.200s; from=<%s> to=<%s>",
-+			state->queue_id, buf, state->sender,
-+			state->recip ? state->recip : "unknown");
- 		}
- 	    }
- 	}