pyrox.dev
1diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
2--- dovecot-2.2.12-orig/src/auth/main.c 2014-02-11 23:23:37.000000000 +0100
3+++ dovecot-2.2.12/src/auth/main.c 2014-03-14 09:28:17.642334838 +0100
4@@ -193,7 +193,7 @@
5 mod_set.debug = global_auth_settings->debug;
6 mod_set.filter_callback = auth_module_filter;
7
8- modules = module_dir_load(AUTH_MODULE_DIR, NULL, &mod_set);
9+ modules = module_dir_load("/var/lib/dovecot/modules/auth", NULL, &mod_set);
10 module_dir_init(modules);
11
12 if (!worker)
13@@ -223,7 +223,7 @@
14 mod_set.debug = global_auth_settings->debug;
15 mod_set.ignore_missing = TRUE;
16
17- modules = module_dir_load_missing(modules, AUTH_MODULE_DIR, names,
18+ modules = module_dir_load_missing(modules, "/var/lib/dovecot/modules/auth", names,
19 &mod_set);
20 module_dir_init(modules);
21 }
22diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config/all-settings.c
23--- dovecot-2.2.12-orig/src/config/all-settings.c 2014-02-11 23:31:37.000000000 +0100
24+++ dovecot-2.2.12/src/config/all-settings.c 2014-03-14 09:32:08.907608311 +0100
25@@ -773,7 +773,7 @@
26 .last_valid_gid = 0,
27
28 .mail_plugins = "",
29- .mail_plugin_dir = MODULEDIR,
30+ .mail_plugin_dir = "/var/lib/dovecot/modules",
31
32 .mail_log_prefix = "%s(%u): ",
33
34@@ -3304,7 +3304,7 @@
35 .base_dir = PKG_RUNDIR,
36 .libexec_dir = PKG_LIBEXECDIR,
37 .mail_plugins = "",
38- .mail_plugin_dir = MODULEDIR,
39+ .mail_plugin_dir = "/var/lib/dovecot/modules",
40 .auth_socket_path = "auth-userdb",
41 .doveadm_socket_path = "doveadm-server",
42 .doveadm_worker_count = 0,
43Only in dovecot-2.2.12/src/config: all-settings.c.orig
44diff -ur dovecot-2.2.12-orig/src/config/config-parser.c dovecot-2.2.12/src/config/config-parser.c
45--- dovecot-2.2.12-orig/src/config/config-parser.c 2014-02-11 23:23:37.000000000 +0100
46+++ dovecot-2.2.12/src/config/config-parser.c 2014-03-14 09:28:17.645334840 +0100
47@@ -990,7 +990,7 @@
48
49 memset(&mod_set, 0, sizeof(mod_set));
50 mod_set.abi_version = DOVECOT_ABI_VERSION;
51- modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set);
52+ modules = module_dir_load("/var/lib/dovecot/modules/settings", NULL, &mod_set);
53 module_dir_init(modules);
54
55 i_array_init(&new_roots, 64);
56diff -ur dovecot-2.2.12-orig/src/dict/main.c dovecot-2.2.12/src/dict/main.c
57--- dovecot-2.2.12-orig/src/dict/main.c 2014-02-11 23:23:37.000000000 +0100
58+++ dovecot-2.2.12/src/dict/main.c 2014-03-14 09:28:17.645334840 +0100
59@@ -61,7 +61,7 @@
60 mod_set.abi_version = DOVECOT_ABI_VERSION;
61 mod_set.require_init_funcs = TRUE;
62
63- modules = module_dir_load(DICT_MODULE_DIR, NULL, &mod_set);
64+ modules = module_dir_load("/var/lib/dovecot/modules/dict", NULL, &mod_set);
65 module_dir_init(modules);
66
67 /* Register only after loading modules. They may contain SQL drivers,
68diff -ur dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c dovecot-2.2.12/src/doveadm/doveadm-settings.c
69--- dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c 2014-02-11 23:23:37.000000000 +0100
70+++ dovecot-2.2.12/src/doveadm/doveadm-settings.c 2014-03-14 09:32:56.540087069 +0100
71@@ -77,7 +77,7 @@
72 .base_dir = PKG_RUNDIR,
73 .libexec_dir = PKG_LIBEXECDIR,
74 .mail_plugins = "",
75- .mail_plugin_dir = MODULEDIR,
76+ .mail_plugin_dir = "/var/lib/dovecot/modules",
77 .auth_socket_path = "auth-userdb",
78 .doveadm_socket_path = "doveadm-server",
79 .doveadm_worker_count = 0,
80Only in dovecot-2.2.12/src/doveadm: doveadm-settings.c.orig
81diff -ur dovecot-2.2.12-orig/src/lib-fs/fs-api.c dovecot-2.2.12/src/lib-fs/fs-api.c
82--- dovecot-2.2.12-orig/src/lib-fs/fs-api.c 2014-02-11 23:23:37.000000000 +0100
83+++ dovecot-2.2.12/src/lib-fs/fs-api.c 2014-03-14 09:28:17.646334843 +0100
84@@ -89,7 +89,7 @@
85 mod_set.abi_version = DOVECOT_ABI_VERSION;
86 mod_set.ignore_missing = TRUE;
87
88- fs_modules = module_dir_load_missing(fs_modules, MODULE_DIR,
89+ fs_modules = module_dir_load_missing(fs_modules, "/var/lib/dovecot/modules",
90 module_name, &mod_set);
91 module_dir_init(fs_modules);
92
93Only in dovecot-2.2.12/src/lib-fs: fs-api.c.orig
94diff -ur dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.12/src/lib-ssl-iostream/iostream-ssl.c
95--- dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c 2014-02-11 23:23:37.000000000 +0100
96+++ dovecot-2.2.12/src/lib-ssl-iostream/iostream-ssl.c 2014-03-14 09:28:17.646334843 +0100
97@@ -30,7 +30,7 @@
98 memset(&mod_set, 0, sizeof(mod_set));
99 mod_set.abi_version = DOVECOT_ABI_VERSION;
100 mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
101- ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
102+ ssl_module = module_dir_load("/var/lib/dovecot/modules", plugin_name, &mod_set);
103
104 ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
105 if (ssl_vfuncs == NULL) {
106Only in dovecot-2.2.12/src/lib-ssl-iostream: iostream-ssl.c.orig
107diff -ur dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.12/src/lib-storage/mail-storage-settings.c
108--- dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c 2014-02-11 23:23:37.000000000 +0100
109+++ dovecot-2.2.12/src/lib-storage/mail-storage-settings.c 2014-03-14 09:28:17.646334843 +0100
110@@ -262,7 +262,7 @@
111 .last_valid_gid = 0,
112
113 .mail_plugins = "",
114- .mail_plugin_dir = MODULEDIR,
115+ .mail_plugin_dir = "/var/lib/dovecot/modules",
116
117 .mail_log_prefix = "%s(%u): ",
118
119Only in dovecot-2.2.12/src/lib-storage: mail-storage-settings.c.orig