alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch

123 lines
4.6 KiB
Diff
Raw Normal View History

dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
diff --git a/src/auth/main.c b/src/auth/main.c
index 5a87c57..74bff52 100644
--- a/src/auth/main.c
+++ b/src/auth/main.c
@@ -194,7 +194,7 @@ static void main_preinit(void)
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
mod_set.debug = global_auth_settings->debug;
mod_set.filter_callback = auth_module_filter;
- modules = module_dir_load(AUTH_MODULE_DIR, NULL, &mod_set);
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ modules = module_dir_load("/etc/dovecot/modules/auth", NULL, &mod_set);
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
module_dir_init(modules);
if (!worker)
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
@@ -225,7 +225,7 @@ void auth_module_load(const char *names)
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
mod_set.debug = global_auth_settings->debug;
mod_set.ignore_missing = TRUE;
- modules = module_dir_load_missing(modules, AUTH_MODULE_DIR, names,
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ modules = module_dir_load_missing(modules, "/etc/dovecot/modules/auth", names,
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
&mod_set);
module_dir_init(modules);
}
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
diff --git a/src/config/all-settings.c b/src/config/all-settings.c
index de223a5..2df2d21 100644
--- a/src/config/all-settings.c
+++ b/src/config/all-settings.c
@@ -836,7 +836,7 @@ static const struct mail_user_settings mail_user_default_settings = {
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
.last_valid_gid = 0,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ .mail_plugin_dir = "/etc/dovecot/modules",
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
.mail_log_prefix = "%s(%u): ",
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
@@ -3545,7 +3545,7 @@ const struct doveadm_settings doveadm_default_settings = {
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
.base_dir = PKG_RUNDIR,
.libexec_dir = PKG_LIBEXECDIR,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ .mail_plugin_dir = "/etc/dovecot/modules",
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
.auth_debug = FALSE,
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
.auth_socket_path = "auth-userdb",
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
.doveadm_socket_path = "doveadm-server",
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index 2a5009a..134f92b 100644
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -1047,7 +1047,7 @@ void config_parse_load_modules(void)
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
memset(&mod_set, 0, sizeof(mod_set));
mod_set.abi_version = DOVECOT_ABI_VERSION;
- modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set);
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ modules = module_dir_load("/etc/dovecot/modules/settings", NULL, &mod_set);
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
module_dir_init(modules);
i_array_init(&new_roots, 64);
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
diff --git a/src/dict/main.c b/src/dict/main.c
index e6c945e..06ad6c5 100644
--- a/src/dict/main.c
+++ b/src/dict/main.c
@@ -62,7 +62,7 @@ static void main_init(void)
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
mod_set.abi_version = DOVECOT_ABI_VERSION;
mod_set.require_init_funcs = TRUE;
- modules = module_dir_load(DICT_MODULE_DIR, NULL, &mod_set);
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ modules = module_dir_load("/etc/dovecot/modules/dict", NULL, &mod_set);
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
module_dir_init(modules);
/* Register only after loading modules. They may contain SQL drivers,
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index df12284..19c18da 100644
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -81,7 +81,7 @@ const struct doveadm_settings doveadm_default_settings = {
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
.base_dir = PKG_RUNDIR,
.libexec_dir = PKG_LIBEXECDIR,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ .mail_plugin_dir = "/etc/dovecot/modules",
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
.auth_debug = FALSE,
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
.auth_socket_path = "auth-userdb",
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
.doveadm_socket_path = "doveadm-server",
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c
index b50fbe0..ace3aff 100644
--- a/src/lib-fs/fs-api.c
+++ b/src/lib-fs/fs-api.c
@@ -114,7 +114,7 @@ static void fs_class_try_load_plugin(const char *driver)
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
mod_set.abi_version = DOVECOT_ABI_VERSION;
mod_set.ignore_missing = TRUE;
- fs_modules = module_dir_load_missing(fs_modules, MODULE_DIR,
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ fs_modules = module_dir_load_missing(fs_modules, "/etc/dovecot/modules",
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
module_name, &mod_set);
module_dir_init(fs_modules);
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c
index a0659ab..dba3729 100644
--- a/src/lib-ssl-iostream/iostream-ssl.c
+++ b/src/lib-ssl-iostream/iostream-ssl.c
@@ -29,7 +29,7 @@ static int ssl_module_load(const char **error_r)
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
memset(&mod_set, 0, sizeof(mod_set));
mod_set.abi_version = DOVECOT_ABI_VERSION;
mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
- ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set);
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
if (ssl_vfuncs == NULL) {
dovecot: 2.2.21 -> 2.2.24
2016-05-02 21:20:52 +01:00
diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index e2233bf..bbf981e 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -274,7 +274,7 @@ static const struct mail_user_settings mail_user_default_settings = {
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
.last_valid_gid = 0,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
dovecot22: move modules dir to /etc
2016-01-09 13:37:28 +00:00
+ .mail_plugin_dir = "/etc/dovecot/modules",
dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package.
2013-07-15 13:48:34 +01:00
.mail_log_prefix = "%s(%u): ",
Copy permalink