--- postfix-2.1.0/README_FILES/MYSQL_README.mdkconfig 2004-04-19 01:51:14.000000000 +0200
+++ postfix-2.1.0/README_FILES/MYSQL_README 2004-04-28 10:14:37.462614724 +0200
@@ -17,9 +17,9 @@
BBuuiillddiinngg PPoossttffiixx wwiitthh MMyySSQQLL ssuuppppoorrtt
-Note: to use mysql with Debian GNU/Linux's Postfix, all you need is to install
-the postfix-mysql package and you're done. There is no need to recompile
-Postfix.
+Note: to use mysql with Mandriva Linux or Debian GNU/Linux's Postfix, all you
+need is to install the postfix-mysql package and you're done. There is no need
+to recompile Postfix.
The Postfix MySQL client utilizes the mysql client library, which can be
obtained from:
--- postfix-2.1.0/README_FILES/LDAP_README.mdkconfig 2004-04-16 15:17:24.000000000 +0200
+++ postfix-2.1.0/README_FILES/LDAP_README 2004-04-28 10:14:37.405646534 +0200
@@ -27,9 +27,9 @@
Note 1: Postfix no longer supports the LDAP version 1 interface.
-Note 2: to use LDAP with Debian GNU/Linux's Postfix, all you need is to install
-the postfix-ldap package and you're done. There is no need to recompile
-Postfix.
+Note 2: to use LDAP with Mandriva Linux or Debian GNU/Linux's Postfix, all you
+need is to install the postfix-ldap package and you're done. There is no need
+to recompile Postfix.
You need to have LDAP libraries and include files installed somewhere on your
system, and you need to configure the Postfix Makefiles accordingly.
--- postfix-2.1.0/README_FILES/INSTALL.mdkconfig 2004-04-16 15:17:24.000000000 +0200
+++ postfix-2.1.0/README_FILES/INSTALL 2004-04-28 10:14:37.322692853 +0200
@@ -89,6 +89,8 @@
Linux Slackware 3.x, 4.x, 7.x
Linux SuSE 5.x, 6.x, 7.x
Mac OS X
+ Mandrakelinux 7.x - 10.x
+ Mandriva Linux 2005 - 2007
NEXTSTEP 3.x
NetBSD 1.x
OPENSTEP 4.x
--- postfix-2.1.0/README_FILES/PCRE_README.mdkconfig 2004-04-19 01:51:14.000000000 +0200
+++ postfix-2.1.0/README_FILES/PCRE_README 2004-04-28 10:14:37.511587380 +0200
@@ -16,9 +16,9 @@
BBuuiillddiinngg PPoossttffiixx wwiitthh PPCCRREE ssuuppppoorrtt
-Note: to use pcre with Debian GNU/Linux's Postfix, all you need is to install
-the postfix-pcre package and you're done. There is no need to recompile
-Postfix.
+Note: to use pcre with Mandriva Linux or Debian GNU/Linux's Postfix, all you
+need is to install the postfix-pcre package and you're done. There is no need
+to recompile Postfix.
In some future, Postfix will have a plug-in interface for adding map types.
Until then, you need to compile PCRE support into Postfix.
--- postfix-2.1.0/README_FILES/PGSQL_README.mdkconfig 2004-04-11 23:05:33.000000000 +0200
+++ postfix-2.1.0/README_FILES/PGSQL_README 2004-04-28 10:14:37.565557244 +0200
@@ -17,9 +17,9 @@
BBuuiillddiinngg PPoossttffiixx wwiitthh PPoossttggrreeSSQQLL ssuuppppoorrtt
-Note: to use pgsql with Debian GNU/Linux's Postfix, all you need to do is to
-install the postfix-pgsql package and you're done. There is no need to
-recompile Postfix.
+Note: to use pgsql with Mandriva Linux or Debian GNU/Linux's Postfix, all you
+need to do is to install the postfix-pgsql package and you're done. There is no
+need to recompile Postfix.
In order to build Postfix with pgsql map support, you specify -DHAS_PGSQL, the
directory with the PostgreSQL header files, and the location of the libpq
--- postfix-2.2.4/conf/master.cf.mdkconfig 2005-01-24 17:12:46.000000000 -0200
+++ postfix-2.2.4/conf/master.cf 2005-06-30 17:17:58.000000000 -0300
@@ -2,6 +2,9 @@
# Postfix master process configuration file. For details on the format
# of the file, see the Postfix master(5) manual page.
#
+# The script postfix-chroot.sh can be used to set up a Postfix chroot
+# environment on your Mandrivalinux System.
+#
# ==========================================================================
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
@@ -17,6 +20,8 @@
# -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
#628 inet n - n - - qmqpd
pickup fifo n - n 60 1 pickup
+ -o content_filter=
+ -o receive_override_options=
cleanup unix n - n - 0 cleanup
qmgr fifo n - n 300 1 qmgr
#qmgr fifo n - n 300 1 oqmgr
@@ -55,16 +60,31 @@
# Also specify in main.cf: maildrop_destination_recipient_limit=1
#
maildrop unix - n n - - pipe
- flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
+ flags=DRhu user=nobody argv=/usr/bin/maildrop -d ${recipient}
+#
+# Cyrus. Please See the Postfix CYRUS_README file for details
#
-# The Cyrus deliver program has changed incompatibly, multiple times.
+# deliver interface (deprecated), to use this also use
+# postconf -e cyrus-deliver_destination_recipient_limit=1
+cyrus-deliver unix - n n - - pipe
+ user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
+#
+# for default cyrus socket placement
+cyrus unix - n n - - lmtp
+ -o lmtp_cache_connection=yes
+#
+# if you configure cyrus socket in the chroot jail
+cyrus-chroot unix - - y - - lmtp
+ -o lmtp_cache_connection=yes
+#
+# for lmtp to cyrus via tcp
+cyrus-inet unix - - n - - lmtp
+ -o lmtp_cache_connection=yes
+ -o lmtp_sasl_auth_enable=yes
+ -o lmtp_sasl_password_maps=hash:/etc/postfix/cyrus_lmtp_sasl_pass
+ -o lmtp_sasl_security_options=noanonymous
#
-old-cyrus unix - n n - - pipe
- flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
-# Cyrus 2.1.5 (Amos Gouaux)
-# Also specify in main.cf: cyrus_destination_recipient_limit=1
-cyrus unix - n n - - pipe
- user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
+# UUCP. Unix to Unix CoPy
#
# See the Postfix UUCP_README file for configuration details.
#
@@ -72,8 +92,54 @@
flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
#
# Other external delivery methods.
+# These are not distributed with Mandrivalinux
#
-ifmail unix - n n - - pipe
- flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
-bsmtp unix - n n - - pipe
- flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
+#ifmail unix - n n - - pipe
+# flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
+#bsmtp unix - n n - - pipe
+# flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
+
+##### START OF CONTENT FILTER CUSTOMIZATIONS #####
+# Please see the Postfix FILTER_README for details.
+# These sample entries expect your content filter to
+# listen on port 10025 and to inject mail back into
+# postfix on port 10026.
+#
+# to enable such content filter run the command
+# postconf -e content_filter=smtp-filter:127.0.0.1:10025
+# postconf -e smtp-filter_destination_concurrency_limit=2
+# or
+# postconf -e content_filter=lmtp-filter:127.0.0.1:10025
+# postconf -e lmtp-filter_destination_concurrency_limit=2
+# and the command
+# postconf -e receive_override_options=no_address_mappings
+#
+
+127.0.0.1:10026 inet n - n - - smtpd
+ -o content_filter=
+ -o smtpd_restriction_classes=
+ -o smtpd_client_restrictions=permit_mynetworks,reject
+ -o smtpd_helo_restrictions=
+ -o smtpd_sender_restrictions=
+ -o smtpd_delay_reject=no
+ -o smtpd_recipient_restrictions=permit_mynetworks,reject
+ -o mynetworks=127.0.0.0/8
+ -o smtpd_authorized_xforward_hosts=127.0.0.0/8
+ -o strict_rfc821_envelopes=yes
+ -o smtpd_error_sleep_time=0
+ -o smtpd_soft_error_limit=1001
+ -o smtpd_hard_error_limit=1000
+ -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks
+
+lmtp-filter unix - - n - - lmtp
+ -o lmtp_data_done_timeout=1200
+ -o lmtp_send_xforward_command=yes
+ -o lmtp_cache_connection=no
+ -o max_use=20
+
+smtp-filter unix - - n - - smtp
+ -o smtp_data_done_timeout=1200
+ -o smtp_send_xforward_command=yes
+ -o max_use=20
+
+##### END OF CONTENT FILTER CUSTOMIZATIONS #####
--- postfix-2.2.4/conf/postfix-files.mdkconfig 2005-06-30 17:05:44.000000000 -0300
+++ postfix-2.2.4/conf/postfix-files 2005-06-30 17:21:08.000000000 -0300
@@ -110,8 +110,6 @@
$sendmail_path:f:root:-:755
$newaliases_path:l:$sendmail_path
$mailq_path:l:$sendmail_path
-$config_directory/LICENSE:f:root:-:644
-$config_directory/TLS_LICENSE:f:root:-:644
$config_directory/access:f:root:-:644:p
$config_directory/aliases:f:root:-:644:p
$config_directory/canonical:f:root:-:644:p
@@ -122,6 +122,7 @@
$config_directory/header_checks:f:root:-:644:p
$config_directory/install.cf:f:root:-:644:o
$config_directory/main.cf.default:f:root:-:644
+$config_directory/main.cf.dist:f:root:-:644
$config_directory/main.cf:f:root:-:644:p
$config_directory/makedefs.out:f:root:-:644
$config_directory/master.cf:f:root:-:644:p
@@ -213,6 +212,7 @@
$sample_directory/sample-pcre-access.cf:f:root:-:644:o:o
$sample_directory/sample-pcre-body.cf:f:root:-:644:o:o
$sample_directory/sample-pcre-header.cf:f:root:-:644:o:o
+$sample_directory/sample-pgsql.cf:f:root:-:644:o
$sample_directory/sample-pgsql-aliases.cf:f:root:-:644:o
$sample_directory/sample-qmqpd.cf:f:root:-:644:o
$sample_directory/sample-rate.cf:f:root:-:644:o
@@ -261,7 +261,6 @@
$readme_directory/PGSQL_README:f:root:-:644
$readme_directory/QMQP_README:f:root:-:644
$readme_directory/QSHAPE_README:f:root:-:644
-$readme_directory/RELEASE_NOTES:f:root:-:644
$readme_directory/RESTRICTION_CLASS_README:f:root:-:644
$readme_directory/SASL_README:f:root:-:644
$readme_directory/SCHEDULER_README:f:root:-:644
--- postfix-2.1.0/src/global/mail_params.h.mdkconfig 2004-04-25 14:01:21.508076252 +0200
+++ postfix-2.1.0/src/global/mail_params.h 2004-04-25 14:01:21.754938411 +0200
@@ -373,11 +373,7 @@
* Local delivery: alias databases.
*/
#define VAR_ALIAS_MAPS "alias_maps"
-#ifdef HAS_NIS
-#define DEF_ALIAS_MAPS ALIAS_DB_MAP ", nis:mail.aliases"
-#else
#define DEF_ALIAS_MAPS ALIAS_DB_MAP
-#endif
extern char *var_alias_maps;
/*
--- postfix-2.2.4/HISTORY.mdkconfig 2005-06-21 20:24:29.000000000 -0300
+++ postfix-2.2.4/HISTORY 2005-06-30 17:24:27.000000000 -0300
@@ -6945,7 +6945,7 @@
This involved a further rewrite of the regexp map code.
File: util/dict_regexp.c.
-200209010
+20020910
Bugfix: the SMTP client produced suprious warnings about
trouble with fallback_relay hosts. File: smtp/smtp_connect.c.
@@ -6953,7 +6953,7 @@
Robustness: don't wait with detecting broken SMTP connections
until reading input. Leandro Santi. File: smtpd/smtpd_chat.c.
-200209011
+20020911
Workaround: IRIX 6 can't do ioctl FIONREAD on pipes. This
breaks the in_flow_delay feature. File: util/sys_defs.h.
--- postfix-2.1.0/proto/INSTALL.html.mdkconfig 2004-04-16 15:11:21.000000000 +0200
+++ postfix-2.1.0/proto/INSTALL.html 2004-04-25 18:29:49.954599792 +0200
@@ -150,6 +150,8 @@
Linux Slackware 3.x, 4.x, 7.x <br>
Linux SuSE 5.x, 6.x, 7.x <br>
Mac OS X <br>
+Mandrakelinux 7.x - 10.x <br>
+Mandriva Linux 2005 - 2007
NEXTSTEP 3.x <br>
NetBSD 1.x <br>
OPENSTEP 4.x <br>
--- postfix-2.1.0/proto/PGSQL_README.html.mdkconfig 2004-04-07 19:31:55.000000000 +0200
+++ postfix-2.1.0/proto/PGSQL_README.html 2004-04-25 18:31:17.454742320 +0200
@@ -33,9 +33,9 @@
<h2>Building Postfix with PostgreSQL support</h2>
-<p> Note: to use pgsql with Debian GNU/Linux's Postfix, all you
-need to do is to install the postfix-pgsql package and you're done.
-There is no need to recompile Postfix. </p>
+<p> Note: to use pgsql with Mandriva Linux or Debian GNU/Linux's
+Postfix, all you need to do is to install the postfix-pgsql package
+and you're done. There is no need to recompile Postfix. </p>
<p> In order to build Postfix with pgsql map support, you specify
-DHAS_PGSQL, the directory with the PostgreSQL header files, and
--- postfix-2.1.0/proto/LDAP_README.html.mdkconfig 2004-04-16 15:13:57.000000000 +0200
+++ postfix-2.1.0/proto/LDAP_README.html 2004-04-25 18:29:54.832875908 +0200
@@ -56,9 +56,9 @@
<p> Note 1: Postfix no longer supports the LDAP version 1 interface.
</p>
-<p> Note 2: to use LDAP with Debian GNU/Linux's Postfix, all you
-need is to install the postfix-ldap package and you're done. There
-is no need to recompile Postfix. </p>
+<p> Note 2: to use LDAP with Mandriva Linux or Debian GNU/Linux's
+Postfix, all you need is to install the postfix-ldap package and
+you're done. There is no need to recompile Postfix. </p>
<p> You need to have LDAP libraries and include files installed
somewhere on your system, and you need to configure the Postfix
--- postfix-2.1.0/proto/PCRE_README.html.mdkconfig 2004-04-19 00:48:28.000000000 +0200
+++ postfix-2.1.0/proto/PCRE_README.html 2004-04-25 18:30:42.128467459 +0200
@@ -32,9 +32,9 @@
<h2>Building Postfix with PCRE support</h2>
-<p> Note: to use pcre with Debian GNU/Linux's Postfix, all you
-need is to install the postfix-pcre package and you're done. There
-is no need to recompile Postfix. </p>
+<p> Note: to use pcre with Mandriva Linux or Debian GNU/Linux's
+Postfix, all you need is to install the postfix-pcre package and
+you're done. There is no need to recompile Postfix. </p>
<p> In some future, Postfix will have a plug-in interface for adding
map types. Until then, you need to compile PCRE support into Postfix.
--- postfix-2.1.0/proto/MYSQL_README.html.mdkconfig 2004-04-19 00:46:59.000000000 +0200
+++ postfix-2.1.0/proto/MYSQL_README.html 2004-04-25 18:30:25.517742393 +0200
@@ -33,9 +33,9 @@
<h2>Building Postfix with MySQL support</h2>
-<p> Note: to use mysql with Debian GNU/Linux's Postfix, all you
-need is to install the postfix-mysql package and you're done.
-There is no need to recompile Postfix. </p>
+<p> Note: to use mysql with Mandriva Linux or Debian GNU/Linux's
+Postfix, all you need is to install the postfix-mysql package and
+you're done. There is no need to recompile Postfix. </p>
<p> The Postfix MySQL client utilizes the mysql client library,
which can be obtained from: </p>
--- postfix-2.3.2/src/util/sys_defs.h.orig 2006-07-03 09:37:32.000000000 -0300
+++ postfix-2.3.2/src/util/sys_defs.h 2006-08-04 15:37:13.000000000 -0300
@@ -51,7 +51,7 @@
#define ALIAS_DB_MAP "hash:/etc/mail/aliases" /* OpenBSD 2.7 */
#endif
#ifndef ALIAS_DB_MAP
-#define ALIAS_DB_MAP "hash:/etc/aliases"
+#define ALIAS_DB_MAP "hash:/etc/postfix/aliases"
#endif
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
@@ -657,7 +657,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/postfix/aliases"
#define HAS_NIS
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
@@ -671,7 +671,7 @@
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
#define NATIVE_COMMAND_DIR "/usr/sbin"
-#define NATIVE_DAEMON_DIR "/usr/libexec/postfix"
+#define NATIVE_DAEMON_DIR "/usr/lib/postfix"
#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
#define SOCKADDR_SIZE socklen_t
#define SOCKOPT_SIZE socklen_t
@@ -705,7 +705,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/postfix/aliases"
#define HAS_NIS
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
@@ -761,7 +761,7 @@
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
#define NATIVE_COMMAND_DIR "/usr/sbin"
-#define NATIVE_DAEMON_DIR "/usr/libexec/postfix"
+#define NATIVE_DAEMON_DIR "/usr/lib/postfix"
#endif
#ifdef HPUX10
@@ -798,7 +798,7 @@
#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
#define NATIVE_COMMAND_DIR "/usr/sbin"
-#define NATIVE_DAEMON_DIR "/usr/libexec/postfix"
+#define NATIVE_DAEMON_DIR "/usr/lib/postfix"
#endif
#ifdef HPUX9
