diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2016-12-28 15:04:41 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2016-12-28 15:04:51 +0100 |
| commit | 35e3ea0966bcdf3483fc25e78a5e9e1887befe9b (patch) | |
| tree | bd4909d521dd22050f7b560e682ef7e2032b127e /pkgs | |
| parent | 442623e49918f0c6b5b7ee91e519ab38558ca032 (diff) | |
| download | nixpkgs-35e3ea0966bcdf3483fc25e78a5e9e1887befe9b.tar nixpkgs-35e3ea0966bcdf3483fc25e78a5e9e1887befe9b.tar.gz nixpkgs-35e3ea0966bcdf3483fc25e78a5e9e1887befe9b.tar.bz2 nixpkgs-35e3ea0966bcdf3483fc25e78a5e9e1887befe9b.tar.lz nixpkgs-35e3ea0966bcdf3483fc25e78a5e9e1887befe9b.tar.xz nixpkgs-35e3ea0966bcdf3483fc25e78a5e9e1887befe9b.tar.zst nixpkgs-35e3ea0966bcdf3483fc25e78a5e9e1887befe9b.zip | |
dovecot: 2.2.25 -> 2.2.27
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/mail/dovecot/2.2.x-module_dir.patch | 10 | ||||
| -rw-r--r-- | pkgs/servers/mail/dovecot/default.nix | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch index 66059cff6f7..1914933c558 100644 --- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch +++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch @@ -98,15 +98,15 @@ diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream 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) - memset(&mod_set, 0, sizeof(mod_set)); +@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r) mod_set.abi_version = DOVECOT_ABI_VERSION; 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("/etc/dovecot/modules", plugin_name, &mod_set); - - ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs"); - if (ssl_vfuncs == NULL) { + if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name, + &mod_set, error_r) < 0) + return -1; 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 diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 2be20323f25..36d45672150 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.2.25"; + name = "dovecot-2.2.27"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq"; + sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9"; }; preConfigure = '' |