From fe9d4f6b717850b83b0257f32edcf6cb02e090aa Mon Sep 17 00:00:00 2001
From: Wietse Venema
Date: Sat, 16 Feb 2008 00:00:00 -0500
Subject: [PATCH] postfix-2.5.1
---
postfix/README_FILES/ADDRESS_VERIFICATION_README | 2 +-
postfix/html/ADDRESS_VERIFICATION_README.html | 2 +-
postfix/html/postconf.5.html | 5 +++--
postfix/man/man5/postconf.5 | 5 +++--
postfix/proto/ADDRESS_VERIFICATION_README.html | 2 +-
postfix/proto/postconf.proto | 5 +++--
postfix/src/global/mail_version.h | 4 ++--
7 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/postfix/README_FILES/ADDRESS_VERIFICATION_README b/postfix/README_FILES/ADDRESS_VERIFICATION_README
index cdb89fc6c..e27184138 100644
--- a/postfix/README_FILES/ADDRESS_VERIFICATION_README
+++ b/postfix/README_FILES/ADDRESS_VERIFICATION_README
@@ -245,7 +245,7 @@ NOTE 1: As of version 2.5, Postfix no longer uses root privileges when opening
this file. The file should now be stored under the Postfix-owned
data_directory. As a migration aid, an attempt to open the file under a non-
Postfix directory is redirected to the Postfix-owned data_directory, and a
-warning is logged. If you wish to continue using an pre-existing database file,
+warning is logged. If you wish to continue using a pre-existing database file,
move it to the data_directory, and change ownership to the account specified
with the mail_owner parameter.
diff --git a/postfix/html/ADDRESS_VERIFICATION_README.html b/postfix/html/ADDRESS_VERIFICATION_README.html
index 09587e5c0..70c6e6f22 100644
--- a/postfix/html/ADDRESS_VERIFICATION_README.html
+++ b/postfix/html/ADDRESS_VERIFICATION_README.html
@@ -382,7 +382,7 @@ when opening this file. The file should now be stored under the
Postfix-owned data_directory. As a migration aid, an attempt to
open the file under a non-Postfix directory is redirected to the
Postfix-owned data_directory, and a warning is logged. If you wish
-to continue using an pre-existing database file, move it to the
+to continue using a pre-existing database file, move it to the
data_directory, and change ownership to the account specified with
the mail_owner parameter.
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index be2b7499b..7144efacd 100644
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -1351,7 +1351,8 @@ Instead of $name you can also specify ${name} or $(name).
Restrict the characters that the local(8) delivery agent allows in
-$name expansions of $mailbox_command. Characters outside the
+$name expansions of $mailbox_command and $command_execution_directory.
+Characters outside the
allowed set are replaced by underscores.
@@ -7502,7 +7503,7 @@ the unix: prefix),
a /file/name with domain names and/or relay host names as
defined above,
- a "type:table" with domain names and/or relay hosts name on
+ a "type:table" with domain names and/or relay host names on
the left-hand side. The right-hand side result from "type:table"
lookups is ignored.
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index 7caba6c62..ed6cb4a36 100644
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -751,7 +751,8 @@ Instead of $name you can also specify ${name} or $(name).
This feature is available in Postfix 2.2 and later.
.SH command_expansion_filter (default: see "postconf -d" output)
Restrict the characters that the \fBlocal\fR(8) delivery agent allows in
-$name expansions of $mailbox_command. Characters outside the
+$name expansions of $mailbox_command and $command_execution_directory.
+Characters outside the
allowed set are replaced by underscores.
.SH command_time_limit (default: 1000s)
Time limit for delivery to external commands. This limit is used
@@ -4228,7 +4229,7 @@ the unix: prefix),
a /file/name with domain names and/or relay host names as
defined above,
.IP \(bu
-a "type:table" with domain names and/or relay hosts name on
+a "type:table" with domain names and/or relay host names on
the left-hand side. The right-hand side result from "type:table"
lookups is ignored.
.PP
diff --git a/postfix/proto/ADDRESS_VERIFICATION_README.html b/postfix/proto/ADDRESS_VERIFICATION_README.html
index 861075688..f0b01d594 100644
--- a/postfix/proto/ADDRESS_VERIFICATION_README.html
+++ b/postfix/proto/ADDRESS_VERIFICATION_README.html
@@ -382,7 +382,7 @@ when opening this file. The file should now be stored under the
Postfix-owned data_directory. As a migration aid, an attempt to
open the file under a non-Postfix directory is redirected to the
Postfix-owned data_directory, and a warning is logged. If you wish
-to continue using an pre-existing database file, move it to the
+to continue using a pre-existing database file, move it to the
data_directory, and change ownership to the account specified with
the mail_owner parameter.
diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 5e93d8675..c2d7c22dd 100644
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -3785,7 +3785,7 @@ the unix: prefix),
a /file/name with domain names and/or relay host names as
defined above,
- a "type:table" with domain names and/or relay hosts name on
+ a "type:table" with domain names and/or relay host names on
the left-hand side. The right-hand side result from "type:table"
lookups is ignored.
@@ -6638,7 +6638,8 @@ The default time unit is s (seconds).
Restrict the characters that the local(8) delivery agent allows in
-$name expansions of $mailbox_command. Characters outside the
+$name expansions of $mailbox_command and $command_execution_directory.
+Characters outside the
allowed set are replaced by underscores.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 3f5ed65af..3b0af353a 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20080210"
-#define MAIL_VERSION_NUMBER "2.5.1-RC2"
+#define MAIL_RELEASE_DATE "20080216"
+#define MAIL_VERSION_NUMBER "2.5.1"
#ifdef SNAPSHOT
# define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE