tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
dovecot: 2.2.25 -> 2.2.27
Michael Raskin
9 years ago
35e3ea09
442623e4
+7
-7
2 changed files
expand all
collapse all
unified
split
pkgs
servers
mail
dovecot
2.2.x-module_dir.patch
default.nix
+5
-5
pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
···
98
98
index a0659ab..dba3729 100644
99
99
--- a/src/lib-ssl-iostream/iostream-ssl.c
100
100
+++ b/src/lib-ssl-iostream/iostream-ssl.c
101
101
-
@@ -29,7 +29,7 @@ static int ssl_module_load(const char **error_r)
102
102
-
memset(&mod_set, 0, sizeof(mod_set));
101
101
+
@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r)
103
102
mod_set.abi_version = DOVECOT_ABI_VERSION;
104
103
mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
104
104
+
mod_set.require_init_funcs = TRUE;
105
105
- ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
106
106
+ ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set);
107
107
-
108
108
-
ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
109
109
-
if (ssl_vfuncs == NULL) {
107
107
+
if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name,
108
108
+
&mod_set, error_r) < 0)
109
109
+
return -1;
110
110
diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
111
111
index e2233bf..bbf981e 100644
112
112
--- a/src/lib-storage/mail-storage-settings.c
+2
-2
pkgs/servers/mail/dovecot/default.nix
···
8
8
}:
9
9
10
10
stdenv.mkDerivation rec {
11
11
-
name = "dovecot-2.2.25";
11
11
+
name = "dovecot-2.2.27";
12
12
13
13
nativeBuildInputs = [ perl pkgconfig ];
14
14
buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
···
19
19
20
20
src = fetchurl {
21
21
url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
22
22
-
sha256 = "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq";
22
22
+
sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9";
23
23
};
24
24
25
25
preConfigure = ''