3
## DP: Change default Debian value in accordance with Debian Policy
4
## DP: Author: Joel Johnson <mrjoel@lixil.net>
10
diff -urN dovecot-1.2.1/dovecot-example.conf dovecot-1.2.1-debian/dovecot-example.conf
11
--- dovecot-1.2.1/dovecot-example.conf 2009-06-11 12:19:47.000000000 -0600
12
+++ dovecot-1.2.1-debian/dovecot-example.conf 2009-07-17 08:33:23.000000000 -0600
14
# in is important to avoid deadlocks if other MTAs/MUAs are using multiple
15
# locking methods as well. Some operating systems don't allow using some of
16
# them simultaneously.
18
+# The Debian value for mbox_write_locks differs from upstream Dovecot. It is
19
+# changed to be compliant with Debian Policy (section 11.6) for NFS safety.
20
+# Dovecot: mbox_write_locks = dotlock fcntl
21
+# Debian: mbox_write_locks = fcntl dotlock
23
#mbox_read_locks = fcntl
24
-#mbox_write_locks = dotlock fcntl
25
+#mbox_write_locks = fcntl dotlock
27
# Maximum time in seconds to wait for lock (all of them) before aborting.
28
#mbox_lock_timeout = 300
29
diff -urN dovecot-1.2.1/src/master/master-settings.c dovecot-1.2.1-debian/src/master/master-settings.c
30
--- dovecot-1.2.1/src/master/master-settings.c 2009-06-30 09:02:57.000000000 -0600
31
+++ dovecot-1.2.1-debian/src/master/master-settings.c 2009-07-17 08:37:05.000000000 -0600
33
MEMBER(maildir_copy_preserve_filename) FALSE,
34
MEMBER(maildir_very_dirty_syncs) FALSE,
35
MEMBER(mbox_read_locks) "fcntl",
36
- MEMBER(mbox_write_locks) "dotlock fcntl",
37
+ MEMBER(mbox_write_locks) "fcntl dotlock",
38
MEMBER(mbox_lock_timeout) 300,
39
MEMBER(mbox_dotlock_change_timeout) 120,
40
MEMBER(mbox_min_index_size) 0,
41
@@ -1822,7 +1822,15 @@
42
const char *set_names[4];
45
- sets[0] = &default_settings;
46
+ /* Debian change - the Debian default for mbox_write_lock differs from
47
+ upstream Dovecot, however we still want 'dovecot -n' to report
48
+ based on Dovecot defaults to make it clear that the setting is
49
+ different, so we make a copy of the default_settings and force
50
+ it to report based on strict Dovecot defaults
52
+ struct settings dovecot_default_settings = default_settings;
53
+ dovecot_default_settings.mbox_write_locks = "dotlock fcntl";
54
+ sets[0] = &dovecot_default_settings;
55
sets[1] = set->defaults;