[SVN] r480 -
/trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
debian at incase.de
debian at incase.de
Thu Jun 8 11:00:25 UTC 2006
Author: sven
Date: Thu Jun 8 13:00:23 2006
New Revision: 480
URL: https://mail.incase.de/viewcvs?rev=480&root=cyrus22&view=rev
Log:
Fix debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
Modified:
trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
Modified: 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=480&root=cyrus22&r1=479&r2=480&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch Thu Jun 8 13:00:23 2006
@@ -5,9 +5,9 @@
## DP: Upstream: don't lock/unlock_pop when reconstructing
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.ePF4Vj/cyrus-imapd-2.2.13/imap/mailbox.c
---- cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 12:53:50.000000000 +0200
-+++ /tmp/dpep.ePF4Vj/cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 12:54:52.768650474 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 12:59:59.000000000 +0200
++++ /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 13:00:01.083767966 +0200
@@ -1,5 +1,5 @@
/* mailbox.c -- Mailbox manipulation routines
- * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $
@@ -53,20 +53,3 @@
mailbox_unlock_index(mailbox);
mailbox_unlock_header(mailbox);
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c.rej /tmp/dpep.ePF4Vj/cyrus-imapd-2.2.13/imap/mailbox.c.rej
---- cyrus-imapd-2.2.13/imap/mailbox.c.rej 2006-06-08 12:53:49.000000000 +0200
-+++ /tmp/dpep.ePF4Vj/cyrus-imapd-2.2.13/imap/mailbox.c.rej 1970-01-01 01:00:00.000000000 +0100
-@@ -1,13 +0,0 @@
--***************
--*** 1,5 ****
-- /* mailbox.c -- Mailbox manipulation routines
--- * $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
----- 1,5 ----
-- /* mailbox.c -- Mailbox manipulation routines
--+ * $Id: mailbox.c,v 1.159 2005/04/07 00:25:52 shadow Exp $
-- * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list