-diff -ruN postfix-1.1.11/src/global/mail_params.c postfix-1.1.11.my/src/global/mail_params.c
---- postfix-1.1.11/src/global/mail_params.c Wed Sep 18 12:16:53 2002
-+++ postfix-1.1.11.my/src/global/mail_params.c Wed Sep 18 12:08:12 2002
-@@ -75,6 +75,7 @@
+diff -dur postfix-2.1.3.orig/src/global/mail_params.c postfix-2.1.3/src/global/mail_params.c
+--- postfix-2.1.3.orig/src/global/mail_params.c 2004-06-22 14:32:57.233814749 +0200
++++ postfix-2.1.3/src/global/mail_params.c 2004-06-22 14:40:34.205217191 +0200
+@@ -78,6 +78,7 @@
/* char *var_debug_peer_list;
/* int var_debug_peer_level;
/* int var_in_flow_delay;
+/* char *var_reject_reply_msg_access_denied;
/* int var_fault_inj_code;
- /*
- /* void mail_params_init()
-@@ -229,6 +230,7 @@
+ /* char *var_bounce_service;
+ /* char *var_cleanup_service;
+@@ -268,6 +269,7 @@
char *var_export_environ;
char *var_debug_peer_list;
int var_debug_peer_level;
+char *var_reject_reply_msg_access_denied;
int var_fault_inj_code;
-
- #define MAIN_CONF_FILE "main.cf"
-@@ -458,6 +460,7 @@
+ char *var_bounce_service;
+ char *var_cleanup_service;
+@@ -534,6 +536,7 @@
VAR_SMTP_TLS_CLIST, DEF_SMTP_TLS_CLIST, &var_smtp_tls_cipherlist, 0, 0,
VAR_SMTP_TLS_SCACHE_DB, DEF_SMTP_TLS_SCACHE_DB, &var_smtp_tls_scache_db, 0, 0,
VAR_TLS_DAEMON_RAND_SOURCE, DEF_TLS_DAEMON_RAND_SOURCE, &var_tls_daemon_rand_source, 0, 0,
-+ VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
++ VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
+ #endif
0,
};
- static CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
-diff -ruN postfix-1.1.11/src/global/mail_params.h postfix-1.1.11.my/src/global/mail_params.h
---- postfix-1.1.11/src/global/mail_params.h Wed Sep 18 12:16:53 2002
-+++ postfix-1.1.11.my/src/global/mail_params.h Wed Sep 18 12:08:12 2002
-@@ -1612,6 +1612,13 @@
- #define DEF_RESOLVE_DEQUOTED 1
- extern bool var_resolve_dequoted;
+diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h
+--- postfix-2.1.3.orig/src/global/mail_params.h 2004-06-22 14:32:58.615734426 +0200
++++ postfix-2.1.3/src/global/mail_params.h 2004-06-22 14:33:21.260418134 +0200
+@@ -2204,6 +2204,13 @@
+ extern char *var_anvil_service;
+ #endif
+ /*
+ * SMTPD messages
/* LICENSE
/* .ad
/* .fi
-diff -ruN postfix-1.1.11/src/smtpd/smtpd_check.c postfix-1.1.11.my/src/smtpd/smtpd_check.c
---- postfix-1.1.11/src/smtpd/smtpd_check.c Wed Sep 18 12:16:53 2002
-+++ postfix-1.1.11.my/src/smtpd/smtpd_check.c Wed Sep 18 12:11:50 2002
-@@ -1010,6 +1010,7 @@
+diff -dur postfix-2.1.3.orig/src/smtpd/smtpd.c postfix-2.1.3/src/smtpd/smtpd.c
+--- postfix-2.1.3.orig/src/smtpd/smtpd.c 2004-06-22 14:32:57.338808646 +0200
++++ postfix-2.1.3/src/smtpd/smtpd.c 2004-06-22 14:41:40.372360162 +0200
+@@ -3089,6 +3089,7 @@
+ VAR_RELAY_CCERTS, DEF_RELAY_CCERTS, &var_relay_ccerts, 0, 0,
+ VAR_SMTPD_SASL_TLS_OPTS, DEF_SMTPD_SASL_TLS_OPTS, &var_smtpd_sasl_tls_opts, 0, 0,
+ #endif
++ VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
+ 0,
+ };
+ static CONFIG_RAW_TABLE raw_table[] = {
+diff -dur postfix-2.1.3.orig/src/smtpd/smtpd_check.c postfix-2.1.3/src/smtpd/smtpd_check.c
+--- postfix-2.1.3.orig/src/smtpd/smtpd_check.c 2004-06-22 14:32:57.348808065 +0200
++++ postfix-2.1.3/src/smtpd/smtpd_check.c 2004-06-22 14:33:21.271417494 +0200
+@@ -1103,6 +1103,7 @@
char *reply_name, char *reply_class)
{
char *myname = "check_relay_domains";
+ VSTRING *reply_msg = vstring_alloc(1);
- if (msg_verbose)
- msg_info("%s: %s", myname, recipient);
-@@ -1029,9 +1030,10 @@
+ #if 1
+ static int once;
+@@ -1133,9 +1134,10 @@
/*
* Deny relaying between sites that both are not in relay_domains.
*/
}
/* permit_auth_destination - OK for message relaying */
-@@ -1088,6 +1090,7 @@
+@@ -1192,6 +1194,7 @@
static int reject_unauth_destination(SMTPD_STATE *state, char *recipient)
{
char *myname = "reject_unauth_destination";
if (msg_verbose)
msg_info("%s: %s", myname, recipient);
-@@ -1101,9 +1104,10 @@
+@@ -1205,9 +1208,10 @@
/*
* Reject relaying to sites that are not listed in relay_domains.
*/
}
/* reject_unauth_pipelining - reject improper use of SMTP command pipelining */
-diff -ruN postfix-1.1.11/src/smtpd/smtpd.c postfix-1.1.11.my/src/smtpd/smtpd.c
---- postfix.orig/src/smtpd/smtpd.c Wed Sep 18 12:16:53 2002
-+++ postfix/src/smtpd/smtpd.c Wed Sep 18 12:08:12 2002
-@@ -2004,6 +2004,7 @@
- VAR_VERP_CLIENTS, DEF_VERP_CLIENTS, &var_verp_clients, 0, 0,
- VAR_RELAY_CCERTS, DEF_RELAY_CCERTS, &var_relay_ccerts, 0, 0,
- VAR_SMTPD_SASL_TLS_OPTS, DEF_SMTPD_SASL_TLS_OPTS, &var_smtpd_sasl_tls_opts, 0, 0,
-+ VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
- 0,
- };
- static CONFIG_RAW_TABLE raw_table[] = {
-diff -Nur postfix-2.0.16.orig/conf/main.cf postfix-2.0.16/conf/main.cf
---- postfix-2.0.16.orig/conf/main.cf Sat Sep 6 02:30:35 2003
-+++ postfix-2.0.16/conf/main.cf Mon Dec 1 14:26:08 2003
-@@ -37,7 +37,7 @@
+diff -dur postfix-2.1.3.orig/conf/main.cf postfix-2.1.3/conf/main.cf
+--- postfix-2.1.3.orig/conf/main.cf 2004-06-06 23:53:58.000000000 +0200
++++ postfix-2.1.3/conf/main.cf 2004-06-22 14:23:20.533313840 +0200
+@@ -38,7 +38,7 @@
# daemon programs (i.e. programs listed in the master.cf file). This
# directory must be owned by root.
#
# QUEUE AND PROCESS OWNERSHIP
#
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
# These rights are used in the absence of a recipient user context.
# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
#
# INTERNET HOST AND DOMAIN NAMES
#
-@@ -87,7 +87,7 @@
+@@ -88,7 +88,7 @@
# myorigin also specifies the default domain name that is appended
# to recipient addresses that have no @domain part.
#
#myorigin = $mydomain
# RECEIVING MAIL
-@@ -377,7 +377,7 @@
+@@ -372,7 +372,7 @@
# "postfix reload" to eliminate the delay.
#
#alias_maps = dbm:/etc/aliases
#alias_maps = hash:/etc/aliases, nis:mail.aliases
#alias_maps = netinfo:/aliases
-@@ -388,7 +388,7 @@
+@@ -383,7 +383,7 @@
#
#alias_database = dbm:/etc/aliases
#alias_database = dbm:/etc/mail/aliases
#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
# ADDRESS EXTENSIONS (e.g., user+foo)
-@@ -416,7 +416,7 @@
+@@ -411,7 +411,7 @@
# UNIX-style mailboxes are kept. The default setting depends on the
# system type.
#
#mail_spool_directory = /var/spool/mail
# The mailbox_command parameter specifies the optional external
-@@ -438,8 +438,8 @@
+@@ -433,8 +433,8 @@
# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
#
# The mailbox_transport specifies the optional transport in master.cf
# to use after processing aliases and .forward files. This parameter
-@@ -598,39 +598,12 @@
+@@ -588,44 +588,14 @@
# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1
# >$config_directory/$process_name.$process_id.log & sleep 5
-# is the Sendmail-compatible mail queue listing command.
-#
-mailq_path =
--
+
# setgid_group: The group for mail submission and queue management
# 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 =
-
+-# html_directory: The location of the Postfix HTML documentation.
+-#
+-html_directory =
+-
-# manpage_directory: The location of the Postfix on-line manual pages.
-#
-manpage_directory =
-
-# sample_directory: The location of the Postfix sample configuration files.
+-# This parameter is obsolete as of Postfix 2.1.
-#
-sample_directory =
--
++setgid_group = maildrop
+
-# readme_directory: The location of the Postfix README files.
-#
-readme_directory =
-+setgid_group = maildrop
-diff -Nur postfix-2.0.16.orig/src/global/mail_params.h postfix-2.0.16/src/global/mail_params.h
---- postfix-2.0.16.orig/src/global/mail_params.h Mon Dec 1 14:25:29 2003
-+++ postfix-2.0.16/src/global/mail_params.h Mon Dec 1 14:26:08 2003
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
-
- #define VAR_SGID_GROUP "setgid_group"
--#define DEF_SGID_GROUP "postdrop"
-+#define DEF_SGID_GROUP "maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
-
-@@ -221,7 +221,7 @@
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR "/etc/postfix"
-+#define DEF_CONFIG_DIR "/etc/mail"
- #endif
- extern char *var_config_dir;
-
-diff -Nur postfix-2.0.16.orig/src/util/sys_defs.h postfix-2.0.16/src/util/sys_defs.h
---- postfix-2.0.16.orig/src/util/sys_defs.h Thu Sep 11 02:33:31 2003
-+++ postfix-2.0.16/src/util/sys_defs.h Mon Dec 1 14:26:08 2003
-@@ -491,7 +491,7 @@
- #define HAS_FSYNC
- #define HAS_DB
- #define DEF_DB_TYPE "hash"
--#define ALIAS_DB_MAP "hash:/etc/aliases"
-+#define ALIAS_DB_MAP "hash:/etc/mail/aliases"
- #define HAS_NIS
- #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
- #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
-diff -Nur postfix-2.0.16.orig/man/man1/postdrop.1 postfix-2.0.16/man/man1/postdrop.1
---- postfix-2.0.16.orig/man/man1/postdrop.1 Tue Jun 10 02:16:04 2003
-+++ postfix-2.0.16/man/man1/postdrop.1 Mon Dec 1 14:26:08 2003
-@@ -61,7 +61,7 @@
+diff -dur postfix-2.1.3.orig/man/man1/postconf.1 postfix-2.1.3/man/man1/postconf.1
+--- postfix-2.1.3.orig/man/man1/postconf.1 2004-04-22 21:27:05.000000000 +0200
++++ postfix-2.1.3/man/man1/postconf.1 2004-06-22 14:25:06.710151423 +0200
+@@ -150,7 +150,7 @@
+ .SH "FILES"
.na
.nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+/etc/mail, configuration files
- .SH CONFIGURATION PARAMETERS
+-/etc/postfix/main.cf, Postfix configuration parameters
++/etc/mail/main.cf, Postfix configuration parameters
+ .SH "SEE ALSO"
.na
.nf
-diff -Nur postfix-2.0.16.orig/man/man1/postqueue.1 postfix-2.0.16/man/man1/postqueue.1
---- postfix-2.0.16.orig/man/man1/postqueue.1 Tue Jan 7 22:16:13 2003
-+++ postfix-2.0.16/man/man1/postqueue.1 Mon Dec 1 14:26:08 2003
-@@ -95,7 +95,7 @@
+diff -dur postfix-2.1.3.orig/man/man1/postfix.1 postfix-2.1.3/man/man1/postfix.1
+--- postfix-2.1.3.orig/man/man1/postfix.1 2004-04-21 23:15:45.000000000 +0200
++++ postfix-2.1.3/man/man1/postfix.1 2004-06-22 14:25:40.468191217 +0200
+@@ -151,11 +151,11 @@
+ .SH "FILES"
.na
.nf
- /var/spool/postfix, mail queue
--/etc/postfix, configuration files
-+/etc/mail, configuration files
- .SH CONFIGURATION PARAMETERS
+-/etc/postfix/main.cf, Postfix configuration parameters
+-/etc/postfix/master.cf, Postfix daemon processes
+-/etc/postfix/postfix-files, file/directory permissions
+-/etc/postfix/postfix-script, administrative commands
+-/etc/postfix/post-install, post-installation configuration
++/etc/mail/main.cf, Postfix configuration parameters
++/etc/mail/master.cf, Postfix daemon processes
++/etc/mail/postfix-files, file/directory permissions
++/etc/mail/postfix-script, administrative commands
++/etc/mail/post-install, post-installation configuration
+ .SH "SEE ALSO"
.na
.nf
-diff -Nur postfix-2.0.16.orig/man/man1/sendmail.1 postfix-2.0.16/man/man1/sendmail.1
---- postfix-2.0.16.orig/man/man1/sendmail.1 Tue Jun 10 02:16:04 2003
-+++ postfix-2.0.16/man/man1/sendmail.1 Mon Dec 1 14:26:08 2003
-@@ -63,7 +63,7 @@
- The message body MIME type: \fB7BIT\fR or \fB8BITMIME\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
+diff -dur postfix-2.1.3.orig/man/man1/sendmail.1 postfix-2.1.3/man/man1/sendmail.1
+--- postfix-2.1.3.orig/man/man1/sendmail.1 2004-04-14 03:56:07.000000000 +0200
++++ postfix-2.1.3/man/man1/sendmail.1 2004-06-22 14:25:58.213160652 +0200
+@@ -92,7 +92,7 @@
+ This feature is available in Postfix version 2.1 and later.
+ .IP "\fB-C \fIconfig_file\fR (ignored)"
The path name of the \fBsendmail.cf\fR file. Postfix configuration
--files are kept in \fB/etc/postfix\fR.
-+files are kept in \fB/etc/mail\fR.
+-files are kept in the \fB/etc/postfix\fR directory.
++files are kept in the \fB/etc/mail\fR directory.
.IP "\fB-F \fIfull_name\fR
Set the sender full name. This is used only with messages that
have no \fBFrom:\fR message header.
-@@ -208,7 +208,7 @@
+@@ -325,7 +325,7 @@
.na
.nf
/var/spool/postfix, mail queue
-/etc/postfix, configuration files
+/etc/mail, configuration files
- .SH CONFIGURATION PARAMETERS
+ .SH "SEE ALSO"
.na
.nf
-diff -Nur postfix-2.0.16.orig/man/man5/access.5 postfix-2.0.16/man/man5/access.5
---- postfix-2.0.16.orig/man/man5/access.5 Tue Aug 12 18:13:05 2003
-+++ postfix-2.0.16/man/man5/access.5 Mon Dec 1 14:27:35 2003
+diff -dur postfix-2.1.3.orig/man/man5/access.5 postfix-2.1.3/man/man5/access.5
+--- postfix-2.1.3.orig/man/man5/access.5 2004-04-22 02:44:38.000000000 +0200
++++ postfix-2.1.3/man/man5/access.5 2004-06-22 14:28:34.239094126 +0200
@@ -8,11 +8,11 @@
- .SH SYNOPSIS
+ .SH "SYNOPSIS"
.na
.nf
-\fBpostmap /etc/postfix/access\fR
.SH DESCRIPTION
.ad
.fi
-@@ -25,7 +25,7 @@
+@@ -28,7 +28,7 @@
that serves as input to the \fBpostmap\fR(1) command.
The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
is used for fast searching by the mail system. Execute the command
file after changing the access table.
When the table is provided via other means such as NIS, LDAP
-diff -Nur postfix-2.0.16.orig/man/man5/canonical.5 postfix-2.0.16/man/man5/canonical.5
---- postfix-2.0.16.orig/man/man5/canonical.5 Tue Aug 12 18:13:05 2003
-+++ postfix-2.0.16/man/man5/canonical.5 Mon Dec 1 14:27:50 2003
+@@ -278,20 +278,20 @@
+
+ .na
+ .nf
+-/etc/postfix/main.cf:
++/etc/mail/main.cf:
+ .in +4
+ smtpd_client_restrictions =
+ .in +4
+-check_client_access hash:/etc/postfix/access
++check_client_access hash:/etc/mail/access
+
+ .in -8
+-/etc/postfix/access:
++/etc/mail/access:
+ .in +4
+ 1.2.3 REJECT
+ 1.2.3.4 OK
+ .in -4
+
+-Execute the command "\fBpostmap /etc/postfix/access\fR" after
++Execute the command "\fBpostmap /etc/mail/access\fR" after
+ editing the file.
+ .SH BUGS
+ .ad
+diff -dur postfix-2.1.3.orig/man/man5/canonical.5 postfix-2.1.3/man/man5/canonical.5
+--- postfix-2.1.3.orig/man/man5/canonical.5 2004-04-22 02:44:38.000000000 +0200
++++ postfix-2.1.3/man/man5/canonical.5 2004-06-22 14:21:17.987420735 +0200
@@ -8,11 +8,11 @@
- .SH SYNOPSIS
+ .SH "SYNOPSIS"
.na
.nf
-\fBpostmap /etc/postfix/canonical\fR
file after changing the text file.
When the table is provided via other means such as NIS, LDAP
-diff -Nur postfix-2.0.16.orig/man/man5/pcre_table.5 postfix-2.0.16/man/man5/pcre_table.5
---- postfix-2.0.16.orig/man/man5/pcre_table.5 Mon Sep 8 14:36:26 2003
-+++ postfix-2.0.16/man/man5/pcre_table.5 Mon Dec 1 14:28:06 2003
-@@ -8,11 +8,11 @@
- .SH SYNOPSIS
+diff -dur postfix-2.1.3.orig/man/man5/cidr_table.5 postfix-2.1.3/man/man5/cidr_table.5
+--- postfix-2.1.3.orig/man/man5/cidr_table.5 2004-04-16 15:17:25.000000000 +0200
++++ postfix-2.1.3/man/man5/cidr_table.5 2004-06-22 14:28:40.742716008 +0200
+@@ -8,9 +8,9 @@
+ .SH "SYNOPSIS"
.na
.nf
--\fBpcre:/etc/postfix/\fIfilename\fR
-+\fBpcre:/etc/mail/\fIfilename\fR
+-\fBpostmap -q "\fIstring\fB" cidr:/etc/postfix/\fIfilename\fR
++\fBpostmap -q "\fIstring\fB" cidr:/etc/mail/\fIfilename\fR
--\fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
-+\fBpostmap -q "\fIstring\fB" pcre:/etc/mail/\fIfilename\fR
+-\fBpostmap -q - cidr:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - cidr:/etc/mail/\fIfilename\fR <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -53,11 +53,11 @@
+ .SH "EXAMPLE SMTPD ACCESS MAP"
+ .na
+ .nf
+-/etc/postfix/main.cf:
++/etc/mail/main.cf:
+ .ti +4
+-smtpd_client_restrictions = ... cidr:/etc/postfix/client.cidr ...
++smtpd_client_restrictions = ... cidr:/etc/mail/client.cidr ...
--\fBpostmap -q - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
-+\fBpostmap -q - pcre:/etc/mail/\fIfilename\fR <\fIinputfile\fR
+-/etc/postfix/client.cidr:
++/etc/mail/client.cidr:
+ .in +4
+ # Rule order matters. Put more specific whitelist entries
+ # before more general blacklist entries.
+diff -dur postfix-2.1.3.orig/man/man5/header_checks.5 postfix-2.1.3/man/man5/header_checks.5
+--- postfix-2.1.3.orig/man/man5/header_checks.5 2004-05-07 21:25:22.000000000 +0200
++++ postfix-2.1.3/man/man5/header_checks.5 2004-06-22 14:28:52.575028045 +0200
+@@ -8,17 +8,17 @@
+ .SH "SYNOPSIS"
+ .na
+ .nf
+-\fBheader_checks = pcre:/etc/postfix/header_checks\fR
++\fBheader_checks = pcre:/etc/mail/header_checks\fR
+ .br
+-\fBmime_header_checks = pcre:/etc/postfix/mime_header_checks\fR
++\fBmime_header_checks = pcre:/etc/mail/mime_header_checks\fR
+ .br
+-\fBnested_header_checks = pcre:/etc/postfix/nested_header_checks\fR
++\fBnested_header_checks = pcre:/etc/mail/nested_header_checks\fR
+ .br
+-\fBbody_checks = pcre:/etc/postfix/body_checks\fR
++\fBbody_checks = pcre:/etc/mail/body_checks\fR
+ .sp
+-\fBpostmap -fq "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
++\fBpostmap -fq "\fIstring\fB" pcre:/etc/mail/\fIfilename\fR
+ .br
+-\fBpostmap -fq - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -fq - pcre:/etc/mail/\fIfilename\fR <\fIinputfile\fR
.SH DESCRIPTION
.ad
.fi
-diff -Nur postfix-2.0.16.orig/man/man5/regexp_table.5 postfix-2.0.16/man/man5/regexp_table.5
---- postfix-2.0.16.orig/man/man5/regexp_table.5 Fri Aug 1 01:03:34 2003
-+++ postfix-2.0.16/man/man5/regexp_table.5 Mon Dec 1 14:28:18 2003
-@@ -8,11 +8,11 @@
- .SH SYNOPSIS
+@@ -274,11 +274,11 @@
+
.na
.nf
--\fBregexp:/etc/postfix/\fIfilename\fR
-+\fBregexp:/etc/mail/\fIfilename\fR
+-/etc/postfix/main.cf:
++/etc/mail/main.cf:
+ .ti +4
+-header_checks = regexp:/etc/postfix/header_checks
++header_checks = regexp:/etc/mail/header_checks
+
+-/etc/postfix/header_checks:
++/etc/mail/header_checks:
+ .ti +4
+ /^content-(type|disposition):.*name[[:space:]]*=.*\\.(exe|vbs)/
+ .ti +8
+@@ -290,11 +290,11 @@
--\fBpostmap -q "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
-+\fBpostmap -q "\fIstring\fB" regexp:/etc/mail/\fIfilename\fR
+ .na
+ .nf
+-/etc/postfix/main.cf:
++/etc/mail/main.cf:
+ .ti +4
+-body_checks = regexp:/etc/postfix/body_checks
++body_checks = regexp:/etc/mail/body_checks
--\fBpostmap -q - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
-+\fBpostmap -q - regexp:/etc/mail/\fIfilename\fR <\fIinputfile\fR
+-/etc/postfix/body_checks:
++/etc/mail/body_checks:
+ .ti +4
+ /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
+ .ti +8
+diff -dur postfix-2.1.3.orig/man/man5/ldap_table.5 postfix-2.1.3/man/man5/ldap_table.5
+--- postfix-2.1.3.orig/man/man5/ldap_table.5 2004-04-16 16:50:00.000000000 +0200
++++ postfix-2.1.3/man/man5/ldap_table.5 2004-06-22 14:28:58.307694713 +0200
+@@ -8,9 +8,9 @@
+ .SH "SYNOPSIS"
+ .na
+ .nf
+-\fBpostmap -q "\fIstring\fB" ldap:/etc/postfix/filename\fR
++\fBpostmap -q "\fIstring\fB" ldap:/etc/mail/filename\fR
+
+-\fBpostmap -q - ldap:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - ldap:/etc/mail/\fIfilename\fR <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -23,9 +23,9 @@
+ In order to use LDAP lookups, define an LDAP source as a lookup
+ table in main.cf, for example:
+ .ti +4
+-alias_maps = ldap:/etc/postfix/ldap-aliases.cf
++alias_maps = ldap:/etc/mail/ldap-aliases.cf
+
+-The file /etc/postfix/ldap-aliases.cf has the same format as
++The file /etc/mail/ldap-aliases.cf has the same format as
+ the Postfix main.cf file, and can specify the parameters
+ described below. An example is given at the end of this manual.
+
+@@ -207,7 +207,7 @@
+ and "@domain" lookups are not performed. This can significantly
+ reduce the query load on the LDAP server.
+ .ti +4
+-domain = postfix.org, hash:/etc/postfix/searchdomains
++domain = postfix.org, hash:/etc/mail/searchdomains
+
+ It is best not to use LDAP to store the domains eligible
+ for LDAP lookups.
+@@ -398,9 +398,9 @@
+ .ti +4
+ alias_maps = hash:/etc/aliases,
+ .ti +8
+-ldap:/etc/postfix/ldap-aliases.cf
++ldap:/etc/mail/ldap-aliases.cf
+
+-and in ldap:/etc/postfix/ldap-aliases.cf you have:
++and in ldap:/etc/mail/ldap-aliases.cf you have:
+ .in +4
+ server_host = ldap.my.com
+ .br
+diff -dur postfix-2.1.3.orig/man/man5/mysql_table.5 postfix-2.1.3/man/man5/mysql_table.5
+--- postfix-2.1.3.orig/man/man5/mysql_table.5 2004-04-14 16:27:48.000000000 +0200
++++ postfix-2.1.3/man/man5/mysql_table.5 2004-06-22 14:29:04.905311074 +0200
+@@ -8,9 +8,9 @@
+ .SH "SYNOPSIS"
+ .na
+ .nf
+-\fBpostmap -q "\fIstring\fB" mysql:/etc/postfix/filename\fR
++\fBpostmap -q "\fIstring\fB" mysql:/etc/mail/filename\fR
+
+-\fBpostmap -q - mysql:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - mysql:/etc/mail/\fIfilename\fR <\fIinputfile\fR
.SH DESCRIPTION
.ad
.fi
-diff -Nur postfix-2.0.16.orig/man/man5/relocated.5 postfix-2.0.16/man/man5/relocated.5
---- postfix-2.0.16.orig/man/man5/relocated.5 Tue Aug 12 18:13:05 2003
-+++ postfix-2.0.16/man/man5/relocated.5 Mon Dec 1 14:26:08 2003
+@@ -24,7 +24,7 @@
+ .ti +4
+ alias_maps = mysql:/etc/mysql-aliases.cf
+
+-The file /etc/postfix/mysql-aliases.cf has the same format as
++The file /etc/mail/mysql-aliases.cf has the same format as
+ the Postfix main.cf file, and can specify the parameters
+ described below.
+ .SH "ALTERNATIVE CONFIGURATION"
+diff -dur postfix-2.1.3.orig/man/man5/pcre_table.5 postfix-2.1.3/man/man5/pcre_table.5
+--- postfix-2.1.3.orig/man/man5/pcre_table.5 2004-04-14 16:27:48.000000000 +0200
++++ postfix-2.1.3/man/man5/pcre_table.5 2004-06-22 14:26:40.727691077 +0200
+@@ -8,9 +8,9 @@
+ .SH "SYNOPSIS"
+ .na
+ .nf
+-\fBpostmap -fq "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
++\fBpostmap -fq "\fIstring\fB" pcre:/etc/mail/\fIfilename\fR
+
+-\fBpostmap -fq - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -fq - pcre:/etc/mail/\fIfilename\fR <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+diff -dur postfix-2.1.3.orig/man/man5/pgsql_table.5 postfix-2.1.3/man/man5/pgsql_table.5
+--- postfix-2.1.3.orig/man/man5/pgsql_table.5 2004-04-14 16:27:48.000000000 +0200
++++ postfix-2.1.3/man/man5/pgsql_table.5 2004-06-22 14:29:12.348878225 +0200
+@@ -8,9 +8,9 @@
+ .SH "SYNOPSIS"
+ .na
+ .nf
+-\fBpostmap -q "\fIstring\fB" pgsql:/etc/postfix/filename\fR
++\fBpostmap -q "\fIstring\fB" pgsql:/etc/mail/filename\fR
+
+-\fBpostmap -q - pgsql:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -q - pgsql:/etc/mail/\fIfilename\fR <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+@@ -24,7 +24,7 @@
+ .ti +4
+ alias_maps = pgsql:/etc/pgsql-aliases.cf
+
+-The file /etc/postfix/pgsql-aliases.cf has the same format as
++The file /etc/mail/pgsql-aliases.cf has the same format as
+ the Postfix main.cf file, and can specify the parameters
+ described below.
+ .SH "ALTERNATIVE CONFIGURATION"
+diff -dur postfix-2.1.3.orig/man/man5/postconf.5 postfix-2.1.3/man/man5/postconf.5
+--- postfix-2.1.3.orig/man/man5/postconf.5 2004-06-17 00:40:35.000000000 +0200
++++ postfix-2.1.3/man/man5/postconf.5 2004-06-22 14:28:11.642407760 +0200
+@@ -91,8 +91,8 @@
+ .nf
+ .na
+ .ft C
+-address_verify_map = hash:/etc/postfix/verify
+-address_verify_map = btree:/etc/postfix/verify
++address_verify_map = hash:/etc/mail/verify
++address_verify_map = btree:/etc/mail/verify
+ .fi
+ .ad
+ .ft R
+@@ -484,7 +484,7 @@
+ login names by Firstname.Lastname. The table format and lookups
+ are documented in canonical(5).
+ .PP
+-If you use this feature, run "\fBpostmap /etc/postfix/canonical\fR" to
++If you use this feature, run "\fBpostmap /etc/mail/canonical\fR" to
+ build the necessary DBM or DB file after every change. The changes
+ will become visible after a minute or so. Use "\fBpostfix reload\fR"
+ to eliminate the delay.
+@@ -494,8 +494,8 @@
+ .nf
+ .na
+ .ft C
+-canonical_maps = dbm:/etc/postfix/canonical
+-canonical_maps = hash:/etc/postfix/canonical
++canonical_maps = dbm:/etc/mail/canonical
++canonical_maps = hash:/etc/mail/canonical
+ .fi
+ .ad
+ .ft R
+@@ -1906,7 +1906,7 @@
+ .ft C
+ mynetworks = 168.100.189.0/28, 127.0.0.0/8
+ mynetworks = $config_directory/mynetworks
+-mynetworks = hash:/etc/postfix/network_table
++mynetworks = hash:/etc/mail/network_table
+ .fi
+ .ad
+ .ft R
+@@ -2283,7 +2283,7 @@
+ Look up the "@domain.tld" part.
+ .PP
+ Specify the types and names of databases to use. After change,
+-run "\fBpostmap /etc/postfix/recipient_bcc\fR".
++run "\fBpostmap /etc/mail/recipient_bcc\fR".
+ .PP
+ NOTE: if mail to the BCC address bounces it will be returned to
+ the sender.
+@@ -2293,7 +2293,7 @@
+ .nf
+ .na
+ .ft C
+-recipient_bcc_maps = hash:/etc/postfix/recipient_bcc
++recipient_bcc_maps = hash:/etc/mail/recipient_bcc
+ .fi
+ .ad
+ .ft R
+@@ -2309,7 +2309,7 @@
+ .nf
+ .na
+ .ft C
+-recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
++recipient_canonical_maps = hash:/etc/mail/recipient_canonical
+ .fi
+ .ad
+ .ft R
+@@ -2401,7 +2401,7 @@
+ .nf
+ .na
+ .ft C
+-relay_recipient_maps = hash:/etc/postfix/relay_recipients
++relay_recipient_maps = hash:/etc/mail/relay_recipients
+ .fi
+ .ad
+ .ft R
+@@ -2454,7 +2454,7 @@
+ domains that no longer exist. The table format and lookups are
+ documented in relocated(5).
+ .PP
+-If you use this feature, run "\fBpostmap /etc/postfix/relocated\fR" to
++If you use this feature, run "\fBpostmap /etc/mail/relocated\fR" to
+ build the necessary DBM or DB file after change, then "\fBpostfix
+ reload\fR" to make the changes visible.
+ .PP
+@@ -2463,8 +2463,8 @@
+ .nf
+ .na
+ .ft C
+-relocated_maps = dbm:/etc/postfix/relocated
+-relocated_maps = hash:/etc/postfix/relocated
++relocated_maps = dbm:/etc/mail/relocated
++relocated_maps = hash:/etc/mail/relocated
+ .fi
+ .ad
+ .ft R
+@@ -2505,7 +2505,7 @@
+ next-hop host, recipient) triple.
+ .PP
+ This feature is available in Postfix 2.0 and later.
+-.SH sample_directory (default: /etc/postfix)
++.SH sample_directory (default: /etc/mail)
+ The name of the directory with example Postfix configuration files.
+ .SH sender_based_routing (default: no)
+ This parameter should not be used.
+@@ -2534,7 +2534,7 @@
+ Look up the "@domain.tld" part.
+ .PP
+ Specify the types and names of databases to use. After change,
+-run "\fBpostmap /etc/postfix/sender_bcc\fR".
++run "\fBpostmap /etc/mail/sender_bcc\fR".
+ .PP
+ NOTE: if mail to the BCC address bounces it will be returned to
+ the sender.
+@@ -2544,7 +2544,7 @@
+ .nf
+ .na
+ .ft C
+-sender_bcc_maps = hash:/etc/postfix/sender_bcc
++sender_bcc_maps = hash:/etc/mail/sender_bcc
+ .fi
+ .ad
+ .ft R
+@@ -2564,7 +2564,7 @@
+ .nf
+ .na
+ .ft C
+-sender_canonical_maps = hash:/etc/postfix/sender_canonical
++sender_canonical_maps = hash:/etc/mail/sender_canonical
+ .fi
+ .ad
+ .ft R
+@@ -2610,7 +2610,7 @@
+ .nf
+ .na
+ .ft C
+- /etc/postfix/master.cf:
++ /etc/mail/master.cf:
+ smtp ... smtp -o smtp_bind_address=11.22.33.44
+ .fi
+ .ad
+@@ -2686,7 +2686,7 @@
+ .nf
+ .na
+ .ft C
+- /etc/postfix/master.cf:
++ /etc/mail/master.cf:
+ mysmtp ... smtp -o smtp_helo_name=foo.bar.com
+ .fi
+ .ad
+@@ -2778,7 +2778,7 @@
+ .nf
+ .na
+ .ft C
+- /etc/postfix/master.cf:
++ /etc/mail/master.cf:
+ broken-smtp . . . smtp -o smtp_quote_rfc821_envelope=no
+ .fi
+ .ad
+@@ -2822,7 +2822,7 @@
+ attempt to authenticate to the remote host.
+ .PP
+ The Postfix SMTP client opens the lookup table before going to
+-chroot jail, so you can leave the password file in /etc/postfix.
++chroot jail, so you can leave the password file in /etc/mail.
+ .SH smtp_sasl_security_options (default: noplaintext, noanonymous)
+ What authentication mechanisms the Postfix SMTP client is allowed
+ to use. The list of available authentication mechanisms is system
+@@ -3833,7 +3833,7 @@
+ .ft C
+ smtpd_sender_restrictions = reject_unknown_sender_domain
+ smtpd_sender_restrictions = reject_unknown_sender_domain,
+- check_sender_access hash:/etc/postfix/access
++ check_sender_access hash:/etc/mail/access
+ .fi
+ .ad
+ .ft R
+@@ -3970,7 +3970,7 @@
+ for details.
+ .PP
+ Specify zero or more "type:table" lookup tables. If you use this
+-feature with local files, run "\fBpostmap /etc/postfix/transport\fR"
++feature with local files, run "\fBpostmap /etc/mail/transport\fR"
+ after making a change.
+ .PP
+ Examples:
+@@ -3978,8 +3978,8 @@
+ .nf
+ .na
+ .ft C
+-transport_maps = dbm:/etc/postfix/transport
+-transport_maps = hash:/etc/postfix/transport
++transport_maps = dbm:/etc/mail/transport
++transport_maps = hash:/etc/mail/transport
+ .fi
+ .ad
+ .ft R
+@@ -4135,15 +4135,15 @@
+ value is backwards compatible with Postfix 1.1.
+ .PP
+ If you use this feature with indexed files, run "\fBpostmap
+-/etc/postfix/virtual\fR" after changing the file.
++/etc/mail/virtual\fR" after changing the file.
+ .PP
+ Examples:
+ .PP
+ .nf
+ .na
+ .ft C
+-virtual_alias_maps = dbm:/etc/postfix/virtual
+-virtual_alias_maps = hash:/etc/postfix/virtual
++virtual_alias_maps = dbm:/etc/mail/virtual
++virtual_alias_maps = hash:/etc/mail/virtual
+ .fi
+ .ad
+ .ft R
+diff -dur postfix-2.1.3.orig/man/man5/regexp_table.5 postfix-2.1.3/man/man5/regexp_table.5
+--- postfix-2.1.3.orig/man/man5/regexp_table.5 2004-04-14 16:27:48.000000000 +0200
++++ postfix-2.1.3/man/man5/regexp_table.5 2004-06-22 14:27:07.928110708 +0200
+@@ -8,9 +8,9 @@
+ .SH "SYNOPSIS"
+ .na
+ .nf
+-\fBpostmap -fq "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
++\fBpostmap -fq "\fIstring\fB" regexp:/etc/mail/\fIfilename\fR
+
+-\fBpostmap -fq - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
++\fBpostmap -fq - regexp:/etc/mail/\fIfilename\fR <\fIinputfile\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
+diff -dur postfix-2.1.3.orig/man/man5/relocated.5 postfix-2.1.3/man/man5/relocated.5
+--- postfix-2.1.3.orig/man/man5/relocated.5 2004-04-22 02:44:38.000000000 +0200
++++ postfix-2.1.3/man/man5/relocated.5 2004-06-22 14:21:18.001419923 +0200
@@ -8,7 +8,7 @@
- .SH SYNOPSIS
+ .SH "SYNOPSIS"
.na
.nf
-\fBpostmap /etc/postfix/relocated\fR
file after changing the relocated table.
When the table is provided via other means such as NIS, LDAP
-diff -Nur postfix-2.0.16.orig/man/man5/transport.5 postfix-2.0.16/man/man5/transport.5
---- postfix-2.0.16.orig/man/man5/transport.5 Tue Aug 12 18:13:05 2003
-+++ postfix-2.0.16/man/man5/transport.5 Mon Dec 1 14:28:30 2003
+diff -dur postfix-2.1.3.orig/man/man5/transport.5 postfix-2.1.3/man/man5/transport.5
+--- postfix-2.1.3.orig/man/man5/transport.5 2004-04-22 14:58:40.000000000 +0200
++++ postfix-2.1.3/man/man5/transport.5 2004-06-22 14:21:18.002419865 +0200
@@ -8,11 +8,11 @@
- .SH SYNOPSIS
+ .SH "SYNOPSIS"
.na
.nf
-\fBpostmap /etc/postfix/transport\fR
.SH DESCRIPTION
.ad
.fi
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
that serves as input to the \fBpostmap\fR(1) command.
The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used
for fast searching by the mail system. Execute the command
file after changing the transport table.
When the table is provided via other means such as NIS, LDAP
-diff -Nur postfix-2.0.16.orig/man/man5/virtual.5 postfix-2.0.16/man/man5/virtual.5
---- postfix-2.0.16.orig/man/man5/virtual.5 Tue Aug 12 19:47:26 2003
-+++ postfix-2.0.16/man/man5/virtual.5 Mon Dec 1 14:28:53 2003
+diff -dur postfix-2.1.3.orig/man/man5/virtual.5 postfix-2.1.3/man/man5/virtual.5
+--- postfix-2.1.3.orig/man/man5/virtual.5 2004-04-22 02:44:38.000000000 +0200
++++ postfix-2.1.3/man/man5/virtual.5 2004-06-22 14:21:18.004419750 +0200
@@ -8,11 +8,11 @@
- .SH SYNOPSIS
+ .SH "SYNOPSIS"
.na
.nf
-\fBpostmap /etc/postfix/virtual\fR
file after changing the text file.
When the table is provided via other means such as NIS, LDAP
-@@ -119,15 +119,15 @@
+@@ -125,15 +125,15 @@
Support for a virtual alias domain looks like:
.nf
.na
\fIvirtual-alias.domain anything\fR (right-hand content does not matter)
-diff -Nur postfix-2.0.16.orig/man/man8/cleanup.8 postfix-2.0.16/man/man8/cleanup.8
---- postfix-2.0.16.orig/man/man8/cleanup.8 Tue Aug 12 18:04:43 2003
-+++ postfix-2.0.16/man/man8/cleanup.8 Mon Dec 1 14:26:08 2003
-@@ -185,8 +185,8 @@
- .SH FILES
+diff -dur postfix-2.1.3.orig/man/man8/cleanup.8 postfix-2.1.3/man/man8/cleanup.8
+--- postfix-2.1.3.orig/man/man8/cleanup.8 2004-04-14 16:27:46.000000000 +0200
++++ postfix-2.1.3/man/man8/cleanup.8 2004-06-22 14:27:27.616966592 +0200
+@@ -283,8 +283,8 @@
+ .SH "FILES"
.na
.nf
-/etc/postfix/canonical*, canonical mapping table
-/etc/postfix/virtual*, virtual mapping table
+/etc/mail/canonical*, canonical mapping table
+/etc/mail/virtual*, virtual mapping table
- .SH LICENSE
+ .SH "SEE ALSO"
.na
.nf
-diff -Nur postfix-2.0.16.orig/man/man8/master.8 postfix-2.0.16/man/man8/master.8
---- postfix-2.0.16.orig/man/man8/master.8 Thu Dec 19 03:18:43 2002
-+++ postfix-2.0.16/man/man8/master.8 Mon Dec 1 14:26:08 2003
-@@ -129,8 +129,8 @@
- .SH FILES
+diff -dur postfix-2.1.3.orig/man/man8/master.8 postfix-2.1.3/man/man8/master.8
+--- postfix-2.1.3.orig/man/man8/master.8 2004-04-11 21:19:47.000000000 +0200
++++ postfix-2.1.3/man/man8/master.8 2004-06-22 14:27:45.157947168 +0200
+@@ -147,8 +147,8 @@
+ .SH "FILES"
.na
.nf
--/etc/postfix/main.cf: global configuration file.
--/etc/postfix/master.cf: master process configuration file.
-+/etc/mail/main.cf: global configuration file.
-+/etc/mail/master.cf: master process configuration file.
- /var/spool/postfix/pid/master.pid: master lock file.
- .SH SEE ALSO
+-/etc/postfix/main.cf, global configuration file.
+-/etc/postfix/master.cf, master server configuration file.
++/etc/mail/main.cf, global configuration file.
++/etc/mail/master.cf, master server configuration file.
+ /var/spool/postfix/pid/master.pid, master lock file.
+ .SH "SEE ALSO"
.na
-diff -Nur postfix-2.0.16.orig/man/man8/proxymap.8 postfix-2.0.16/man/man8/proxymap.8
---- postfix-2.0.16.orig/man/man8/proxymap.8 Wed May 21 21:21:42 2003
-+++ postfix-2.0.16/man/man8/proxymap.8 Mon Dec 1 14:26:59 2003
+diff -dur postfix-2.1.3.orig/man/man8/proxymap.8 postfix-2.1.3/man/man8/proxymap.8
+--- postfix-2.1.3.orig/man/man8/proxymap.8 2004-06-14 23:18:54.000000000 +0200
++++ postfix-2.1.3/man/man8/proxymap.8 2004-06-22 14:21:18.013419228 +0200
@@ -33,7 +33,7 @@
.sp
virtual_alias_maps =
.sp
The total number of connections is limited by the number of
proxymap server processes.
-diff -Nur postfix-2.0.16.orig/man/man8/tlsmgr.8 postfix-2.0.16/man/man8/tlsmgr.8
---- postfix-2.0.16.orig/man/man8/tlsmgr.8 Mon Dec 1 14:25:29 2003
-+++ postfix-2.0.16/man/man8/tlsmgr.8 Mon Dec 1 14:27:05 2003
+diff -dur postfix-2.1.3.orig/man/man8/tlsmgr.8 postfix-2.1.3/man/man8/tlsmgr.8
+--- postfix-2.1.3.orig/man/man8/tlsmgr.8 2004-06-22 14:20:57.678597931 +0200
++++ postfix-2.1.3/man/man8/tlsmgr.8 2004-06-22 14:21:18.014419170 +0200
@@ -103,7 +103,7 @@
.IP \fBtls_random_exchange_name\fR
Name of the file written by tlsmgr and read by smtp and smtpd at
.IP \fBtls_random_reseed_period\fR
Time in seconds until the next reseed from external sources is due.
This is the maximum value. The actual point in time is calculated
+diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h
+--- postfix-2.1.3.orig/src/global/mail_params.h 2004-06-22 14:20:57.890585644 +0200
++++ postfix-2.1.3/src/global/mail_params.h 2004-06-22 14:21:17.963422126 +0200
+@@ -64,7 +64,7 @@
+ extern gid_t var_owner_gid;
+
+ #define VAR_SGID_GROUP "setgid_group"
+-#define DEF_SGID_GROUP "postdrop"
++#define DEF_SGID_GROUP "maildrop"
+ extern char *var_sgid_group;
+ extern gid_t var_sgid_gid;
+
+@@ -231,7 +231,7 @@
+ */
+ #define VAR_CONFIG_DIR "config_directory"
+ #ifndef DEF_CONFIG_DIR
+-#define DEF_CONFIG_DIR "/etc/postfix"
++#define DEF_CONFIG_DIR "/etc/mail"
+ #endif
+ extern char *var_config_dir;
+
+diff -dur postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_defs.h
+--- postfix-2.1.3.orig/src/util/sys_defs.h 2004-06-22 14:20:58.094573821 +0200
++++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 14:21:17.966421952 +0200
+@@ -550,7 +550,7 @@
+ #define HAS_FSYNC
+ #define HAS_DB
+ #define DEF_DB_TYPE "hash"
+-#define ALIAS_DB_MAP "hash:/etc/aliases"
++#define ALIAS_DB_MAP "hash:/etc/mail/aliases"
+ #define HAS_NIS
+ #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
+ #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
---- postfix-2.0.16.orig/conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100
-+++ postfix-2.0.16/conf/dynamicmaps.cf 2003-11-08 19:52:14.000000000 +0100
-@@ -0,0 +1,9 @@
-+# Postfix dynamic maps configuration file.
-+#
-+# The first match found is the one that is used. The only wildcard
-+# allowed is '*', which matches everything. The first %s is expanded
-+# to the map type.
-+#
-+#type location of .so file name of open function
-+#==== ================================ =====================
-+* /usr/lib/postfix/dict_%s.so dict_%s_open
---- postfix-2.0.16.orig/src/dns/Makefile.in 2003-09-14 02:03:59.000000000 +0200
-+++ postfix-2.0.16/src/dns/Makefile.in 2003-11-08 19:52:14.000000000 +0100
-@@ -15,7 +15,7 @@
+diff -durN postfix-2.1.3.orig/src/dns/Makefile.in postfix-2.1.3/src/dns/Makefile.in
+--- postfix-2.1.3.orig/src/dns/Makefile.in 2004-04-22 21:37:34.000000000 +0200
++++ postfix-2.1.3/src/dns/Makefile.in 2004-06-22 15:39:24.242860389 +0200
+@@ -12,7 +12,7 @@
LIB_DIR = ../../lib
INC_DIR = ../../include
all: $(LIB)
-@@ -27,12 +27,10 @@
+@@ -24,12 +24,10 @@
tests: test
$(LIB): $(OBJS)
update: $(LIB_DIR)/$(LIB) $(HDRS)
-for i in $(HDRS); \
---- postfix-2.0.16.orig/src/global/mail_conf.c 2002-01-14 17:24:35.000000000 +0100
-+++ postfix-2.0.16/src/global/mail_conf.c 2003-11-08 19:52:14.000000000 +0100
+diff -durN postfix-2.1.3.orig/src/global/Makefile.in postfix-2.1.3/src/global/Makefile.in
+--- postfix-2.1.3.orig/src/global/Makefile.in 2004-06-22 15:38:56.931476412 +0200
++++ postfix-2.1.3/src/global/Makefile.in 2004-06-22 15:39:56.167971280 +0200
+@@ -29,7 +29,7 @@
+ canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \
+ clnt_stream.o debug_peer.o debug_process.o defer.o \
+ deliver_completed.o deliver_flock.o deliver_pass.o deliver_request.o \
+- dict_ldap.o dict_mysql.o dict_pgsql.o dict_proxy.o domain_list.o \
++ dict_proxy.o domain_list.o \
+ dot_lockfile.o dot_lockfile_as.o ext_prop.o file_id.o flush_clnt.o \
+ header_opts.o header_token.o hold_message.o input_transp.o \
+ is_header.o log_adhoc.o mail_addr.o mail_addr_crunch.o \
+@@ -90,8 +90,11 @@
+ LIB_DIR = ../../lib
+ INC_DIR = ../../include
+ MAKES =
++LDAPSO = dict_ldap.so
++MYSQLSO = dict_mysql.so
++PGSQLSO = dict_pgsql.so
+
+-.c.o:; $(CC) $(CFLAGS) -c $*.c
++.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c
+
+ all: $(LIB)
+
+@@ -101,14 +104,30 @@
+ test: $(TESTPROG)
+
+ $(LIB): $(OBJS)
+- $(AR) $(ARFL) $(LIB) $?
+- $(RANLIB) $(LIB)
++ gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS)
++
++$(LDAPSO): dict_ldap.o
++ gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal
++
++$(MYSQLSO): dict_mysql.o
++ gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lmysqlclient -L../../lib -lutil -L. -lglobal
++
++$(PGSQLSO): dict_pgsql.o
++ gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lpq -L../../lib -lutil -L. -lglobal
+
+ $(LIB_DIR)/$(LIB): $(LIB)
+ cp $(LIB) $(LIB_DIR)
+- $(RANLIB) $(LIB_DIR)/$(LIB)
+
+-update: $(LIB_DIR)/$(LIB) $(HDRS)
++$(LIB_DIR)/$(LDAPSO): $(LDAPSO)
++ cp $(LDAPSO) $(LIB_DIR)
++
++$(LIB_DIR)/$(MYSQLSO): $(MYSQLSO)
++ cp $(MYSQLSO) $(LIB_DIR)
++
++$(LIB_DIR)/$(PGSQLSO): $(PGSQLSO)
++ cp $(PGSQLSO) $(LIB_DIR)
++
++update: $(LIB_DIR)/$(LIB) $(LIB_DIR)/${LDAPSO} $(LIB_DIR)/${MYSQLSO} $(LIB_DIR)/${PGSQLSO} $(HDRS)
+ -for i in $(HDRS); \
+ do \
+ cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
+@@ -360,7 +379,7 @@
+ lint $(DEFS) $(SRCS) $(LINTFIX)
+
+ clean:
+- rm -f *.o $(LIB) *core $(TESTPROG) junk
++ rm -f *.o $(LIB) $(LDAPSO) $(MYSQLSO) $(PGSQLSO) *core $(TESTPROG) junk
+ rm -rf printfck
+
+ tidy: clean
+@@ -575,6 +594,8 @@
+ dict_proxy.o: mail_params.h
+ dict_proxy.o: clnt_stream.h
+ dict_proxy.o: dict_proxy.h
++dict_ldap.o: dict_ldap.c
++dict_ldap.o: ../../include/sys_defs.h
+ domain_list.o: domain_list.c
+ domain_list.o: ../../include/sys_defs.h
+ domain_list.o: ../../include/match_list.h
+diff -durN postfix-2.1.3.orig/src/global/mail_conf.c postfix-2.1.3/src/global/mail_conf.c
+--- postfix-2.1.3.orig/src/global/mail_conf.c 2004-04-10 16:52:51.000000000 +0200
++++ postfix-2.1.3/src/global/mail_conf.c 2004-06-22 15:39:24.247860093 +0200
@@ -175,6 +175,13 @@
path = concatenate(var_config_dir, "/", "main.cf", (char *) 0);
dict_load_file(CONFIG_DICT, path);
}
/* mail_conf_eval - expand macros in string */
---- postfix-2.0.16.orig/src/global/mail_params.c 2003-11-08 19:49:41.000000000 +0100
-+++ postfix-2.0.16/src/global/mail_params.c 2003-11-08 19:52:14.000000000 +0100
-@@ -148,6 +148,8 @@
+diff -durN postfix-2.1.3.orig/src/global/mail_params.c postfix-2.1.3/src/global/mail_params.c
+--- postfix-2.1.3.orig/src/global/mail_params.c 2004-06-22 15:38:57.219459372 +0200
++++ postfix-2.1.3/src/global/mail_params.c 2004-06-22 15:39:24.248860034 +0200
+@@ -154,6 +154,8 @@
#ifdef HAS_DB
#include <dict_db.h>
#endif
/* Global library. */
-@@ -257,6 +259,7 @@
+@@ -270,6 +272,7 @@
char *var_debug_peer_list;
int var_debug_peer_level;
char *var_reject_reply_msg_access_denied;
int var_fault_inj_code;
char *var_bounce_service;
char *var_cleanup_service;
-@@ -439,6 +442,38 @@
+@@ -456,6 +459,38 @@
(long) var_sgid_gid);
}
/* mail_params_init - configure built-in parameters */
void mail_params_init()
-@@ -601,6 +636,9 @@
+@@ -632,6 +667,9 @@
* Variables that are needed by almost every program.
*/
get_mail_conf_str_table(other_str_defaults);
get_mail_conf_int_table(other_int_defaults);
get_mail_conf_bool_table(bool_defaults);
get_mail_conf_time_table(time_defaults);
---- postfix-2.0.16.orig/src/global/Makefile.in 2003-11-08 19:49:41.000000000 +0100
-+++ postfix-2.0.16/src/global/Makefile.in 2003-11-08 19:52:14.000000000 +0100
-@@ -83,8 +83,9 @@
+diff -durN postfix-2.1.3.orig/src/master/Makefile.in postfix-2.1.3/src/master/Makefile.in
+--- postfix-2.1.3.orig/src/master/Makefile.in 2004-04-22 21:37:35.000000000 +0200
++++ postfix-2.1.3/src/master/Makefile.in 2004-06-22 15:39:24.249859975 +0200
+@@ -20,7 +20,7 @@
+ INC_DIR = ../../include
+ BIN_DIR = ../../libexec
+
+-.c.o:; $(CC) $(CFLAGS) -c $*.c
++.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c
+
+ all: $(PROG) $(LIB)
+
+@@ -35,12 +35,10 @@
+ tests: test
+
+ $(LIB): $(LIB_OBJ)
+- $(AR) $(ARFL) $(LIB) $?
+- $(RANLIB) $(LIB)
++ gcc -shared -Wl,-soname,libpostfix-master.so.1 -o $(LIB) $(LIB_OBJ)
+
+ $(LIB_DIR)/$(LIB): $(LIB)
+ cp $(LIB) $(LIB_DIR)/$(LIB)
+- $(RANLIB) $(LIB_DIR)/$(LIB)
+
+ $(BIN_DIR)/$(PROG): $(PROG)
+ cp $(PROG) $(BIN_DIR)
+diff -durN postfix-2.1.3.orig/src/util/Makefile.in postfix-2.1.3/src/util/Makefile.in
+--- postfix-2.1.3.orig/src/util/Makefile.in 2004-06-22 15:38:57.066468424 +0200
++++ postfix-2.1.3/src/util/Makefile.in 2004-06-22 15:39:24.250859915 +0200
+@@ -30,13 +30,14 @@
+ attr_print_plain.c sane_connect.c neuter.c name_code.c \
+ uppercase.c \
+ get_port.c \
+- dict_sdbm.c sdbm.c
++ dict_sdbm.c sdbm.c \
++ load_lib.c
+ OBJS = alldig.o argv.o argv_split.o attr_print0.o attr_print64.o \
+ attr_scan0.o attr_scan64.o base64_code.o basename.o binhash.o \
+ chroot_uid.o clean_env.o close_on_exec.o concatenate.o ctable.o \
+ dict.o dict_alloc.o dict_db.o dict_dbm.o dict_debug.o dict_env.o \
+ dict_cidr.o dict_ht.o dict_ni.o dict_nis.o \
+- dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o \
++ dict_nisplus.o dict_open.o dict_regexp.o \
+ dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o \
+ duplex_pipe.o environ.o events.o exec_command.o fifo_listen.o \
+ fifo_trigger.o file_limit.o find_inet.o fsspace.o fullname.o \
+@@ -62,7 +63,8 @@
+ attr_print_plain.o sane_connect.o $(STRCASE) neuter.o name_code.o \
+ uppercase.o \
+ get_port.o \
+- dict_sdbm.o sdbm.o
++ dict_sdbm.o sdbm.o \
++ load_lib.o
+ HDRS = argv.h attr.h base64_code.h binhash.h chroot_uid.h clean_env.h \
+ connect.h ctable.h dict.h dict_db.h dict_dbm.h dict_env.h \
+ dict_cidr.h dict_ht.h dict_ni.h dict_nis.h \
+@@ -83,13 +85,15 @@
+ vbuf_print.h vstream.h vstring.h vstring_vstream.h watchdog.h \
+ auto_clnt.h attr_clnt.h sane_connect.h name_code.h \
+ get_port.h \
+- dict_sdbm.h sdbm.h
++ dict_sdbm.h sdbm.h \
++ load_lib.h
+ TESTSRC = fifo_open.c fifo_rdwr_bug.c fifo_rdonly_bug.c select_bug.c \
+ stream_test.c dup2_pass_on_exec.c
+ DEFS = -I. -D$(SYSTYPE)
+ CFLAGS = $(DEBUG) $(OPT) $(DEFS)
+ FILES = Makefile $(SRCS) $(HDRS)
+ INCL =
++PCRESO = dict_pcre.so
+ LIB = libutil.a
+ TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \
+ fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \
+@@ -102,8 +106,9 @@
+
LIB_DIR = ../../lib
INC_DIR = ../../include
- MAKES =
-+LDAPSO = dict_ldap.so
++LIBS = $(LIB_DIR)/$(LIB) $(LIB_DIR)/$(PCRESO)
-.c.o:; $(CC) $(CFLAGS) -c $*.c
+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c
all: $(LIB)
-@@ -94,14 +95,21 @@
+@@ -112,15 +117,19 @@
+
test: $(TESTPROG)
++$(PCRESO): dict_pcre.o
++ gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil
++
$(LIB): $(OBJS)
- $(AR) $(ARFL) $(LIB) $?
- $(RANLIB) $(LIB)
-+ gcc -shared -Wl,-soname,libpostfix-global.so.1 -o $(LIB) $(OBJS)
-+
-+$(LDAPSO): dict_ldap.o
-+ gcc -shared -Wl,-soname,dict_ldap.so -o $@ $? -lldap -llber -L../../lib -lutil -L. -lglobal
-+
-+dict_ldap.c: ../util/dict_ldap.c
-+ ln -f $? $@
++ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl
$(LIB_DIR)/$(LIB): $(LIB)
cp $(LIB) $(LIB_DIR)
- $(RANLIB) $(LIB_DIR)/$(LIB)
-update: $(LIB_DIR)/$(LIB) $(HDRS)
-+$(LIB_DIR)/$(LDAPSO): $(LDAPSO)
-+ cp $(LDAPSO) $(LIB_DIR)
++$(LIB_DIR)/$(PCRESO): $(PCRESO)
++ cp $(PCRESO) $(LIB_DIR)
+
-+update: $(LIB_DIR)/$(LIB) $(LIB_DIR)/${LDAPSO} $(HDRS)
++update: $(LIBS) $(HDRS)
-for i in $(HDRS); \
do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
-@@ -333,7 +341,7 @@
- lint $(DEFS) $(SRCS) $(LINTFIX)
+@@ -142,7 +151,8 @@
+ lint $(SRCS)
clean:
-- rm -f *.o $(LIB) *core $(TESTPROG) junk
-+ rm -f *.o $(LIB) $(LDAPSO) dict_ldap.c *core $(TESTPROG) junk
+- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp
++ rm -f *.o $(LIB) $(PCRESO) *core $(TESTPROG) \
++ junk $(MAKES) *.tmp
rm -rf printfck
tidy: clean
-@@ -508,6 +516,8 @@
- dict_proxy.o: mail_params.h
- dict_proxy.o: clnt_stream.h
- dict_proxy.o: dict_proxy.h
-+dict_ldap.o: dict_ldap.c
-+dict_ldap.o: ../../include/sys_defs.h
- domain_list.o: domain_list.c
- domain_list.o: ../../include/sys_defs.h
- domain_list.o: ../../include/match_list.h
---- postfix-2.0.16.orig/src/master/Makefile.in 2003-09-14 02:04:02.000000000 +0200
-+++ postfix-2.0.16/src/master/Makefile.in 2003-11-08 19:52:14.000000000 +0100
-@@ -23,7 +23,7 @@
- INC_DIR = ../../include
- BIN_DIR = ../../libexec
-
--.c.o:; $(CC) $(CFLAGS) -c $*.c
-+.c.o:; $(CC) `for i in $(LIB_OBJ); do [ $$i = $@ ] && echo -fPIC; done` $(CFLAGS) -c $*.c
-
- all: $(PROG) $(LIB)
-
-@@ -38,12 +38,10 @@
- tests: test
-
- $(LIB): $(LIB_OBJ)
-- $(AR) $(ARFL) $(LIB) $?
-- $(RANLIB) $(LIB)
-+ gcc -shared -Wl,-soname,libpostfix-master.so.1 -o $(LIB) $(LIB_OBJ)
-
- $(LIB_DIR)/$(LIB): $(LIB)
- cp $(LIB) $(LIB_DIR)/$(LIB)
-- $(RANLIB) $(LIB_DIR)/$(LIB)
-
- $(BIN_DIR)/$(PROG): $(PROG)
- cp $(PROG) $(BIN_DIR)
---- postfix-2.0.16.orig/src/util/dict.h 2003-01-05 02:03:28.000000000 +0100
-+++ postfix-2.0.16/src/util/dict.h 2003-11-08 19:52:14.000000000 +0100
-@@ -80,6 +80,20 @@
+diff -durN postfix-2.1.3.orig/src/util/dict.h postfix-2.1.3/src/util/dict.h
+--- postfix-2.1.3.orig/src/util/dict.h 2003-07-03 17:04:13.000000000 +0200
++++ postfix-2.1.3/src/util/dict.h 2004-06-22 15:39:24.253859738 +0200
+@@ -82,6 +82,20 @@
*/
extern ARGV *dict_mapnames(void);
/*
* High-level interface, with logical dictionary names.
*/
---- postfix-2.0.16.orig/src/util/dict_open.c 2003-11-08 19:49:41.000000000 +0100
-+++ postfix-2.0.16/src/util/dict_open.c 2003-11-08 19:52:14.000000000 +0100
+diff -durN postfix-2.1.3.orig/src/util/dict_open.c postfix-2.1.3/src/util/dict_open.c
+--- postfix-2.1.3.orig/src/util/dict_open.c 2004-06-22 15:38:57.069468247 +0200
++++ postfix-2.1.3/src/util/dict_open.c 2004-06-22 15:39:24.254859679 +0200
@@ -158,6 +158,9 @@
#include <strings.h>
#endif
#ifdef TEST
/*
---- postfix-2.0.16.orig/src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100
-+++ postfix-2.0.16/src/util/load_lib.c 2003-11-08 19:52:14.000000000 +0100
+diff -durN postfix-2.1.3.orig/src/util/load_lib.c postfix-2.1.3/src/util/load_lib.c
+--- postfix-2.1.3.orig/src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100
++++ postfix-2.1.3/src/util/load_lib.c 2004-06-22 15:39:24.257859501 +0200
@@ -0,0 +1,135 @@
+/*++
+/* NAME
+#endif
+ return 0;
+}
---- postfix-2.0.16.orig/src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100
-+++ postfix-2.0.16/src/util/load_lib.h 2003-11-08 19:52:14.000000000 +0100
+diff -durN postfix-2.1.3.orig/src/util/load_lib.h postfix-2.1.3/src/util/load_lib.h
+--- postfix-2.1.3.orig/src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100
++++ postfix-2.1.3/src/util/load_lib.h 2004-06-22 15:39:24.257859501 +0200
@@ -0,0 +1,41 @@
+#ifndef _LOAD_LIB_H_INCLUDED_
+#define _LOAD_LIB_H_INCLUDED_
+/*--*/
+
+#endif
---- postfix-2.0.16.orig/src/util/Makefile.in 2003-11-08 19:49:41.000000000 +0100
-+++ postfix-2.0.16/src/util/Makefile.in 2003-11-08 19:55:55.000000000 +0100
-@@ -3,7 +3,7 @@
- attr_scan0.c attr_scan64.c base64_code.c basename.c binhash.c \
- chroot_uid.c clean_env.c close_on_exec.c concatenate.c ctable.c \
- dict.c dict_alloc.c dict_db.c dict_dbm.c dict_debug.c dict_env.c \
-- dict_ht.c dict_ldap.c dict_mysql.c dict_ni.c dict_nis.c \
-+ dict_ht.c dict_mysql.c dict_ni.c dict_nis.c \
- dict_nisplus.c dict_open.c dict_pcre.c dict_regexp.c dict_static.c \
- dict_tcp.c dict_unix.c dir_forest.c doze.c duplex_pipe.c \
- environ.c events.c exec_command.c fifo_listen.c fifo_trigger.c \
-@@ -27,13 +27,13 @@
- valid_hostname.c vbuf.c vbuf_print.c vstream.c vstream_popen.c \
- vstring.c vstring_vstream.c watchdog.c writable.c write_buf.c \
- write_wait.c strcasecmp.c nvtable.c host_port.c sane_connect.c \
-- dict_sdbm.c sdbm.c
-+ dict_sdbm.c sdbm.c load_lib.c
- OBJS = alldig.o argv.o argv_split.o attr_print0.o attr_print64.o \
- attr_scan0.o attr_scan64.o base64_code.o basename.o binhash.o \
- chroot_uid.o clean_env.o close_on_exec.o concatenate.o ctable.o \
- dict.o dict_alloc.o dict_db.o dict_dbm.o dict_debug.o dict_env.o \
-- dict_ht.o dict_ldap.o dict_mysql.o dict_ni.o dict_nis.o \
-- dict_nisplus.o dict_open.o dict_pcre.o dict_regexp.o dict_static.o \
-+ dict_ht.o dict_ni.o dict_nis.o \
-+ dict_nisplus.o dict_open.o dict_regexp.o dict_static.o \
- dict_tcp.o dict_unix.o dir_forest.o doze.o duplex_pipe.o \
- environ.o events.o exec_command.o fifo_listen.o fifo_trigger.o \
- file_limit.o find_inet.o fsspace.o fullname.o get_domainname.o \
-@@ -56,7 +56,7 @@
- valid_hostname.o vbuf.o vbuf_print.o vstream.o vstream_popen.o \
- vstring.o vstring_vstream.o watchdog.o writable.o write_buf.o \
- write_wait.o nvtable.o host_port.o sane_connect.o $(STRCASE) \
-- dict_sdbm.o sdbm.o
-+ dict_sdbm.o sdbm.o load_lib.o
- HDRS = argv.h attr.h base64_code.h binhash.h chroot_uid.h clean_env.h \
- connect.h ctable.h dict.h dict_db.h dict_dbm.h dict_env.h \
- dict_ht.h dict_ldap.h dict_mysql.h dict_ni.h dict_nis.h \
-@@ -75,7 +75,7 @@
- timed_wait.h trigger.h username.h valid_hostname.h vbuf.h \
- vbuf_print.h vstream.h vstring.h vstring_vstream.h watchdog.h \
- nvtable.h host_port.h sane_connect.h \
-- dict_sdbm.h sdbm.h
-+ dict_sdbm.h sdbm.h load_lib.h
- TESTSRC = fifo_open.c fifo_rdwr_bug.c fifo_rdonly_bug.c select_bug.c \
- stream_test.c dup2_pass_on_exec.c
- WARN = -W -Wformat -Wimplicit -Wmissing-prototypes \
-@@ -84,6 +84,8 @@
- CFLAGS = $(DEBUG) $(OPT) $(DEFS)
- FILES = Makefile $(SRCS) $(HDRS)
- INCL =
-+PCRESO = dict_pcre.so
-+MYSQLSO = dict_mysql.so
- LIB = libutil.a
- TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \
- fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \
-@@ -96,8 +98,9 @@
-
- LIB_DIR = ../../lib
- INC_DIR = ../../include
-+LIBS = $(LIB_DIR)/$(LIB) $(LIB_DIR)/$(PCRESO) $(LIB_DIR)/$(MYSQLSO)
-
--.c.o:; $(CC) $(CFLAGS) -c $*.c
-+.c.o:; $(CC) -fPIC $(CFLAGS) -c $*.c
-
- all: $(LIB)
-
-@@ -106,15 +109,25 @@
-
- test: $(TESTPROG)
-
-+$(PCRESO): dict_pcre.o
-+ gcc -shared -Wl,-soname,dict_pcre.so -o $@ $? -lpcre -L. -lutil
-+
-+$(MYSQLSO): dict_mysql.o
-+ gcc -shared -Wl,-soname,dict_mysql.so -o $@ $? -lmysqlclient -L. -lutil
-+
- $(LIB): $(OBJS)
-- $(AR) $(ARFL) $(LIB) $?
-- $(RANLIB) $(LIB)
-+ gcc -shared -Wl,-soname,libpostfix-util.so.1 -o $(LIB) $(OBJS) -ldl
-
- $(LIB_DIR)/$(LIB): $(LIB)
- cp $(LIB) $(LIB_DIR)
-- $(RANLIB) $(LIB_DIR)/$(LIB)
-
--update: $(LIB_DIR)/$(LIB) $(HDRS)
-+$(LIB_DIR)/$(PCRESO): $(PCRESO)
-+ cp $(PCRESO) $(LIB_DIR)
-+
-+$(LIB_DIR)/$(MYSQLSO): $(MYSQLSO)
-+ cp $(MYSQLSO) $(LIB_DIR)
-+
-+update: $(LIBS) $(HDRS)
- -for i in $(HDRS); \
- do \
- cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
-@@ -136,7 +149,8 @@
- lint $(SRCS)
-
- clean:
-- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp
-+ rm -f *.o $(LIB) $(PCRESO) $(MYSQLSO) *core $(TESTPROG) \
-+ junk $(MAKES) *.tmp
- rm -rf printfck
-
- tidy: clean
---- postfix-2.0.16.orig/src/util/sys_defs.h 2003-11-08 19:49:41.000000000 +0100
-+++ postfix-2.0.16/src/util/sys_defs.h 2003-11-08 19:52:14.000000000 +0100
-@@ -501,6 +501,7 @@
+diff -durN postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_defs.h
+--- postfix-2.1.3.orig/src/util/sys_defs.h 2004-06-22 15:38:57.190461088 +0200
++++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 15:39:24.255859620 +0200
+@@ -560,6 +560,7 @@
#define UNIX_DOMAIN_CONNECT_BLOCKS_FOR_ACCEPT
#define PREPEND_PLUS_TO_OPTSTRING
#define HAS_POSIX_REGEXP
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
-@@ -529,6 +530,7 @@
+@@ -596,6 +597,7 @@
#define UNIX_DOMAIN_CONNECT_BLOCKS_FOR_ACCEPT /* unverified */
#define PREPEND_PLUS_TO_OPTSTRING
#define HAS_POSIX_REGEXP
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
-@@ -567,6 +569,7 @@
+@@ -638,6 +640,7 @@
#define USE_STATFS
#define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
-@@ -602,6 +605,7 @@
+@@ -673,6 +676,7 @@
#define USE_STATFS
#define STATFS_IN_SYS_VFS_H
#define HAS_POSIX_REGEXP
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
+diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mail_dict.c
+--- postfix-2.1.3.orig/src/global/mail_dict.c 2004-01-04 19:53:27.000000000 +0100
++++ postfix-2.1.3/src/global/mail_dict.c 2004-06-22 15:47:45.259202712 +0200
+@@ -45,15 +45,6 @@
+
+ static DICT_OPEN_INFO dict_open_info[] = {
+ DICT_TYPE_PROXY, dict_proxy_open,
+-#ifdef HAS_LDAP
+- DICT_TYPE_LDAP, dict_ldap_open,
+-#endif
+-#ifdef HAS_MYSQL
+- DICT_TYPE_MYSQL, dict_mysql_open,
+-#endif
+-#ifdef HAS_PGSQL
+- DICT_TYPE_PGSQL, dict_pgsql_open,
+-#endif
+ 0,
+ };
+
+
+--- postfix-2.0.16.orig/conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100
++++ postfix-2.0.16/conf/dynamicmaps.cf 2003-11-08 19:52:14.000000000 +0100
+@@ -0,0 +1,9 @@
++# Postfix dynamic maps configuration file.
++#
++# The first match found is the one that is used. The only wildcard
++# allowed is '*', which matches everything. The first %s is expanded
++# to the map type.
++#
++#type location of .so file name of open function
++#==== ================================ =====================
++* /usr/lib/postfix/dict_%s.so dict_%s_open
projects / packages / postfix.git / commitdiff