jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2ae2c92b13
nixpkgs/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch

120 lines
5.2 KiB
Diff
Raw Normal View History

dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
--- dovecot-2.2.12-orig/src/auth/main.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.12/src/auth/main.c 2014-03-14 09:28:17.642334838 +0100
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 12:48:34 +00:00
@@ -193,7 +193,7 @@
mod_set.debug = global_auth_settings->debug;
mod_set.filter_callback = auth_module_filter;
- modules = module_dir_load(AUTH_MODULE_DIR, NULL, &mod_set);
+ modules = module_dir_load("/var/lib/dovecot/modules/auth", NULL, &mod_set);
module_dir_init(modules);
if (!worker)
@@ -223,7 +223,7 @@
mod_set.debug = global_auth_settings->debug;
mod_set.ignore_missing = TRUE;
- modules = module_dir_load_missing(modules, AUTH_MODULE_DIR, names,
+ modules = module_dir_load_missing(modules, "/var/lib/dovecot/modules/auth", names,
&mod_set);
module_dir_init(modules);
}
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config/all-settings.c
--- dovecot-2.2.12-orig/src/config/all-settings.c 2014-02-11 23:31:37.000000000 +0100
+++ dovecot-2.2.12/src/config/all-settings.c 2014-03-14 09:32:08.907608311 +0100
@@ -773,7 +773,7 @@
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 12:48:34 +00:00
.last_valid_gid = 0,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules",
.mail_log_prefix = "%s(%u): ",
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
@@ -3304,7 +3304,7 @@
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 12:48:34 +00:00
.base_dir = PKG_RUNDIR,
.libexec_dir = PKG_LIBEXECDIR,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules",
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 12:48:34 +00:00
.doveadm_socket_path = "doveadm-server",
.doveadm_worker_count = 0,
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
Only in dovecot-2.2.12/src/config: all-settings.c.orig
diff -ur dovecot-2.2.12-orig/src/config/config-parser.c dovecot-2.2.12/src/config/config-parser.c
--- dovecot-2.2.12-orig/src/config/config-parser.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.12/src/config/config-parser.c 2014-03-14 09:28:17.645334840 +0100
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 12:48:34 +00:00
@@ -990,7 +990,7 @@
memset(&mod_set, 0, sizeof(mod_set));
mod_set.abi_version = DOVECOT_ABI_VERSION;
- modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set);
+ modules = module_dir_load("/var/lib/dovecot/modules/settings", NULL, &mod_set);
module_dir_init(modules);
i_array_init(&new_roots, 64);
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
diff -ur dovecot-2.2.12-orig/src/dict/main.c dovecot-2.2.12/src/dict/main.c
--- dovecot-2.2.12-orig/src/dict/main.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.12/src/dict/main.c 2014-03-14 09:28:17.645334840 +0100
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 12:48:34 +00:00
@@ -61,7 +61,7 @@
mod_set.abi_version = DOVECOT_ABI_VERSION;
mod_set.require_init_funcs = TRUE;
- modules = module_dir_load(DICT_MODULE_DIR, NULL, &mod_set);
+ modules = module_dir_load("/var/lib/dovecot/modules/dict", NULL, &mod_set);
module_dir_init(modules);
/* Register only after loading modules. They may contain SQL drivers,
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
diff -ur dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c dovecot-2.2.12/src/doveadm/doveadm-settings.c
--- dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.12/src/doveadm/doveadm-settings.c 2014-03-14 09:32:56.540087069 +0100
@@ -77,7 +77,7 @@
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 12:48:34 +00:00
.base_dir = PKG_RUNDIR,
.libexec_dir = PKG_LIBEXECDIR,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules",
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 12:48:34 +00:00
.doveadm_socket_path = "doveadm-server",
.doveadm_worker_count = 0,
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
Only in dovecot-2.2.12/src/doveadm: doveadm-settings.c.orig
diff -ur dovecot-2.2.12-orig/src/lib-fs/fs-api.c dovecot-2.2.12/src/lib-fs/fs-api.c
--- dovecot-2.2.12-orig/src/lib-fs/fs-api.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.12/src/lib-fs/fs-api.c 2014-03-14 09:28:17.646334843 +0100
@@ -89,7 +89,7 @@
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 12:48:34 +00:00
mod_set.abi_version = DOVECOT_ABI_VERSION;
mod_set.ignore_missing = TRUE;
- fs_modules = module_dir_load_missing(fs_modules, MODULE_DIR,
+ fs_modules = module_dir_load_missing(fs_modules, "/var/lib/dovecot/modules",
module_name, &mod_set);
module_dir_init(fs_modules);
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
Only in dovecot-2.2.12/src/lib-fs: fs-api.c.orig
diff -ur dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.12/src/lib-ssl-iostream/iostream-ssl.c
--- dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.12/src/lib-ssl-iostream/iostream-ssl.c 2014-03-14 09:28:17.646334843 +0100
@@ -30,7 +30,7 @@
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 12:48:34 +00: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);
+ ssl_module = module_dir_load("/var/lib/dovecot/modules", plugin_name, &mod_set);
ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
if (ssl_vfuncs == NULL) {
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
Only in dovecot-2.2.12/src/lib-ssl-iostream: iostream-ssl.c.orig
diff -ur dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.12/src/lib-storage/mail-storage-settings.c
--- dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.12/src/lib-storage/mail-storage-settings.c 2014-03-14 09:28:17.646334843 +0100
@@ -262,7 +262,7 @@
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 12:48:34 +00:00
.last_valid_gid = 0,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules",
.mail_log_prefix = "%s(%u): ",
dovecot22: Update from 2.2.6 to 2.2.12
2014-03-14 09:34:21 +00:00
Only in dovecot-2.2.12/src/lib-storage: mail-storage-settings.c.orig
Reference in New Issue Copy Permalink