public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dovecot: 2.2.25 -> 2.2.27

Browse Source
This commit is contained in:
Michael Raskin 2016-12-28 15:04:41 +01:00
parent 442623e499
commit 35e3ea0966
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
View File

@ -98,15 +98,15 @@ diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream
index a0659ab..dba3729 100644 index a0659ab..dba3729 100644
--- a/src/lib-ssl-iostream/iostream-ssl.c --- a/src/lib-ssl-iostream/iostream-ssl.c
+++ b/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) @@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r)
memset(&mod_set, 0, sizeof(mod_set));
mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.abi_version = DOVECOT_ABI_VERSION;
mod_set.setting_name = "<built-in lib-ssl-iostream lookup>"; mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
mod_set.require_init_funcs = TRUE;
- ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set); - ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
+ ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set); + ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set);
if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name,
ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs"); &mod_set, error_r) < 0)
if (ssl_vfuncs == NULL) { return -1;
diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index e2233bf..bbf981e 100644 index e2233bf..bbf981e 100644
--- a/src/lib-storage/mail-storage-settings.c --- a/src/lib-storage/mail-storage-settings.c

4
pkgs/servers/mail/dovecot/default.nix
View File

@ -8,7 +8,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dovecot-2.2.25"; name = "dovecot-2.2.27";
nativeBuildInputs = [ perl pkgconfig ]; nativeBuildInputs = [ perl pkgconfig ];
buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
sha256 = "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq"; sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9";
}; };
preConfigure = '' preConfigure = ''