From: Wietse Venema Date: Tue, 22 Feb 2005 05:00:00 +0000 (-0500) Subject: postfix-2.2-20050222 X-Git-Tag: v2.2.0-RC1~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0edd87814491f1ab6f50c39d273c166d6fc052af;p=thirdparty%2Fpostfix.git postfix-2.2-20050222 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index fc108868e..f7443a0c0 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -10376,9 +10376,9 @@ Apologies for any names omitted. 20050215 Bugfix: don't chmod queue files while running "postfix - set-permissions". This avoids mail inadvertantly being - labeled as "corrupt" when a live Postfix system is upgraded. - Found by Victor Duchovni. File: conf/post-install. + set-permissions". This prevents mail from being labeled as + "corrupt" when a live Postfix system is upgraded. Found + by Victor Duchovni. File: conf/post-install. 20050216 diff --git a/postfix/html/postfix.1.html b/postfix/html/postfix.1.html index a5241383c..5631721ff 100644 --- a/postfix/html/postfix.1.html +++ b/postfix/html/postfix.1.html @@ -4,7 +4,7 @@ Postfix manual - postfix(1) 
-POSTFIX(1)                                             POSTFIX(1)
+POSTFIX(1)                                                          POSTFIX(1)
 
 NAME
        postfix - Postfix control program
@@ -67,17 +67,21 @@ POSTFIX(1)                                             POSTFIX(1)
               setting for an already installed Postfix system.
 
               This feature is available in Postfix 2.1 and later.
+              With  Postfix  2.0  and  earlier,  use  "/etc/post-
+              fix/post-install set-permissions".
 
        upgrade-configuration [name=value ...]
-              Update the main.cf and master.cf files with  infor-
-              mation  that  Postfix needs in order to run: add or
-              update services, and add  or  update  configuration
+              Update  the main.cf and master.cf files with infor-
+              mation that Postfix needs in order to run:  add  or
+              update  services,  and  add or update configuration
               parameter settings.
 
-              Specify  name=value to override and update specific
+              Specify name=value to override and update  specific
               main.cf configuration parameters.
 
               This feature is available in Postfix 2.1 and later.
+              With  Postfix  2.0  and  earlier,  use  "/etc/post-
+              fix/post-install upgrade-configuration".
 
        The following options are implemented:
 
@@ -102,16 +106,16 @@ POSTFIX(1)                                             POSTFIX(1)
        variables before executing the postfix-script file:
 
        MAIL_CONFIG
-              This is set when the -c command-line option is pre-
-              sent.
+              This is set when  the  -c  command-line  option  is
+              present.
 
        MAIL_VERBOSE
-              This is set when the -v command-line option is pre-
-              sent.
+              This  is  set  when  the  -v command-line option is
+              present.
 
        MAIL_DEBUG
-              This is set when the -D command-line option is pre-
-              sent.
+              This is set when  the  -D  command-line  option  is
+              present.
 
 CONFIGURATION PARAMETERS
        The   following   main.cf   configuration  parameters  are
@@ -174,15 +178,15 @@ POSTFIX(1)                                             POSTFIX(1)
 
        import_environment (see 'postconf -d' output)
               The list of environment parameters that  a  Postfix
-              process  will import from a non-Postfix parent pro-
-              cess.
+              process  will  import  from  a  non-Postfix  parent
+              process.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The mail system name that is prepended to the  pro-
-              cess  name  in  syslog  records,  so  that  "smtpd"
+              The mail system  name  that  is  prepended  to  the
+              process  name  in  syslog  records, so that "smtpd"
               becomes, for example, "postfix/smtpd".
 
 FILES
@@ -279,5 +283,5 @@ POSTFIX(1)                                             POSTFIX(1)
        P.O. Box 704
        Yorktown Heights, NY 10598, USA
 
-                                                       POSTFIX(1)
+                                                                    POSTFIX(1)
diff --git a/postfix/man/man1/postfix.1 b/postfix/man/man1/postfix.1 index 0e99c558d..4b9b95ebc 100644 --- a/postfix/man/man1/postfix.1 +++ b/postfix/man/man1/postfix.1 @@ -60,7 +60,9 @@ main.cf configuration parameters. Use this, for example, to change the \fBmail_owner\fR or \fBsetgid_group\fR setting for an already installed Postfix system. .sp -This feature is available in Postfix 2.1 and later. +This feature is available in Postfix 2.1 and later. With +Postfix 2.0 and earlier, use "\fB/etc/postfix/post-install +set-permissions\fR". .IP "\fBupgrade-configuration\fR \fB[\fIname\fR=\fIvalue ...\fB]\fR Update the \fBmain.cf\fR and \fBmaster.cf\fR files with information that Postfix needs in order to run: add or update services, and add @@ -69,7 +71,9 @@ or update configuration parameter settings. Specify \fIname\fR=\fIvalue\fR to override and update specific main.cf configuration parameters. .sp -This feature is available in Postfix 2.1 and later. +This feature is available in Postfix 2.1 and later. With +Postfix 2.0 and earlier, use "\fB/etc/postfix/post-install +upgrade-configuration\fR". .PP The following options are implemented: .IP "\fB-c \fIconfig_dir\fR" diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 313778c1a..ff69bc0df 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change the patchlevel and the release date. Snapshots change the * release date only. */ -#define MAIL_RELEASE_DATE "20050218" +#define MAIL_RELEASE_DATE "20050222" #define MAIL_VERSION_NUMBER "2.2" #define VAR_MAIL_VERSION "mail_version" diff --git a/postfix/src/postfix/postfix.c b/postfix/src/postfix/postfix.c index ac0df3799..71eb2fba9 100644 --- a/postfix/src/postfix/postfix.c +++ b/postfix/src/postfix/postfix.c @@ -54,7 +54,9 @@ /* change the \fBmail_owner\fR or \fBsetgid_group\fR setting for an /* already installed Postfix system. /* .sp -/* This feature is available in Postfix 2.1 and later. +/* This feature is available in Postfix 2.1 and later. With +/* Postfix 2.0 and earlier, use "\fB/etc/postfix/post-install +/* set-permissions\fR". /* .IP "\fBupgrade-configuration\fR \fB[\fIname\fR=\fIvalue ...\fB]\fR /* Update the \fBmain.cf\fR and \fBmaster.cf\fR files with information /* that Postfix needs in order to run: add or update services, and add @@ -63,7 +65,9 @@ /* Specify \fIname\fR=\fIvalue\fR to override and update specific /* main.cf configuration parameters. /* .sp -/* This feature is available in Postfix 2.1 and later. +/* This feature is available in Postfix 2.1 and later. With +/* Postfix 2.0 and earlier, use "\fB/etc/postfix/post-install +/* upgrade-configuration\fR". /* .PP /* The following options are implemented: /* .IP "\fB-c \fIconfig_dir\fR"