package: release.debian.org
severity: normal
x-debbugs-cc: jaldhar-dove...@debian.org, sanv...@unex.es
I would like to update dovecot to fix a mbox corruption issue that affects
the version in stable. (see bug #776094) Upstream provided a fix which is
included in the version currently in unstable. A debdiff is attached.
--
Jaldhar H. Vyas <jald...@debian.org>
diff -Nru dovecot-2.2.13/debian/changelog dovecot-2.2.13/debian/changelog
--- dovecot-2.2.13/debian/changelog 2014-12-14 12:28:42.000000000 -0500
+++ dovecot-2.2.13/debian/changelog 2015-05-28 19:41:14.000000000 -0400
@@ -1,3 +1,13 @@
+dovecot (1:2.2.13-11~deb8u1) stable; urgency=high
+
+ * [7ecf912] Fix a mbox corruption problem by applying two patches from
+ mercurial upstream.
+ - fix-mbox-corruption-18534.patch (changeset 18534:94bd895721d8).
+ - fix-mbox-corruption-18679.patch (changeset 18679:b6ea460e7cc4).
+ Thanks to Santiago Vila <sanv...@unex.es> (Closes: #776094)
+
+ -- Jaldhar H. Vyas <jald...@debian.org> Thu, 28 May 2015 19:37:40 -0400
+
dovecot (1:2.2.13-11) unstable; urgency=high
* [ebc0377] Don't allow install of dovecot-sieve without a new enough
diff -Nru dovecot-2.2.13/debian/patches/fix-mbox-corruption-18534.patch dovecot-2.2.13/debian/patches/fix-mbox-corruption-18534.patch
--- dovecot-2.2.13/debian/patches/fix-mbox-corruption-18534.patch 1969-12-31 19:00:00.000000000 -0500
+++ dovecot-2.2.13/debian/patches/fix-mbox-corruption-18534.patch 2015-05-28 19:41:14.000000000 -0400
@@ -0,0 +1,40 @@
+From: Timo Sirainen <t...@iki.fi>
+Subject: mbox: Fixed crash/corruption in some situations when the first mail was expunged.
+
+--- a/src/lib-storage/index/mbox/mbox-sync.c
++++ b/src/lib-storage/index/mbox/mbox-sync.c
+@@ -630,7 +630,7 @@
+ static int mbox_sync_handle_header(struct mbox_sync_mail_context *mail_ctx)
+ {
+ struct mbox_sync_context *sync_ctx = mail_ctx->sync_ctx;
+- uoff_t orig_from_offset;
++ uoff_t orig_from_offset, postlf_from_offset = (uoff_t)-1;
+ off_t move_diff;
+ int ret;
+
+@@ -647,6 +647,7 @@
+ if (sync_ctx->first_mail_crlf_expunged)
+ mail_ctx->mail.from_offset++;
+ }
++ postlf_from_offset = mail_ctx->mail.from_offset;
+
+ /* read the From-line before rewriting overwrites it */
+ if (mbox_read_from_line(mail_ctx) < 0)
+@@ -700,10 +701,16 @@
+ /* create dummy message to describe the expunged data */
+ struct mbox_sync_mail mail;
+
++ /* if this is going to be the first mail, increase the
++ from_offset to point to the beginning of the
++ From-line, because the previous [CR]LF is already
++ covered by expunged_space. */
++ i_assert(postlf_from_offset != (uoff_t)-1);
++ mail_ctx->mail.from_offset = postlf_from_offset;
++
+ memset(&mail, 0, sizeof(mail));
+ mail.expunged = TRUE;
+ mail.offset = mail.from_offset =
+- (sync_ctx->dest_first_mail ? 1 : 0) +
+ mail_ctx->mail.from_offset -
+ sync_ctx->expunged_space;
+ mail.space = sync_ctx->expunged_space;
diff -Nru dovecot-2.2.13/debian/patches/fix-mbox-corruption-18679.patch dovecot-2.2.13/debian/patches/fix-mbox-corruption-18679.patch
--- dovecot-2.2.13/debian/patches/fix-mbox-corruption-18679.patch 1969-12-31 19:00:00.000000000 -0500
+++ dovecot-2.2.13/debian/patches/fix-mbox-corruption-18679.patch 2015-05-28 19:41:14.000000000 -0400
@@ -0,0 +1,18 @@
+From: Timo Sirainen <t...@iki.fi>
+Subject: mbox: Fixed corruption in some usage patterns.
+
+--- a/src/lib-storage/index/mbox/mbox-sync.c
++++ b/src/lib-storage/index/mbox/mbox-sync.c
+@@ -679,8 +679,10 @@
+ }
+ } else if (mail_ctx->need_rewrite) {
+ mbox_sync_update_header(mail_ctx);
+- if (sync_ctx->delay_writes) {
+- /* mark it dirty and do it later */
++ if (sync_ctx->delay_writes && sync_ctx->need_space_seq == 0) {
++ /* mark it dirty and do it later. we can't do this
++ if we're in the middle of rewriting acquiring more
++ space. */
+ mail_ctx->dirty = TRUE;
+ return 0;
+ }
diff -Nru dovecot-2.2.13/debian/patches/series dovecot-2.2.13/debian/patches/series
--- dovecot-2.2.13/debian/patches/series 2014-12-14 12:28:42.000000000 -0500
+++ dovecot-2.2.13/debian/patches/series 2015-05-28 19:41:14.000000000 -0400
@@ -9,3 +9,5 @@
mboxlocking.patch
dovecot_name.patch
bye_logout_not_sent.patch
+fix-mbox-corruption-18534.patch
+fix-mbox-corruption-18679.patch
