diff options
Diffstat (limited to 'mail/postfix25/files/patch-aa')
| -rw-r--r-- | mail/postfix25/files/patch-aa | 116 |
1 files changed, 44 insertions, 72 deletions
diff --git a/mail/postfix25/files/patch-aa b/mail/postfix25/files/patch-aa index 7bc09d76c408..51b40396bd5e 100644 --- a/mail/postfix25/files/patch-aa +++ b/mail/postfix25/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. + # |