Update to latest snapshot

Add SASL2 support

PR:		42751
Submitted by:	maintainer, Marc G. Fournier

5 files changed, 24 insertions, 77 deletions

diff --git a/mail/postfix-current/files/patch-aa b/mail/postfix-current/files/patch-aa
index 51b40396bd5e..fa5398945dd7 100644
--- a/mail/postfix-current/files/patch-aa
+++ b/mail/postfix-current/files/patch-aa
@@ -1,38 +1,40 @@
-*** ./conf/main.cf.orig	Fri Jan  4 13:09:04 2002
---- ./conf/main.cf	Tue Jan  8 22:41:50 2002
+*** ./conf/main.cf.orig	Thu Aug 22 03:17:14 2002
+--- ./conf/main.cf	Thu Aug 29 19:56:21 2002
 ***************
-*** 31,44 ****
+*** 29,43 ****
+  queue_directory = /var/spool/postfix
+  
   # The command_directory parameter specifies the location of all
-  # postXXX commands.  The default value is $program_directory.
+  # postXXX commands.
   #
 ! 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 programs (i.e. programs listed in the master.cf file). This
+  # directory must be owned by root.
   #
 ! daemon_directory = /usr/libexec/postfix
   
   # QUEUE AND PROCESS OWNERSHIP
   #
---- 31,44 ----
+--- 29,43 ----
+  queue_directory = /var/spool/postfix
+  
   # The command_directory parameter specifies the location of all
-  # postXXX commands.  The default value is $program_directory.
+  # postXXX commands.
   #
 ! 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 programs (i.e. programs listed in the master.cf file). This
+  # directory must be owned by root.
   #
 ! daemon_directory = !!PREFIX!!/libexec/postfix
   
   # QUEUE AND PROCESS OWNERSHIP
   #
 ***************
-*** 325,332 ****
+*** 326,333 ****
   #
   # The home_mailbox parameter specifies the optional pathname of a
   # mailbox file relative to a user's home directory. The default
@@ -41,7 +43,7 @@
   #
   #home_mailbox = Mailbox
   #home_mailbox = Maildir/
---- 325,332 ----
+--- 326,333 ----
   #
   # The home_mailbox parameter specifies the optional pathname of a
   # mailbox file relative to a user's home directory. The default
@@ -51,7 +53,7 @@
   #home_mailbox = Mailbox
   #home_mailbox = Maildir/
 ***************
-*** 424,430 ****
+*** 444,450 ****
   #
   # See also the body_checks example in the sample-filter.cf file.
   #
@@ -59,7 +61,7 @@
   
   # FAST ETRN SERVICE
   #
---- 424,430 ----
+--- 444,450 ----
   #
   # See also the body_checks example in the sample-filter.cf file.
   #
@@ -68,19 +70,19 @@
   # FAST ETRN SERVICE
   #
 ***************
-*** 525,531 ****
+*** 551,557 ****
   # 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_path: The location of the Postfix on-line manual pages.
+  # manpage_directory: The location of the Postfix on-line manual pages.
   #
---- 525,531 ----
+--- 551,557 ----
   # 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 = maildrop
   
-  # manpage_path: The location of the Postfix on-line manual pages.
+  # manpage_directory: The location of the Postfix on-line manual pages.
   #
diff --git a/mail/postfix-current/files/patch-aj b/mail/postfix-current/files/patch-aj
index 241d48132551..e0ebb6f5976c 100644
--- a/mail/postfix-current/files/patch-aj
+++ b/mail/postfix-current/files/patch-aj
@@ -3,11 +3,11 @@
 ***************
 *** 220,222 ****
   #
-! program_directory = /usr/libexec/postfix
+! daemon_directory = /usr/libexec/postfix
   
 --- 220,222 ----
   #
-! program_directory = !!PREFIX!!/libexec/postfix
+! daemon_directory = !!PREFIX!!/libexec/postfix
   
 ***************
 *** 263,267 ****
diff --git a/mail/postfix-current/files/patch-ei b/mail/postfix-current/files/patch-ei
deleted file mode 100644
index 8f03b69ccc52..000000000000
--- a/mail/postfix-current/files/patch-ei
+++ /dev/null
@@ -1,21 +0,0 @@
-*** ./src/smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000
---- ./src/smtpd/smtpd.h	Thu Sep 14 10:17:38 2000
-***************
-*** 12,19 ****
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl.h>
-! #include <saslutil.h>
-  #endif
-  
-   /*
---- 12,19 ----
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl1/sasl.h>
-! #include <sasl1/saslutil.h>
-  #endif
-  
-   /*
diff --git a/mail/postfix-current/files/patch-ej b/mail/postfix-current/files/patch-ej
deleted file mode 100644
index 329d7bb1cf96..000000000000
--- a/mail/postfix-current/files/patch-ej
+++ /dev/null
@@ -1,21 +0,0 @@
-*** ./src/smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000
---- ./src/smtp/smtp.h	Thu Sep 14 13:04:53 2000
-***************
-*** 12,19 ****
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl.h>
-! #include <saslutil.h>
-  #endif
-  
-   /*
---- 12,19 ----
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl1/sasl.h>
-! #include <sasl1/saslutil.h>
-  #endif
-  
-   /*
diff --git a/mail/postfix-current/files/patch-lmtp.h b/mail/postfix-current/files/patch-lmtp.h
deleted file mode 100644
index 86d5975b2b4d..000000000000
--- a/mail/postfix-current/files/patch-lmtp.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/lmtp/lmtp.h.orig	Fri Jan 19 15:43:06 2001
-+++ ./src/lmtp/lmtp.h	Sat Feb  3 14:01:09 2001
-@@ -12,8 +12,8 @@
-   * SASL library.
-   */
- #ifdef USE_SASL_AUTH
--#include <sasl.h>
--#include <saslutil.h>
-+#include <sasl1/sasl.h>
-+#include <sasl1/saslutil.h>
- #endif
- 
-  /*