[dovecot/f12/master] - do not use dotlocking by default for deliver too (#629020)

[Michal Hlavinka]

commit c502e76cb9206b2c8b451b035c5e000c2ed6befb
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Mon Oct 25 17:26:59 2010 +0200

    - do not use dotlocking by default for deliver too (#629020)

 dovecot-1.1-default-settings.patch |   24 ++++++++++++++++++------
 dovecot.spec                       |    5 ++++-
 2 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/dovecot-1.1-default-settings.patch b/dovecot-1.1-default-settings.patch
index 674766b..2e92373 100644
--- a/dovecot-1.1-default-settings.patch
+++ b/dovecot-1.1-default-settings.patch
@@ -1,6 +1,6 @@
-diff -up dovecot-1.2.1/dovecot-example.conf.default-settings dovecot-1.2.1/dovecot-example.conf
---- dovecot-1.2.1/dovecot-example.conf.default-settings	2009-07-13 09:05:54.735890052 +0200
-+++ dovecot-1.2.1/dovecot-example.conf	2009-07-13 09:09:23.309020322 +0200
+diff -up dovecot-1.2.15/dovecot-example.conf.default-settings dovecot-1.2.15/dovecot-example.conf
+--- dovecot-1.2.15/dovecot-example.conf.default-settings	2010-10-25 17:03:23.850011480 +0200
++++ dovecot-1.2.15/dovecot-example.conf	2010-10-25 17:03:24.983144568 +0200
 @@ -10,18 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
  
@@ -58,9 +58,21 @@ diff -up dovecot-1.2.1/dovecot-example.conf.default-settings dovecot-1.2.1/dovec
  
  # Maximum time in seconds to wait for lock (all of them) before aborting.
  #mbox_lock_timeout = 300
-diff -up dovecot-1.2.1/src/master/master-settings.c.default-settings dovecot-1.2.1/src/master/master-settings.c
---- dovecot-1.2.1/src/master/master-settings.c.default-settings	2009-07-13 09:05:54.738890180 +0200
-+++ dovecot-1.2.1/src/master/master-settings.c	2009-07-13 09:05:54.742889890 +0200
+diff -up dovecot-1.2.15/src/lib-storage/index/mbox/mbox-lock.c.default-settings dovecot-1.2.15/src/lib-storage/index/mbox/mbox-lock.c
+--- dovecot-1.2.15/src/lib-storage/index/mbox/mbox-lock.c.default-settings	2010-10-25 17:22:23.462068993 +0200
++++ dovecot-1.2.15/src/lib-storage/index/mbox/mbox-lock.c	2010-10-25 17:22:38.083761285 +0200
+@@ -26,7 +26,7 @@
+ 
+ /* lock methods to use in wanted order */
+ #define DEFAULT_READ_LOCK_METHODS "fcntl"
+-#define DEFAULT_WRITE_LOCK_METHODS "dotlock fcntl"
++#define DEFAULT_WRITE_LOCK_METHODS "fcntl"
+ /* lock timeout */
+ #define MBOX_DEFAULT_LOCK_TIMEOUT (5*60)
+ /* assume stale dotlock if mbox file hasn't changed for n seconds */
+diff -up dovecot-1.2.15/src/master/master-settings.c.default-settings dovecot-1.2.15/src/master/master-settings.c
+--- dovecot-1.2.15/src/master/master-settings.c.default-settings	2010-10-25 17:03:23.854011949 +0200
++++ dovecot-1.2.15/src/master/master-settings.c	2010-10-25 17:03:24.989145273 +0200
 @@ -178,8 +178,8 @@ struct settings default_settings = {
  	MEMBER(syslog_facility) "mail",
  
diff --git a/dovecot.spec b/dovecot.spec
index 5d591eb..121aff1 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
 License: MIT and LGPLv2 and GPLv2+
 Group: System Environment/Daemons
@@ -361,6 +361,9 @@ fi
 
 
 %changelog
+* Mon Oct 25 2010 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.15-2
+- do not use dotlocking by default for deliver too (#629020)
+
 * Tue Oct 05 2010 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.15-1
 - updated to dovecot 1.2.15, sieve 0.1.18, managesieve 0.11.12
 - acl: Fixed the logic of merging multiple ACL entries