postfix-3.6-20200509

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 9c5ec45e2ff01c95ee251be4aaa02b778f5909cb..f117d89a5d813542b3418191827029abad6e06cd 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -24701,7 +24701,7 @@ Apologies for any names omitted.
 20200420
 
        Noise suppression: shut up a compiler that special-cases
-       string literals. File milter/milter.c.
+       string literals. Viktor Dukhovni. File milter/milter.c.
 
 20200422
 
@@ -24730,3 +24730,15 @@ Apologies for any names omitted.
 
        Portability: declaration should be before executable
        statement. File: util/msg_logger.c.
+
+20200505
+
+       Noise suppression: shut up a compiler that special-cases
+       string literals. Viktor Dukhovni. File smtpd/smtpd_check.c.
+
+20200509
+
+       Bugfix (introduced: Postfix 3.5): maillog_file_rotate_suffix
+       default value used the minute instead of the month. Reported
+       by Larry Stone. Files: conf/postfix-tls-script,
+       proto/MAILLOG_README.html, proto/postconf.proto.

diff --git a/postfix/README_FILES/MAILLOG_README b/postfix/README_FILES/MAILLOG_README
index 11407598407e6b9dc80fbc5aee27e4f1bed0eb5d..d0849bb73c4d99c170927109c29780f03a49fc67 100644 (file)
--- a/postfix/README_FILES/MAILLOG_README
+++ b/postfix/README_FILES/MAILLOG_README
@@ -64,7 +64,7 @@ implements the following steps:
 
   * Rename the current logfile by appending a suffix that contains the date and
     time. This suffix is configured with the maillog_file_rotate_suffix
-    parameter (default: %Y%M%d-%H%M%S).
+    parameter (default: %Y%m%d-%H%M%S).
 
   * Reload Postfix so that postlogd(8) immediately closes the old logfile.
 

diff --git a/postfix/html/MAILLOG_README.html b/postfix/html/MAILLOG_README.html
index 0b9f250b33bf291b62ad5a2bbc17a3e8bdf7c167..aa371ba26cd672cacba12a9053f4a83ad63ac805 100644 (file)
--- a/postfix/html/MAILLOG_README.html
+++ b/postfix/html/MAILLOG_README.html
@@ -114,7 +114,7 @@ run from a terminal. This command implements the following steps:
 
 <li> <p> Rename the current logfile by appending a suffix that
 contains the date and time. This suffix is configured with the
-<a href="postconf.5.html#maillog_file_rotate_suffix">maillog_file_rotate_suffix</a> parameter (default: %Y%M%d-%H%M%S). </p>
+<a href="postconf.5.html#maillog_file_rotate_suffix">maillog_file_rotate_suffix</a> parameter (default: %Y%m%d-%H%M%S). </p>
 
 <li> <p> Reload Postfix so that <a href="postlogd.8.html">postlogd(8)</a> immediately closes the
 old logfile. </p>

diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index 5930016ae4ce52694408b77be2c6b9b168467492..cf34baca6607185f4dd54b861562dbc65d8a8024 100644 (file)
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -6329,7 +6329,7 @@ whitespace. </p>
 </DD>
 
 <DT><b><a name="maillog_file_rotate_suffix">maillog_file_rotate_suffix</a>
-(default: %Y%M%d-%H%M%S)</b></DT><DD>
+(default: %Y%m%d-%H%M%S)</b></DT><DD>
 
 <p> The format of the suffix to append to $<a href="postconf.5.html#maillog_file">maillog_file</a> while rotating
 the file with "postfix logrotate". See strftime(3) for syntax. The

diff --git a/postfix/html/postfix.1.html b/postfix/html/postfix.1.html
index 4c5c4f937115ee107404bf153cd53821abe8c5d8..eb59ad30d5c4a788a6a239a13f4d2a8e26e8b781 100644 (file)
--- a/postfix/html/postfix.1.html
+++ b/postfix/html/postfix.1.html
@@ -285,7 +285,7 @@ POSTFIX(1)                                                          POSTFIX(1)
        <b><a href="postconf.5.html#maillog_file_prefixes">maillog_file_prefixes</a> (/var, /dev/stdout)</b>
               A list of allowed prefixes for a <a href="postconf.5.html#maillog_file">maillog_file</a> value.
 
-       <b><a href="postconf.5.html#maillog_file_rotate_suffix">maillog_file_rotate_suffix</a> (%Y%M%d-%H%M%S)</b>
+       <b><a href="postconf.5.html#maillog_file_rotate_suffix">maillog_file_rotate_suffix</a> (%Y%m%d-%H%M%S)</b>
               The format of the suffix to append to $<a href="postconf.5.html#maillog_file">maillog_file</a> while rotat-
               ing the file with "postfix logrotate".
 

