Set context of diff for patch-aa to 2 lines to allow tls patching

PR:		33992
Noticed by:	des, et al.

1 files changed, 24 insertions, 51 deletions

diff --git a/mail/postfix25/files/patch-aa b/mail/postfix25/files/patch-aa
index 1c5ef17b9177..7bc09d76c408 100644
--- a/mail/postfix25/files/patch-aa
+++ b/mail/postfix25/files/patch-aa
@@ -1,128 +1,102 @@
-*** conf/main.cf.ORIG	Tue Jan 15 09:51:32 2002
---- conf/main.cf	Tue Jan 15 09:51:36 2002
+*** ./conf/main.cf.orig	Thu May 17 14:41:17 2001
+--- ./conf/main.cf	Thu Jan 17 16:23:31 2002
 ***************
-*** 31,44 ****
-  # The command_directory parameter specifies the location of all
+*** 32,36 ****
   # postXXX commands.  The default value is $program_directory.
   #
 ! 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
-  
-  # QUEUE AND PROCESS OWNERSHIP
-  #
---- 31,44 ----
-  # The command_directory parameter specifies the location of all
+--- 32,36 ----
   # 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
+***************
+*** 39,43 ****
   # by root.
   #
-! daemon_directory = !!PREFIX!!/libexec/postfix
+! daemon_directory = /usr/libexec/postfix
   
   # QUEUE AND PROCESS OWNERSHIP
+--- 39,43 ----
+  # by root.
   #
+! daemon_directory = !!PREFIX!!/libexec/postfix
+  
+  # QUEUE AND PROCESS OWNERSHIP
 ***************
-*** 55,61 ****
-  # These rights are used in the absence of a recipient user context.
+*** 56,60 ****
   # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
   #
 ! #default_privs = nobody
   
   # INTERNET HOST AND DOMAIN NAMES
-  # 
---- 55,61 ----
-  # These rights are used in the absence of a recipient user context.
+--- 56,60 ----
   # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
   #
 ! default_privs = nobody
   
   # INTERNET HOST AND DOMAIN NAMES
-  # 
 ***************
-*** 285,291 ****
-  # tables that are not necessarily all under control by Postfix.
+*** 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
-  
---- 285,291 ----
-  # tables that are not necessarily all under control by Postfix.
+--- 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
-  
 ***************
-*** 304,311 ****
-  #
+*** 305,310 ****
   # 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
-  #home_mailbox = Maildir/
---- 304,311 ----
-  #
+--- 305,310 ----
   # 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 
 ! # qmail-style delivery (the / is required).
   #
   #home_mailbox = Mailbox
-  #home_mailbox = Maildir/
 ***************
-*** 314,320 ****
-  # UNIX-style mailboxes are kept. The default setting depends on the
+*** 315,319 ****
   # system type.
   #
 ! # mail_spool_directory = /var/mail
   # mail_spool_directory = /var/spool/mail
   
-  # The mailbox_command parameter specifies the optional external
---- 314,320 ----
-  # UNIX-style mailboxes are kept. The default setting depends on the
+--- 315,319 ----
   # system type.
   #
 ! mail_spool_directory = /var/mail
   # mail_spool_directory = /var/spool/mail
   
-  # The mailbox_command parameter specifies the optional external
 ***************
-*** 395,402 ****
-  # IGNORE (silently discard this header). Patterns ending in OK are
+*** 396,401 ****
   # mostly a waste of cycles.
   #
 ! #header_checks = regexp:/etc/postfix/filename
 ! #header_checks = pcre:/etc/postfix/filename
   
   # FAST ETRN SERVICE
-  #
---- 395,402 ----
-  # IGNORE (silently discard this header). Patterns ending in OK are
+--- 396,401 ----
   # mostly a waste of cycles.
   #
 ! #header_checks = regexp:!!PREFIX!!/etc/postfix/filename
 ! #header_checks = pcre:!!PREFIX!!/etc/postfix/filename
   
   # FAST ETRN SERVICE
-  #
 ***************
-*** 470,477 ****
-  # the process marches on. If you use an X-based debugger, be sure to
+*** 471,477 ****
   # set up your XAUTHORITY environment variable before starting Postfix.
   #
 ! debugger_command =
@@ -130,8 +104,7 @@
 ! 	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
   
   # Other configurable parameters.
---- 470,477 ----
-  # the process marches on. If you use an X-based debugger, be sure to
+--- 471,477 ----
   # set up your XAUTHORITY environment variable before starting Postfix.
   #
 ! # debugger_command =