git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65371 from Izorkin/dovecot

dovecot: 2.3.7 > 2.3.7.1

commit2d9b5fa47e51522c505516f20b18e47523fd515f authorPeter Simons <simons@cryp.to> dateSat 27 Jul 2019, 18:17 (7 years ago) parentf9b3cf84f38967
3 files changed+37−24
pkgs/servers/mail/dovecot/2.2.x-module_dir.patch+33−20 pkgs/servers/mail/dovecot/default.nix+2−2 pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix+2−2
pkgs/servers/mail/dovecot/2.2.x-module_dir.patch+33−20
@@ -1,8 +1,8 @@
11diff --git a/src/auth/main.c b/src/auth/main.c
2−index 5a87c57..74bff52 100644
2+index 2dbf9e1..b1e778a 100644
33--- a/src/auth/main.c
44+++ b/src/auth/main.c
5−@@ -194,7 +194,7 @@ static void main_preinit(void)
5+@@ -192,7 +192,7 @@ static void main_preinit(void)
66 mod_set.debug = global_auth_settings->debug;
77 mod_set.filter_callback = auth_module_filter;
88
@@ -11,7 +11,7 @@ index 5a87c57..74bff52 100644
1111 module_dir_init(modules);
1212
1313 if (!worker)
14−@@ -225,7 +225,7 @@ void auth_module_load(const char *names)
14+@@ -223,7 +223,7 @@ void auth_module_load(const char *names)
1515 mod_set.debug = global_auth_settings->debug;
1616 mod_set.ignore_missing = TRUE;
1717
@@ -21,19 +21,19 @@ index 5a87c57..74bff52 100644
2121 module_dir_init(modules);
2222 }
2323diff --git a/src/config/all-settings.c b/src/config/all-settings.c
24−index de223a5..2df2d21 100644
24+index 4a2ab53..5057d63 100644
2525--- a/src/config/all-settings.c
2626+++ b/src/config/all-settings.c
27−@@ -836,7 +836,7 @@ static const struct mail_user_settings mail_user_default_settings = {
27+@@ -1079,7 +1079,7 @@ static const struct mail_user_settings mail_user_default_settings = {
2828 .last_valid_gid = 0,
2929
3030 .mail_plugins = "",
3131- .mail_plugin_dir = MODULEDIR,
3232+ .mail_plugin_dir = "/etc/dovecot/modules",
3333
34− .mail_log_prefix = "%s(%u): ",
34+ .mail_log_prefix = "%s(%u)<%{pid}><%{session}>: ",
3535
36−@@ -3545,7 +3545,7 @@ const struct doveadm_settings doveadm_default_settings = {
36+@@ -4723,7 +4723,7 @@ const struct doveadm_settings doveadm_default_settings = {
3737 .base_dir = PKG_RUNDIR,
3838 .libexec_dir = PKG_LIBEXECDIR,
3939 .mail_plugins = "",
@@ -43,12 +43,12 @@ index de223a5..2df2d21 100644
4343 .auth_socket_path = "auth-userdb",
4444 .doveadm_socket_path = "doveadm-server",
4545diff --git a/src/config/config-parser.c b/src/config/config-parser.c
46−index 2a5009a..134f92b 100644
46+index 6894123..07e9fec 100644
4747--- a/src/config/config-parser.c
4848+++ b/src/config/config-parser.c
49−@@ -1047,7 +1047,7 @@ void config_parse_load_modules(void)
49+@@ -1077,7 +1077,7 @@ void config_parse_load_modules(void)
5050
51− memset(&mod_set, 0, sizeof(mod_set));
51+ i_zero(&mod_set);
5252 mod_set.abi_version = DOVECOT_ABI_VERSION;
5353- modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set);
5454+ modules = module_dir_load("/etc/dovecot/modules/settings", NULL, &mod_set);
@@ -56,10 +56,10 @@ index 2a5009a..134f92b 100644
5656
5757 i_array_init(&new_roots, 64);
5858diff --git a/src/dict/main.c b/src/dict/main.c
59−index e6c945e..06ad6c5 100644
59+index 722ed02..4ed12ae 100644
6060--- a/src/dict/main.c
6161+++ b/src/dict/main.c
62−@@ -62,7 +62,7 @@ static void main_init(void)
62+@@ -104,7 +104,7 @@ static void main_init(void)
6363 mod_set.abi_version = DOVECOT_ABI_VERSION;
6464 mod_set.require_init_funcs = TRUE;
6565
@@ -69,10 +69,10 @@ index e6c945e..06ad6c5 100644
6969
7070 /* Register only after loading modules. They may contain SQL drivers,
7171diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
72−index df12284..19c18da 100644
72+index 88da40c..141ed05 100644
7373--- a/src/doveadm/doveadm-settings.c
7474+++ b/src/doveadm/doveadm-settings.c
75−@@ -81,7 +81,7 @@ const struct doveadm_settings doveadm_default_settings = {
75+@@ -86,7 +86,7 @@ const struct doveadm_settings doveadm_default_settings = {
7676 .base_dir = PKG_RUNDIR,
7777 .libexec_dir = PKG_LIBEXECDIR,
7878 .mail_plugins = "",
@@ -82,7 +82,7 @@ index df12284..19c18da 100644
8282 .auth_socket_path = "auth-userdb",
8383 .doveadm_socket_path = "doveadm-server",
8484diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c
85−index b50fbe0..ace3aff 100644
85+index a939f61..846cf86 100644
8686--- a/src/lib-fs/fs-api.c
8787+++ b/src/lib-fs/fs-api.c
8888@@ -114,7 +114,7 @@ static void fs_class_try_load_plugin(const char *driver)
@@ -95,10 +95,10 @@ index b50fbe0..ace3aff 100644
9595 module_dir_init(fs_modules);
9696
9797diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c
98−index a0659ab..dba3729 100644
98+index f857ec9..0d1023b 100644
9999--- a/src/lib-ssl-iostream/iostream-ssl.c
100100+++ b/src/lib-ssl-iostream/iostream-ssl.c
101−@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r)
101+@@ -53,7 +53,7 @@ int ssl_module_load(const char **error_r)
102102 mod_set.abi_version = DOVECOT_ABI_VERSION;
103103 mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
104104 mod_set.require_init_funcs = TRUE;
@@ -108,15 +108,28 @@ index a0659ab..dba3729 100644
108108 &mod_set, error_r) < 0)
109109 return -1;
110110diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
111−index e2233bf..bbf981e 100644
111+index b314b52..7055094 100644
112112--- a/src/lib-storage/mail-storage-settings.c
113113+++ b/src/lib-storage/mail-storage-settings.c
114−@@ -274,7 +274,7 @@ static const struct mail_user_settings mail_user_default_settings = {
114+@@ -337,7 +337,7 @@ static const struct mail_user_settings mail_user_default_settings = {
115115 .last_valid_gid = 0,
116116
117117 .mail_plugins = "",
118118- .mail_plugin_dir = MODULEDIR,
119119+ .mail_plugin_dir = "/etc/dovecot/modules",
120120
121− .mail_log_prefix = "%s(%u): ",
121+ .mail_log_prefix = "%s(%u)<%{pid}><%{session}>: ",
122122
123+diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
124+index 1666ec9..8a27200 100644
125+--- a/src/lmtp/lmtp-settings.c
126++++ b/src/lmtp/lmtp-settings.c
127+@@ -89,7 +89,7 @@ static const struct lmtp_settings lmtp_default_settings = {
128+ .login_trusted_networks = "",
129+
130+ .mail_plugins = "",
131+- .mail_plugin_dir = MODULEDIR,
132++ .mail_plugin_dir = "/etc/dovecot/modules",
133+ };
134+
135+ static const struct setting_parser_info *lmtp_setting_dependencies[] = {
pkgs/servers/mail/dovecot/default.nix+2−2
@@ -9,7 +9,7 @@
99}:
1010
1111stdenv.mkDerivation rec {
12− name = "dovecot-2.3.7";
12+ name = "dovecot-2.3.7.1";
1313
1414 nativeBuildInputs = [ perl pkgconfig ];
1515 buildInputs =
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 src = fetchurl {
2323 url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
24− sha256 = "1al382ykm94if5agasb9h2442a8s7wn43hlwh292ir1rhnp5dq8i";
24+ sha256 = "1hq333vj4px4xa9djl8c1v3c8rac98v2mrb9vx1wisg6frpiv9f5";
2525 };
2626
2727 enableParallelBuilding = true;
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "dovecot-pigeonhole-${version}";
5− version = "0.5.6";
5+ version = "0.5.7.1";
66
77 src = fetchurl {
88 url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
9− sha256 = "1f7m2213w4hvqr3lvr03bv4lh92k35gxl01c2x8q8akk7viffbvw";
9+ sha256 = "0a10mam68pmdh3fw8fnv5jff6xj1k770hvadym2c39vm3x6b4w1j";
1010 };
1111
1212 buildInputs = [ dovecot openssl ];