diff --git a/postfix/makedefs b/postfix/makedefs
index 47761f1c1d8112ce177f0d809c22d09bea810697..6f436f4c08173087f4218cfd22cb554f7202f311 100644 (file)
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -228,13 +228,16 @@ case $# in
  *) echo usage: $0 [system release] 1>&2; exit 1;;
 esac
 
-case "`PATH=/bin:/usr/bin ldd /bin/sh`" in
- *-musl-*)
-    case "$CCARGS" in
-     *-DNO_DNSSEC*) ;;
-     *) echo Warning: libc-musl breaks DANE/TLSA security. 1>&2
-       echo This build will not support DANE/TLSA. 1>&2
-       CCARGS="$CCARGS -DNO_DNSSEC";;
+case "$SYSTEM" in
+ Linux)
+    case "`PATH=/bin:/usr/bin ldd /bin/sh`" in
+     *-musl-*)
+       case "$CCARGS" in
+        *-DNO_DNSSEC*) ;;
+        *) echo Warning: libc-musl breaks DANE/TLSA security. 1>&2
+           echo This build will not support DANE/TLSA. 1>&2
+           CCARGS="$CCARGS -DNO_DNSSEC";;
+       esac;;
     esac;;
 esac
 

diff --git a/postfix/man/man1/postfix.1 b/postfix/man/man1/postfix.1
index 7a8a39cd24a300318c1f37abcba1252688ce7985..412c0c9d1c1bfd2354c6a3b358d29b0531cc1d99 100644 (file)
--- a/postfix/man/man1/postfix.1
+++ b/postfix/man/man1/postfix.1
@@ -252,7 +252,7 @@ The program to run after rotating $maillog_file with "postfix
 logrotate".
 .IP "\fBmaillog_file_prefixes (/var, /dev/stdout)\fR"
 A list of allowed prefixes for a maillog_file value.
-.IP "\fBmaillog_file_rotate_suffix (%Y%M%d\-%H%M%S)\fR"
+.IP "\fBmaillog_file_rotate_suffix (%Y%m%d\-%H%M%S)\fR"
 The format of the suffix to append to $maillog_file while rotating
 the file with "postfix logrotate".
 .IP "\fBpostlog_service_name (postlog)\fR"

diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index d1e3147b5e42b794e5b192a588d10613720f3039..0d6dd271209ca918fc2f9233bdbc0fad748b4d01 100644 (file)
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -3822,7 +3822,7 @@ mistake. Specify one or more prefix strings, separated by comma or
 whitespace.
 .PP
 This feature is available in Postfix 3.4 and later.
-.SH maillog_file_rotate_suffix (default: %Y%M%d\-%H%M%S)
+.SH maillog_file_rotate_suffix (default: %Y%m%d\-%H%M%S)
 The format of the suffix to append to $maillog_file while rotating
 the file with "postfix logrotate". See \fBstrftime\fR(3) for syntax. The
 default suffix, YYYYMMDD\-HHMMSS, allows logs to be rotated frequently.

diff --git a/postfix/proto/MAILLOG_README.html b/postfix/proto/MAILLOG_README.html
index 9804983a702849ee5bbeb2dd3729e9fa55f43934..9951c6c23ebf83ef482de80718b31536b1d98673 100644 (file)
--- a/postfix/proto/MAILLOG_README.html
+++ b/postfix/proto/MAILLOG_README.html
@@ -114,7 +114,7 @@ run from a terminal. This command implements the following steps:
 
 <li> <p> Rename the current logfile by appending a suffix that
 contains the date and time. This suffix is configured with the
-maillog_file_rotate_suffix parameter (default: %Y%M%d-%H%M%S). </p>
+maillog_file_rotate_suffix parameter (default: %Y%m%d-%H%M%S). </p>
 
 <li> <p> Reload Postfix so that postlogd(8) immediately closes the
 old logfile. </p>

diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index ca384963b79c6557320e60f1b292d683f08ba120..3d5365743b8578d1f18c343b10524a01fabfc1a1 100644 (file)
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -17651,7 +17651,7 @@ first argument. </p>
 
 <p> This feature is available in Postfix 3.4 and later. </p>
 
-%PARAM maillog_file_rotate_suffix %Y%M%d-%H%M%S
+%PARAM maillog_file_rotate_suffix %Y%m%d-%H%M%S
 
 <p> The format of the suffix to append to $maillog_file while rotating
 the file with "postfix logrotate". See strftime(3) for syntax. The

diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index f9576be28a25c721567d3ef9a05d7952dab4c611..a6119f1b2d9471b48fa6f3bb57356780b6592e5e 100644 (file)
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -4181,7 +4181,7 @@ extern char *var_maillog_file_pfxs;
 extern char *var_maillog_file_comp;
 
 #define VAR_MAILLOG_FILE_STAMP "maillog_file_rotate_suffix"
-#define DEF_MAILLOG_FILE_STAMP "%Y%M%d-%H%M%S"
+#define DEF_MAILLOG_FILE_STAMP "%Y%m%d-%H%M%S"
 extern char *var_maillog_file_stamp;
 
 #define VAR_POSTLOG_SERVICE    "postlog_service_name"

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 77b7c554d63b34260df2c014d89e91e82c03bf6b..9bfbcf7cd146b7eedfa4e332332a4edac3e4cde9 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20200504"
+#define MAIL_RELEASE_DATE      "20200509"
 #define MAIL_VERSION_NUMBER    "3.6"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postfix/postfix.c b/postfix/src/postfix/postfix.c
index f8b3de45048a95f9510dd24173976dd7db2a770e..b2306fb606ed2f5f2e435ec9efe57c2a7a2f4625 100644 (file)
--- a/postfix/src/postfix/postfix.c
+++ b/postfix/src/postfix/postfix.c
@@ -242,7 +242,7 @@
 /*     logrotate".
 /* .IP "\fBmaillog_file_prefixes (/var, /dev/stdout)\fR"
 /*     A list of allowed prefixes for a maillog_file value.
-/* .IP "\fBmaillog_file_rotate_suffix (%Y%M%d-%H%M%S)\fR"
+/* .IP "\fBmaillog_file_rotate_suffix (%Y%m%d-%H%M%S)\fR"
 /*     The format of the suffix to append to $maillog_file while rotating
 /*     the file with "postfix logrotate".
 /* .IP "\fBpostlog_service_name (postlog)\fR"

diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c
index 35c713158ef275ee1a3fbdc829ca002c177f1564..85d594498112b604bcddfbecd3a42740d16c1bf8 100644 (file)
--- a/postfix/src/smtpd/smtpd_check.c
+++ b/postfix/src/smtpd/smtpd_check.c
@@ -486,20 +486,20 @@ typedef struct {
   * parameter names by skipping the redundant "smtpd_policy_service_" prefix.
   */
 static ATTR_OVER_TIME time_table[] = {
-    21 + VAR_SMTPD_POLICY_TMOUT, DEF_SMTPD_POLICY_TMOUT, 0, 1, 0,
-    21 + VAR_SMTPD_POLICY_IDLE, DEF_SMTPD_POLICY_IDLE, 0, 1, 0,
-    21 + VAR_SMTPD_POLICY_TTL, DEF_SMTPD_POLICY_TTL, 0, 1, 0,
-    21 + VAR_SMTPD_POLICY_TRY_DELAY, DEF_SMTPD_POLICY_TRY_DELAY, 0, 1, 0,
+    21 + (const char *) VAR_SMTPD_POLICY_TMOUT, DEF_SMTPD_POLICY_TMOUT, 0, 1, 0,
+    21 + (const char *) VAR_SMTPD_POLICY_IDLE, DEF_SMTPD_POLICY_IDLE, 0, 1, 0,
+    21 + (const char *) VAR_SMTPD_POLICY_TTL, DEF_SMTPD_POLICY_TTL, 0, 1, 0,
+    21 + (const char *) VAR_SMTPD_POLICY_TRY_DELAY, DEF_SMTPD_POLICY_TRY_DELAY, 0, 1, 0,
     0,
 };
 static ATTR_OVER_INT int_table[] = {
-    21 + VAR_SMTPD_POLICY_REQ_LIMIT, 0, 0, 0,
-    21 + VAR_SMTPD_POLICY_TRY_LIMIT, 0, 1, 0,
+    21 + (const char *) VAR_SMTPD_POLICY_REQ_LIMIT, 0, 0, 0,
+    21 + (const char *) VAR_SMTPD_POLICY_TRY_LIMIT, 0, 1, 0,
     0,
 };
 static ATTR_OVER_STR str_table[] = {
-    21 + VAR_SMTPD_POLICY_DEF_ACTION, 0, 1, 0,
-    21 + VAR_SMTPD_POLICY_CONTEXT, 0, 1, 0,
+    21 + (const char *) VAR_SMTPD_POLICY_DEF_ACTION, 0, 1, 0,
+    21 + (const char *) VAR_SMTPD_POLICY_CONTEXT, 0, 1, 0,
     0,
 };