postfix-3.2-20160827

diff --git a/postfix/HISTORY b/postfix/HISTORY
index eefd210ca3905eb20bfefb49051ec417900b976d..e2f20d822d072a6122b9d6a98f1d3e8b2cf106d0 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -22408,6 +22408,11 @@ Apologies for any names omitted.
 
        Cleanup: dnsblog manpage. File: dnsblog/dnsblog.c.
 
+20160717
+
+       Bugfix (introduced: Postfix 1.1): the virtual(8) delivery
+       agent discarded the error result from vstream_fseek().
+
 20160728
 
        Bugfix (introduced: 20090614): with concurrent connections
@@ -22429,3 +22434,21 @@ Apologies for any names omitted.
        historical data organization from four years ago. Files:
        postscreen/postscreen.[hc], postscreen/postscreen_early.c,
        postscreen/postscreen_smtpd.c, postscreen/postscreen_tests.c.
+
+20160808
+
+       Cleanup: preserve the new file mtimes when installing Postfix.
+       Ondřej Lysoněk. File: postfix-install.
+
+20160819
+
+       Bugfix (introduced: Postfix 3.0): the makedefs script ignored
+       readme_directory=pathname overrides. Fix by Todd C. Olson.
+       File: makedefs.
+
+20160821
+
+       Cleanup: the tls_session_ticket_cipher documentation says
+       aes-256-cbc, but the implementation was still using
+       aes-128-cbc (note that Postfix SMTP server and client
+       processes have a limited life time).

diff --git a/postfix/makedefs b/postfix/makedefs
index 8b8f07acb8f479ad41a3a737803c2c98f1521d21..de92bdb869430362682c43052f6ec9b125179214 100644 (file)
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -974,7 +974,7 @@ html_directory_macro=DEF_HTML_DIR
 manpage_directory_macro=DEF_MANPAGE_DIR
 readme_directory_macro=DEF_README_DIR
 
-for parm_name in html_directory manpage_directory
+for parm_name in html_directory manpage_directory readme_directory
 do
     eval parm_val=\"\$$parm_name\"
     eval parm_macro=\"\$${parm_name}_macro\"

diff --git a/postfix/postfix-install b/postfix/postfix-install
index 922402bfa65e4bb981fe0cc37c5117a3bc01ee9e..586e5b07d9d236ae5e550098a63aaf6806956d16 100644 (file)
--- a/postfix/postfix-install
+++ b/postfix/postfix-install
@@ -304,7 +304,7 @@ compare_or_replace() {
     (cmp $src $dst >/dev/null 2>&1 && echo Skipping $dst...) || {
        echo Updating $dst...
        rm -f $tempdir/junk || exit 1
-       cp $src $tempdir/junk || exit 1
+       cp -p $src $tempdir/junk || exit 1
        mv -f $tempdir/junk $dst || exit 1
        test -z "$owner" || chown $owner $dst || exit 1
        test -z "$group" || chgrp $group $dst || exit 1

diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index 3cd73fbc0b835597eacbf3d7c8a9335f1dde5df1..3b2db0ac22cb30ef57af1b79bbdc6ab803190722 100644 (file)
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -3206,7 +3206,7 @@ extern char *var_tls_bug_tweaks;
 extern char *var_tls_ssl_options;
 
 #define VAR_TLS_TKT_CIPHER     "tls_session_ticket_cipher"
-#define DEF_TLS_TKT_CIPHER     "aes-128-cbc"
+#define DEF_TLS_TKT_CIPHER     "aes-256-cbc"
 extern char *var_tls_tkt_cipher;
 
 #define VAR_TLS_BC_PKEY_FPRINT "tls_legacy_public_key_fingerprints"

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index a7cce8137ce9ac7e4d7cc340af194395f49a0134..b22687b3252a3700f74812728019d8356536c2e1 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      "20160730"
+#define MAIL_RELEASE_DATE      "20160827"
 #define MAIL_VERSION_NUMBER    "3.2"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/virtual/mailbox.c b/postfix/src/virtual/mailbox.c
index e04c42682c1208de33662a48c11dc98b8f04fa0f..51e646de7af1e487d0902745030a39714249e540 100644 (file)
--- a/postfix/src/virtual/mailbox.c
+++ b/postfix/src/virtual/mailbox.c
@@ -80,7 +80,6 @@ static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr)
     int     mail_copy_status;
     int     deliver_status;
     int     copy_flags;
-    long    end;
     struct stat st;
 
     /*
@@ -132,7 +131,9 @@ static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr)
            msg_warn("specify \"%s = no\" to ignore mailbox ownership mismatch",
                     VAR_STRICT_MBOX_OWNER);
        } else {
-           end = vstream_fseek(mp->fp, (off_t) 0, SEEK_END);
+           if (vstream_fseek(mp->fp, (off_t) 0, SEEK_END) < 0)
+               msg_fatal("%s: seek queue file %s: %m",
+                         myname, VSTREAM_PATH(mp->fp));
            mail_copy_status = mail_copy(COPY_ATTR(state.msg_attr), mp->fp,
                                         copy_flags, "\n", why);
        }