[SVN] r475 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/0014-upstream-fix-locks-during-reconstruction.dpatch patches/00list

[debian at incase.de]

Author: astronut
Date: Sun Jun  4 22:05:22 2006
New Revision: 475

URL: https://mail.incase.de/viewcvs?rev=475&root=cyrus22&view=rev
Log:
Added upstream patch: don't lock/unlock_pop when reconstructing

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=475&root=cyrus22&r1=474&r2=475&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Sun Jun  4 22:05:22 2006
@@ -24,8 +24,9 @@
   [ Benjamin Seidenberg ]
   * Fix typos in UPGRADE.Debian (Closes: #368675)
   * Fix link in doc/html/readme.html (Closes: #368676)
-
- -- Sven Mueller <debian at incase.de>  Thu,  1 Jun 2006 20:51:34 +0200
+  * Add upstream patch to fix POP locking when reconstructing
+
+ -- Benjamin Seidenberg <astronut at dlgeek.net>  Sun,  4 Jun 2006 16:03:11 -0400
 
 cyrus-imapd-2.2 (2.2.13-3) unstable; urgency=high
 

Added: trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch?rev=475&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch Sun Jun  4 22:05:22 2006
@@ -1,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0014-upstream-fix-locks-during-reconstruction.dpatch by Benjamin Seidenberg <astronut at dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: don't lock/unlock_pop when reconstructing
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13~/imap/mailbox.c	2006-05-05 21:04:53.000000000 -0400
++++ cyrus-imapd-2.2.13/imap/mailbox.c	2006-06-04 16:01:12.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* mailbox.c -- Mailbox manipulation routines
+- * $Id: mailbox.c,v 1.159 2005/04/07 00:25:52 shadow Exp $
++ * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -1391,11 +1391,14 @@
+ 	return r;
+     }
+ 
+-    r = mailbox_lock_pop(mailbox);
+-    if (r) {
+-	mailbox_unlock_index(mailbox);
+-	mailbox_unlock_header(mailbox);
+-	return r;
++    if (!mailbox_doing_reconstruct) {
++	/* If we're reconstructing, we don't open the existing cache file */
++	r = mailbox_lock_pop(mailbox);
++	if (r) {
++	    mailbox_unlock_index(mailbox);
++	    mailbox_unlock_header(mailbox);
++	    return r;
++	}
+     }
+ 
+     strlcpy(fnamebuf, mailbox->path, sizeof(fnamebuf));
+@@ -1499,7 +1502,7 @@
+ 	goto fail;
+     }
+ 
+-    mailbox_unlock_pop(mailbox);
++    if (!mailbox_doing_reconstruct) mailbox_unlock_pop(mailbox);
+     mailbox_unlock_index(mailbox);
+     mailbox_unlock_header(mailbox);
+     fclose(newindex);
+@@ -1507,7 +1510,7 @@
+     return 0;
+ 
+  fail:
+-    mailbox_unlock_pop(mailbox);
++    if (!mailbox_doing_reconstruct) mailbox_unlock_pop(mailbox);
+     mailbox_unlock_index(mailbox);
+     mailbox_unlock_header(mailbox);
+ 

Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=475&root=cyrus22&r1=474&r2=475&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Sun Jun  4 22:05:22 2006
@@ -11,6 +11,7 @@
 0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
 0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
 0013-upstream-allow-report-above-4GB-mboxsize.dpatch
+0014-upstream-fix-locks-during-reconstruction.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
 03-fix_docs.dpatch