Gentoo Archives: gentoo-commits

From: "Wolfram Schlich (wschlich)" <wschlich@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-mail/dovecot/files: dovecot-1.1.8-b42c06ef8213.patch dovecot-1.1.8-5417c01fff5b.patch
Date: Tue, 13 Jan 2009 18:01:28
Message-Id: E1LMnZt-0005kT-I0@stork.gentoo.org
wschlich    09/01/13 18:01:25

  Added:                dovecot-1.1.8-b42c06ef8213.patch
                        dovecot-1.1.8-5417c01fff5b.patch
  Log:
  version bump
  (Portage version: 2.2_rc13/cvs/Linux 2.6.24-gentoo-r5-1 i686)

Revision  Changes    Path
1.1                  net-mail/dovecot/files/dovecot-1.1.8-b42c06ef8213.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot-1.1.8-b42c06ef8213.patch?rev=1.1&view=markup
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

Index: dovecot-1.1.8-b42c06ef8213.patch
===================================================================

# HG changeset patch
# User Timo Sirainen <tss@×××.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;
 }
 




1.1                  net-mail/dovecot/files/dovecot-1.1.8-5417c01fff5b.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot-1.1.8-5417c01fff5b.patch?rev=1.1&view=markup
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

Index: dovecot-1.1.8-5417c01fff5b.patch
===================================================================

# HG changeset patch
# User Timo Sirainen <tss@×××.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;
 }