- Add TLS support which includes SSL;

- add sample-flush.cf to pkg-plist;
- update to 20001121.

PR:		22962
Submitted by:	maintainer

5 files changed, 123 insertions, 100 deletions

diff --git a/mail/postfix-current/files/patch-bb b/mail/postfix-current/files/patch-bb
index 0fb75ceeeae0..ea744664dfa7 100644
--- a/mail/postfix-current/files/patch-bb
+++ b/mail/postfix-current/files/patch-bb
@@ -1,20 +1,20 @@
-*** ./html/access.5.html.orig	Sat Apr 22 20:28:36 2000
---- ./html/access.5.html	Thu Jun  1 22:21:32 2000
-***************
-*** 11,13 ****
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>/etc/postfix/access</b>
-  
---- 11,13 ----
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
-  
-***************
-*** 22,24 ****
-         used for fast searching by the mail  system.  Execute  the
-!        command  <b>postmap</b>  <b>/etc/postfix/access</b>  in order to rebuild
-         the indexed file after changing the access table.
---- 22,24 ----
-         used for fast searching by the mail  system.  Execute  the
-!        command  <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild
-         the indexed file after changing the access table.
+--- ./html/access.5.html.orig   Tue Nov 21 21:24:13 2000
++++ ./html/access.5.html        Tue Nov 21 21:24:34 2000
+@@ -9,7 +9,7 @@
+        access - format of Postfix access table
+
+ <b>SYNOPSIS</b>
+-       <b>postmap</b> <b>/etc/postfix/access</b>
++       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
+
+ <b>DESCRIPTION</b>
+        The  optional <b>access</b> table directs the Postfix SMTP server
+@@ -21,7 +21,7 @@
+        that  serves  as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a> command.  The
+        result, an indexed file in <b>dbm</b> or <b>db</b> format, is  used  for
+        fast  searching  by  the  mail system. Execute the command
+-       <b>postmap</b>  <b>/etc/postfix/access</b>  in  order  to  rebuild   the
++       <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/access</b>  in  order  to  rebuild   the
+        indexed file after changing the access table.
+
+        When  the  table  is provided via other means such as NIS,
diff --git a/mail/postfix-current/files/patch-bc b/mail/postfix-current/files/patch-bc
index 652e13c1f066..e407a9650585 100644
--- a/mail/postfix-current/files/patch-bc
+++ b/mail/postfix-current/files/patch-bc
@@ -1,20 +1,20 @@
-*** ./html/canonical.5.html.orig	Sat Apr 22 20:28:37 2000
---- ./html/canonical.5.html	Thu Jun  1 22:21:57 2000
-***************
-*** 11,13 ****
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>/etc/postfix/canonical</b>
-  
---- 11,13 ----
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
-  
-***************
-*** 21,23 ****
-         used for fast searching by the mail  system.  Execute  the
-!        command <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild
-         the indexed file after changing the canonical table.
---- 21,23 ----
-         used for fast searching by the mail  system.  Execute  the
-!        command <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild
-         the indexed file after changing the canonical table.
+--- ./html/canonical.5.html.orig        Tue Nov 21 21:32:38 2000
++++ ./html/canonical.5.html     Tue Nov 21 21:33:21 2000
+@@ -9,7 +9,7 @@
+        canonical - format of Postfix canonical table
+
+ <b>SYNOPSIS</b>
+-       <b>postmap</b> <b>/etc/postfix/canonical</b>
++       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
+
+ <b>DESCRIPTION</b>
+        The  optional <b>canonical</b> table specifies an address mapping
+@@ -20,7 +20,7 @@
+        that  serves  as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a> command.  The
+        result, an indexed file in <b>dbm</b> or <b>db</b> format, is  used  for
+        fast  searching  by  the  mail system. Execute the command
+-       <b>postmap</b> <b>/etc/postfix/canonical</b> in  order  to  rebuild  the
++       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in  order  to  rebuild  the
+        indexed file after changing the text file.
+
+        When  the  table  is provided via other means such as NIS,
diff --git a/mail/postfix-current/files/patch-bm b/mail/postfix-current/files/patch-bm
index 5b779eb163f1..e5ccc2c50b94 100644
--- a/mail/postfix-current/files/patch-bm
+++ b/mail/postfix-current/files/patch-bm
@@ -1,20 +1,20 @@
-*** ./html/relocated.5.html.orig	Sat Apr 22 20:28:37 2000
---- ./html/relocated.5.html	Thu Jun  1 22:33:09 2000
-***************
-*** 11,13 ****
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>/etc/postfix/relocated</b>
-  
---- 11,13 ----
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
-  
-***************
-*** 21,23 ****
-         used  for  fast  searching by the mail system. Execute the
-!        command <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild
-         the indexed file after changing the relocated table.
---- 21,23 ----
-         used  for  fast  searching by the mail system. Execute the
-!        command <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild
-         the indexed file after changing the relocated table.
+--- ./html/relocated.5.html.orig        Tue Nov 21 21:37:54 2000
++++ ./html/relocated.5.html     Tue Nov 21 21:38:08 2000
+@@ -9,7 +9,7 @@
+        relocated - format of Postfix relocated table
+
+ <b>SYNOPSIS</b>
+-       <b>postmap</b> <b>/etc/postfix/relocated</b>
++       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
+
+ <b>DESCRIPTION</b>
+        The optional <b>relocated</b> table provides the information that
+@@ -20,7 +20,7 @@
+        that serves as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a>  command.   The
+        result,  an  indexed file in <b>dbm</b> or <b>db</b> format, is used for
+        fast searching by the mail  system.  Execute  the  command
+-       <b>postmap</b>  <b>/etc/postfix/relocated</b>  in  order  to rebuild the
++       <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/relocated</b>  in  order  to rebuild the
+        indexed file after changing the relocated table.
+
+        When the table is provided via other means  such  as  NIS,
diff --git a/mail/postfix-current/files/patch-bo b/mail/postfix-current/files/patch-bo
index d36eda1f6939..b45270be8151 100644
--- a/mail/postfix-current/files/patch-bo
+++ b/mail/postfix-current/files/patch-bo
@@ -1,20 +1,20 @@
-*** ./html/transport.5.html.orig	Sat Apr 22 20:28:37 2000
---- ./html/transport.5.html	Thu Jun  1 22:35:04 2000
-***************
-*** 11,13 ****
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>/etc/postfix/transport</b>
-  
---- 11,13 ----
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
-  
-***************
-*** 22,24 ****
-         used for fast searching by the mail  system.  Execute  the
-!        command <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild
-         the indexed file after changing the transport table.
---- 22,24 ----
-         used for fast searching by the mail  system.  Execute  the
-!        command <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild
-         the indexed file after changing the transport table.
+--- ./html/transport.5.html.orig        Tue Nov 21 21:43:00 2000
++++ ./html/transport.5.html     Tue Nov 21 21:43:20 2000
+@@ -9,7 +9,7 @@
+        transport - format of Postfix transport table
+
+ <b>SYNOPSIS</b>
+-       <b>postmap</b> <b>/etc/postfix/transport</b>
++       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
+
+ <b>DESCRIPTION</b>
+        The  optional  <b>transport</b>  table  specifies  a mapping from
+@@ -21,7 +21,7 @@
+        that  serves  as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a> command.  The
+        result, an indexed file in <b>dbm</b> or <b>db</b> format, is  used  for
+        fast  searching  by  the  mail system. Execute the command
+-       <b>postmap</b> <b>/etc/postfix/transport</b> in  order  to  rebuild  the
++       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in  order  to  rebuild  the
+        indexed file after changing the transport table.
+
+        When  the  table  is provided via other means such as NIS,
diff --git a/mail/postfix-current/files/patch-bp b/mail/postfix-current/files/patch-bp
index 6d7f1bb5201c..5206bfd4bfd0 100644
--- a/mail/postfix-current/files/patch-bp
+++ b/mail/postfix-current/files/patch-bp
@@ -1,20 +1,43 @@
-*** ./html/virtual.5.html.orig	Sat Apr 22 20:28:38 2000
---- ./html/virtual.5.html	Thu Jun  1 22:35:20 2000
-***************
-*** 11,13 ****
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>/etc/postfix/virtual</b>
-  
---- 11,13 ----
-  <b>SYNOPSIS</b>
-!        <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
-  
-***************
-*** 28,30 ****
-         used for fast searching by the mail  system.  Execute  the
-!        command  <b>postmap</b>  <b>/etc/postfix/virtual</b> in order to rebuild
-         the indexed file after changing the virtual table.
---- 28,30 ----
-         used for fast searching by the mail  system.  Execute  the
-!        command  <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild
-         the indexed file after changing the virtual table.
+--- ./html/virtual.5.html.orig  Tue Nov 21 21:46:50 2000
++++ ./html/virtual.5.html       Tue Nov 21 21:47:17 2000
+@@ -9,7 +9,7 @@
+        virtual - format of Postfix virtual table
+
+ <b>SYNOPSIS</b>
+-       <b>postmap</b> <b>/etc/postfix/virtual</b>
++       <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
+
+ <b>DESCRIPTION</b>
+        The  optional <b>virtual</b> table specifies address redirections
+@@ -27,7 +27,7 @@
+        that  serves  as  input  to  the  <a href="postmap.1.html"><b>postmap</b>(1)</a> command.  The
+        result, an indexed file in <b>dbm</b> or <b>db</b> format, is  used  for
+        fast  searching  by  the  mail system. Execute the command
+-       <b>postmap</b>  <b>/etc/postfix/virtual</b>  in  order  to  rebuild  the
++       <b>postmap</b>  <b>!!PREFIX!!/etc/postfix/virtual</b>  in  order  to  rebuild  the
+        indexed file after changing the text file.
+
+        When  the  table  is provided via other means such as NIS,
+@@ -52,7 +52,7 @@
+
+        Support for a Postfix-style virtual domain looks like:
+
+-       /etc/postfix/virtual:
++       !!PREFIX!!/etc/postfix/virtual:
+            <i>virtual.domain</i>       <i>anything</i> (right-hand content does not matter)
+            <i>postmaster@virtual.domain</i>    <i>postmaster</i>
+            <i>user1@virtual.domain</i> <i>address1</i>
+@@ -94,11 +94,11 @@
+
+        Support for a Sendmail-style virtual domain looks like:
+
+-       /etc/postfix/main.cf:
++       !!PREFIX!!/etc/postfix/main.cf:
+            mydestination = $myhostname localhost.$mydomain $mydomain
+                <i>virtual.domain</i>
+
+-       /etc/postfix/virtual:
++       !!PREFIX!!/etc/postfix/virtual:
+            <i>user1@virtual.domain</i> <i>address1</i>
+            <i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>
+