diff options
| author |   Wolfram Schlich <wschlich@gentoo.org> | 2009-01-13 18:01:25 +0000 |
|---|---|---|
| committer | Wolfram Schlich <wschlich@gentoo.org> | 2009-01-13 18:01:25 +0000 |
| commit | c826b8d11d0f0c826f3e3ad6a3ff21fb23d85b42 (patch) | |
| tree | a0aa563977f4c8e7f5f4c5b1e3539786afc7d7a0 /net-mail/dovecot/files | |
| parent | bug #171947; added version to run vdradmin-am on a vdr-less install, use -vdr... (diff) | |
| download | historical-c826b8d11d0f0c826f3e3ad6a3ff21fb23d85b42.tar.gz historical-c826b8d11d0f0c826f3e3ad6a3ff21fb23d85b42.tar.bz2 historical-c826b8d11d0f0c826f3e3ad6a3ff21fb23d85b42.zip | |
version bump
Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.24-gentoo-r5-1 i686
Diffstat (limited to 'net-mail/dovecot/files')
| -rw-r--r-- | net-mail/dovecot/files/dovecot-1.1.8-5417c01fff5b.patch | 26 | ||||
| -rw-r--r-- | net-mail/dovecot/files/dovecot-1.1.8-b42c06ef8213.patch | 30 |
2 files changed, 56 insertions, 0 deletions
diff --git a/net-mail/dovecot/files/dovecot-1.1.8-5417c01fff5b.patch b/net-mail/dovecot/files/dovecot-1.1.8-5417c01fff5b.patch new file mode 100644 index 000000000000..1822f82e08bc --- /dev/null +++ b/net-mail/dovecot/files/dovecot-1.1.8-5417c01fff5b.patch @@ -0,0 +1,26 @@ + +# HG changeset patch +# User Timo Sirainen <tss@iki.fi> +# Date 1231444007 18000 +# Node ID 5417c01fff5be03b9b41f0da1d2bf1902c55aaa0 +# Parent 0041d055acac5ca09428262dc8cdec91d7008c0b +mbox: Fixed assert-crash with pop3_lock_session=yes + +--- a/src/lib-storage/index/mbox/mbox-transaction.c Thu Jan 08 12:22:11 2009 -0500 ++++ b/src/lib-storage/index/mbox/mbox-transaction.c Thu Jan 08 14:46:47 2009 -0500 +@@ -50,8 +50,12 @@ static int mbox_transaction_commit(struc + if (mbox_unlock(mbox, lock_id) < 0) + ret = -1; + } +- i_assert(mbox->ibox.box.transaction_count > 0 || +- mbox->mbox_lock_type == F_UNLCK); ++ if (mbox->mbox_global_lock_id == 0) { ++ i_assert(mbox->ibox.box.transaction_count > 0 || ++ mbox->mbox_lock_type == F_UNLCK); ++ } else { ++ i_assert(mbox->mbox_lock_type == F_WRLCK); ++ } + return ret; + } + + diff --git a/net-mail/dovecot/files/dovecot-1.1.8-b42c06ef8213.patch b/net-mail/dovecot/files/dovecot-1.1.8-b42c06ef8213.patch new file mode 100644 index 000000000000..12d92b1449c2 --- /dev/null +++ b/net-mail/dovecot/files/dovecot-1.1.8-b42c06ef8213.patch @@ -0,0 +1,30 @@ + +# HG changeset patch +# User Timo Sirainen <tss@iki.fi> +# Date 1231444040 18000 +# Node ID b42c06ef8213c8c412f0fff26146284b79b9413d +# Parent 5417c01fff5be03b9b41f0da1d2bf1902c55aaa0 +mbox: Fixed crash with pop3_lock_session=yes if dotlock already existed. + +--- a/src/lib-storage/index/mbox/mbox-storage.c Thu Jan 08 14:46:47 2009 -0500 ++++ b/src/lib-storage/index/mbox/mbox-storage.c Thu Jan 08 14:47:20 2009 -0500 +@@ -569,6 +569,9 @@ mbox_alloc_mailbox(struct mbox_storage * + if ((storage->storage.flags & MAIL_STORAGE_FLAG_KEEP_HEADER_MD5) != 0) + mbox->mbox_save_md5 = TRUE; + ++ index_storage_mailbox_init(&mbox->ibox, name, flags, ++ want_memory_indexes(storage, path)); ++ + if ((flags & MAILBOX_OPEN_KEEP_LOCKED) != 0) { + if (mbox_lock(mbox, F_WRLCK, &mbox->mbox_global_lock_id) <= 0) { + struct mailbox *box = &mbox->ibox.box; +@@ -584,8 +587,6 @@ mbox_alloc_mailbox(struct mbox_storage * + } + } + +- index_storage_mailbox_init(&mbox->ibox, name, flags, +- want_memory_indexes(storage, path)); + return mbox; + } + + |