| 1 |
wschlich 09/01/13 18:01:25 |
| 2 |
|
| 3 |
Added: dovecot-1.1.8-b42c06ef8213.patch |
| 4 |
dovecot-1.1.8-5417c01fff5b.patch |
| 5 |
Log: |
| 6 |
version bump |
| 7 |
(Portage version: 2.2_rc13/cvs/Linux 2.6.24-gentoo-r5-1 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-mail/dovecot/files/dovecot-1.1.8-b42c06ef8213.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot-1.1.8-b42c06ef8213.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot-1.1.8-b42c06ef8213.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: dovecot-1.1.8-b42c06ef8213.patch |
| 16 |
=================================================================== |
| 17 |
|
| 18 |
# HG changeset patch |
| 19 |
# User Timo Sirainen <tss@×××.fi> |
| 20 |
# Date 1231444040 18000 |
| 21 |
# Node ID b42c06ef8213c8c412f0fff26146284b79b9413d |
| 22 |
# Parent 5417c01fff5be03b9b41f0da1d2bf1902c55aaa0 |
| 23 |
mbox: Fixed crash with pop3_lock_session=yes if dotlock already existed. |
| 24 |
|
| 25 |
--- a/src/lib-storage/index/mbox/mbox-storage.c Thu Jan 08 14:46:47 2009 -0500 |
| 26 |
+++ b/src/lib-storage/index/mbox/mbox-storage.c Thu Jan 08 14:47:20 2009 -0500 |
| 27 |
@@ -569,6 +569,9 @@ mbox_alloc_mailbox(struct mbox_storage * |
| 28 |
if ((storage->storage.flags & MAIL_STORAGE_FLAG_KEEP_HEADER_MD5) != 0) |
| 29 |
mbox->mbox_save_md5 = TRUE; |
| 30 |
|
| 31 |
+ index_storage_mailbox_init(&mbox->ibox, name, flags, |
| 32 |
+ want_memory_indexes(storage, path)); |
| 33 |
+ |
| 34 |
if ((flags & MAILBOX_OPEN_KEEP_LOCKED) != 0) { |
| 35 |
if (mbox_lock(mbox, F_WRLCK, &mbox->mbox_global_lock_id) <= 0) { |
| 36 |
struct mailbox *box = &mbox->ibox.box; |
| 37 |
@@ -584,8 +587,6 @@ mbox_alloc_mailbox(struct mbox_storage * |
| 38 |
} |
| 39 |
} |
| 40 |
|
| 41 |
- index_storage_mailbox_init(&mbox->ibox, name, flags, |
| 42 |
- want_memory_indexes(storage, path)); |
| 43 |
return mbox; |
| 44 |
} |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 net-mail/dovecot/files/dovecot-1.1.8-5417c01fff5b.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot-1.1.8-5417c01fff5b.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot-1.1.8-5417c01fff5b.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: dovecot-1.1.8-5417c01fff5b.patch |
| 56 |
=================================================================== |
| 57 |
|
| 58 |
# HG changeset patch |
| 59 |
# User Timo Sirainen <tss@×××.fi> |
| 60 |
# Date 1231444007 18000 |
| 61 |
# Node ID 5417c01fff5be03b9b41f0da1d2bf1902c55aaa0 |
| 62 |
# Parent 0041d055acac5ca09428262dc8cdec91d7008c0b |
| 63 |
mbox: Fixed assert-crash with pop3_lock_session=yes |
| 64 |
|
| 65 |
--- a/src/lib-storage/index/mbox/mbox-transaction.c Thu Jan 08 12:22:11 2009 -0500 |
| 66 |
+++ b/src/lib-storage/index/mbox/mbox-transaction.c Thu Jan 08 14:46:47 2009 -0500 |
| 67 |
@@ -50,8 +50,12 @@ static int mbox_transaction_commit(struc |
| 68 |
if (mbox_unlock(mbox, lock_id) < 0) |
| 69 |
ret = -1; |
| 70 |
} |
| 71 |
- i_assert(mbox->ibox.box.transaction_count > 0 || |
| 72 |
- mbox->mbox_lock_type == F_UNLCK); |
| 73 |
+ if (mbox->mbox_global_lock_id == 0) { |
| 74 |
+ i_assert(mbox->ibox.box.transaction_count > 0 || |
| 75 |
+ mbox->mbox_lock_type == F_UNLCK); |
| 76 |
+ } else { |
| 77 |
+ i_assert(mbox->mbox_lock_type == F_WRLCK); |
| 78 |
+ } |
| 79 |
return ret; |
| 80 |
} |
Archives