1
Author: Joel Johnson <mrjoel@lixil.net>
2
Description: Change default Debian value in accordance with Debian Policy
4
Index: dovecot-1.2.8/dovecot-example.conf
5
===================================================================
6
--- dovecot-1.2.8.orig/dovecot-example.conf 2009-11-24 14:54:19.098525043 +0100
7
+++ dovecot-1.2.8/dovecot-example.conf 2009-11-24 14:54:57.578538078 +0100
9
# in is important to avoid deadlocks if other MTAs/MUAs are using multiple
10
# locking methods as well. Some operating systems don't allow using some of
11
# them simultaneously.
13
+# The Debian value for mbox_write_locks differs from upstream Dovecot. It is
14
+# changed to be compliant with Debian Policy (section 11.6) for NFS safety.
15
+# Dovecot: mbox_write_locks = dotlock fcntl
16
+# Debian: mbox_write_locks = fcntl dotlock
18
#mbox_read_locks = fcntl
19
-#mbox_write_locks = dotlock fcntl
20
+#mbox_write_locks = fcntl dotlock
22
# Maximum time in seconds to wait for lock (all of them) before aborting.
23
#mbox_lock_timeout = 300
24
Index: dovecot-1.2.8/src/master/master-settings.c
25
===================================================================
26
--- dovecot-1.2.8.orig/src/master/master-settings.c 2009-11-24 14:54:43.207545777 +0100
27
+++ dovecot-1.2.8/src/master/master-settings.c 2009-11-24 14:54:57.598541833 +0100
29
MEMBER(maildir_copy_preserve_filename) FALSE,
30
MEMBER(maildir_very_dirty_syncs) FALSE,
31
MEMBER(mbox_read_locks) "fcntl",
32
- MEMBER(mbox_write_locks) "dotlock fcntl",
33
+ MEMBER(mbox_write_locks) "fcntl dotlock",
34
MEMBER(mbox_lock_timeout) 300,
35
MEMBER(mbox_dotlock_change_timeout) 120,
36
MEMBER(mbox_min_index_size) 0,
37
@@ -1944,7 +1944,15 @@
38
const char *set_names[5];
41
- sets[0] = &default_settings;
42
+ /* Debian change - the Debian default for mbox_write_lock differs from
43
+ upstream Dovecot, however we still want 'dovecot -n' to report
44
+ based on Dovecot defaults to make it clear that the setting is
45
+ different, so we make a copy of the default_settings and force
46
+ it to report based on strict Dovecot defaults
48
+ struct settings dovecot_default_settings = default_settings;
49
+ dovecot_default_settings.mbox_write_locks = "dotlock fcntl";
50
+ sets[0] = &dovecot_default_settings;
51
sets[1] = set->defaults;