diff options
| author | Will Andrews <will@FreeBSD.org> | 2000-11-14 06:28:58 +0000 | 
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2000-11-14 06:28:58 +0000 | 
| commit | 6a1b37225e32c4289e7ee279b1dd4797d33d6790 (patch) | |
| tree | 590b6e84e2571733c16e213e6cce5fc8b78cbe36 /mail/postfix21/files/patch-aa | |
| parent | Ladies and gentlemen, boys and girls, children of all ages.. the FreeBSD (diff) | |
Update to postfix 19991231-pl10.  Install LDAP_README and MYSQL_README along
with documentation.  Fix manpage generation.  Consistently use INSTALL_*
macros (from postfix-current).  Modify packaging list using WITH_PCRE and
WITH_LDAP PLIST_SUBs (as per postfix-current).  Add knob to enable PCRE (again
from postfix-current).  Use better package description (postfix-current).
Fix PLIST.  Conditionally remove main.cf and master.cf when they are
unmodified from default (postfix-current).  Fully institute new maintainer
as a real one.  :-)
PR:		17777, 19185, 20565, 21819, 22613 (also postfix-current)
Submitted by:	maintainer (THANKS!)
Notes
Notes:
    svn path=/head/; revision=35128
Diffstat (limited to 'mail/postfix21/files/patch-aa')
| -rw-r--r-- | mail/postfix21/files/patch-aa | 99 | 
1 files changed, 66 insertions, 33 deletions
| diff --git a/mail/postfix21/files/patch-aa b/mail/postfix21/files/patch-aa index 3af6375f1959..a5f9ee7a5b2e 100644 --- a/mail/postfix21/files/patch-aa +++ b/mail/postfix21/files/patch-aa @@ -1,36 +1,69 @@ -*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999 ---- global/mail_params.h	Sat Mar 20 15:10:46 1999 +*** ./conf/main.cf.orig	Fri Jan 28 09:44:47 2000 +--- ./conf/main.cf	Thu Jun  1 22:01:21 2000  *************** -*** 127,133 **** -    */ -  #define VAR_PROGRAM_DIR		"program_directory" -  #ifndef DEF_PROGRAM_DIR -! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix" -  #endif -   -  #define VAR_DAEMON_DIR		"daemon_directory" ---- 127,133 ---- -    */ -  #define VAR_PROGRAM_DIR		"program_directory" -  #ifndef DEF_PROGRAM_DIR -! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix" -  #endif -   -  #define VAR_DAEMON_DIR		"daemon_directory" +*** 19,21 **** +  # +! command_directory = /usr/sbin +   +--- 19,21 ---- +  # +! command_directory = !!PREFIX!!/sbin +   +*************** +*** 26,28 **** +  # +! daemon_directory = /usr/libexec/postfix +   +--- 26,28 ---- +  # +! daemon_directory = !!PREFIX!!/libexec/postfix +   +*************** +*** 43,45 **** +  # +! #default_privs = nobody +   +--- 43,45 ---- +  # +! default_privs = nobody +   +*************** +*** 180,182 **** +  #alias_database = dbm:/etc/aliases +! #alias_database = dbm:/etc/mail/aliases +  #alias_database = hash:/etc/aliases +--- 180,182 ---- +  #alias_database = dbm:/etc/aliases +! #alias_database = dbm:/etc/aliases +  #alias_database = hash:/etc/aliases  *************** -*** 161,167 **** -    */ -  #define VAR_CONFIG_DIR		"config_directory" -  #ifndef DEF_CONFIG_DIR -! #define DEF_CONFIG_DIR		"/etc/postfix" -  #endif -  extern char *var_config_dir; -   ---- 161,167 ---- -    */ -  #define VAR_CONFIG_DIR		"config_directory" -  #ifndef DEF_CONFIG_DIR -! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix" -  #endif -  extern char *var_config_dir; +*** 199,202 **** +  # 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). +  # +--- 199,202 ---- +  # 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). +  # +*************** +*** 209,211 **** +  # +! # mail_spool_directory = /var/mail +  # mail_spool_directory = /var/spool/mail +--- 209,211 ---- +  # +! mail_spool_directory = /var/mail +  # mail_spool_directory = /var/spool/mail +*************** +*** 274,277 **** +  # +! #header_checks = regexp:/etc/postfix/filename +! #header_checks = pcre:/etc/postfix/filename +   +--- 274,277 ---- +  # +! #header_checks = regexp:!!PREFIX!!/etc/postfix/filename +! #header_checks = pcre:!!PREFIX!!/etc/postfix/filename | 
