diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2014-03-14 10:34:21 +0100 |
---|---|---|
committer | Rickard Nilsson <rickynils@gmail.com> | 2014-03-14 10:34:21 +0100 |
commit | 191bd1c26a3e88938dd34e34c5b0c764adf45f0a (patch) | |
tree | a1eacd1e28d4a6b3e0c55c51490bf7ec5ac9a6d9 /pkgs/servers | |
parent | 147e6ed4c96d290cd01944d3293712410709ea09 (diff) | |
download | nixlib-191bd1c26a3e88938dd34e34c5b0c764adf45f0a.tar nixlib-191bd1c26a3e88938dd34e34c5b0c764adf45f0a.tar.gz nixlib-191bd1c26a3e88938dd34e34c5b0c764adf45f0a.tar.bz2 nixlib-191bd1c26a3e88938dd34e34c5b0c764adf45f0a.tar.lz nixlib-191bd1c26a3e88938dd34e34c5b0c764adf45f0a.tar.xz nixlib-191bd1c26a3e88938dd34e34c5b0c764adf45f0a.tar.zst nixlib-191bd1c26a3e88938dd34e34c5b0c764adf45f0a.zip |
dovecot22: Update from 2.2.6 to 2.2.12
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/mail/dovecot/2.2.x-module_dir.patch | 69 | ||||
-rw-r--r-- | pkgs/servers/mail/dovecot/2.2.x.nix | 4 |
2 files changed, 39 insertions, 34 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 cce63fe250c6..3ba11d41b1bd 100644 --- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch +++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch @@ -1,6 +1,6 @@ -diff -ur dovecot-2.2.2-orig/src/auth/main.c dovecot-2.2.2/src/auth/main.c ---- dovecot-2.2.2-orig/src/auth/main.c 2013-03-13 15:26:46.000000000 +0100 -+++ dovecot-2.2.2/src/auth/main.c 2013-05-20 20:23:58.126024535 +0200 +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 @@ -193,7 +193,7 @@ mod_set.debug = global_auth_settings->debug; mod_set.filter_callback = auth_module_filter; @@ -19,10 +19,10 @@ diff -ur dovecot-2.2.2-orig/src/auth/main.c dovecot-2.2.2/src/auth/main.c &mod_set); module_dir_init(modules); } -diff -ur dovecot-2.2.2-orig/src/config/all-settings.c dovecot-2.2.2/src/config/all-settings.c ---- dovecot-2.2.2-orig/src/config/all-settings.c 2013-05-15 12:20:55.000000000 +0200 -+++ dovecot-2.2.2/src/config/all-settings.c 2013-05-21 00:31:46.624073562 +0200 -@@ -766,7 +766,7 @@ +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 @@ .last_valid_gid = 0, .mail_plugins = "", @@ -31,18 +31,19 @@ diff -ur dovecot-2.2.2-orig/src/config/all-settings.c dovecot-2.2.2/src/config/a .mail_log_prefix = "%s(%u): ", -@@ -3274,7 +3274,7 @@ +@@ -3304,7 +3304,7 @@ .base_dir = PKG_RUNDIR, .libexec_dir = PKG_LIBEXECDIR, .mail_plugins = "", - .mail_plugin_dir = MODULEDIR, + .mail_plugin_dir = "/var/lib/dovecot/modules", + .auth_socket_path = "auth-userdb", .doveadm_socket_path = "doveadm-server", .doveadm_worker_count = 0, - .doveadm_port = 0, -diff -ur dovecot-2.2.2-orig/src/config/config-parser.c dovecot-2.2.2/src/config/config-parser.c ---- dovecot-2.2.2-orig/src/config/config-parser.c 2013-02-04 22:05:42.000000000 +0100 -+++ dovecot-2.2.2/src/config/config-parser.c 2013-05-20 20:23:58.106024534 +0200 +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 @@ -990,7 +990,7 @@ memset(&mod_set, 0, sizeof(mod_set)); @@ -52,9 +53,9 @@ diff -ur dovecot-2.2.2-orig/src/config/config-parser.c dovecot-2.2.2/src/config/ module_dir_init(modules); i_array_init(&new_roots, 64); -diff -ur dovecot-2.2.2-orig/src/dict/main.c dovecot-2.2.2/src/dict/main.c ---- dovecot-2.2.2-orig/src/dict/main.c 2013-02-04 22:05:42.000000000 +0100 -+++ dovecot-2.2.2/src/dict/main.c 2013-05-20 20:23:58.101024534 +0200 +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 @@ -61,7 +61,7 @@ mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.require_init_funcs = TRUE; @@ -64,22 +65,23 @@ diff -ur dovecot-2.2.2-orig/src/dict/main.c dovecot-2.2.2/src/dict/main.c module_dir_init(modules); /* Register only after loading modules. They may contain SQL drivers, -diff -ur dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c dovecot-2.2.2/src/doveadm/doveadm-settings.c ---- dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c 2013-04-07 19:13:06.000000000 +0200 -+++ dovecot-2.2.2/src/doveadm/doveadm-settings.c 2013-05-20 20:23:58.399024539 +0200 -@@ -76,7 +76,7 @@ +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 @@ .base_dir = PKG_RUNDIR, .libexec_dir = PKG_LIBEXECDIR, .mail_plugins = "", - .mail_plugin_dir = MODULEDIR, + .mail_plugin_dir = "/var/lib/dovecot/modules", + .auth_socket_path = "auth-userdb", .doveadm_socket_path = "doveadm-server", .doveadm_worker_count = 0, - .doveadm_port = 0, -diff -ur dovecot-2.2.2-orig/src/lib-fs/fs-api.c dovecot-2.2.2/src/lib-fs/fs-api.c ---- dovecot-2.2.2-orig/src/lib-fs/fs-api.c 2013-04-18 16:07:26.000000000 +0200 -+++ dovecot-2.2.2/src/lib-fs/fs-api.c 2013-05-20 20:23:58.099024534 +0200 -@@ -82,7 +82,7 @@ +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 @@ mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.ignore_missing = TRUE; @@ -88,10 +90,11 @@ diff -ur dovecot-2.2.2-orig/src/lib-fs/fs-api.c dovecot-2.2.2/src/lib-fs/fs-api. module_name, &mod_set); module_dir_init(fs_modules); -diff -ur dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c ---- dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c 2013-04-09 22:45:19.000000000 +0200 -+++ dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c 2013-05-20 20:23:58.089024534 +0200 -@@ -28,7 +28,7 @@ +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 @@ memset(&mod_set, 0, sizeof(mod_set)); mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.setting_name = "<built-in lib-ssl-iostream lookup>"; @@ -100,10 +103,11 @@ diff -ur dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.2/sr ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs"); if (ssl_vfuncs == NULL) { -diff -ur dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.2/src/lib-storage/mail-storage-settings.c ---- dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c 2013-05-15 12:20:00.000000000 +0200 -+++ dovecot-2.2.2/src/lib-storage/mail-storage-settings.c 2013-05-20 20:23:57.858024531 +0200 -@@ -260,7 +260,7 @@ +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 @@ .last_valid_gid = 0, .mail_plugins = "", @@ -112,3 +116,4 @@ diff -ur dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2. .mail_log_prefix = "%s(%u): ", +Only in dovecot-2.2.12/src/lib-storage: mail-storage-settings.c.orig diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index 06635e33954f..2b1aca3e9269 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -2,13 +2,13 @@ , inotifyTools }: stdenv.mkDerivation rec { - name = "dovecot-2.2.6"; + name = "dovecot-2.2.12"; buildInputs = [perl systemd openssl pam bzip2 zlib openldap inotifyTools]; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "1rfnsg0a57cv02pl68h3jhbd5v3071a75bvf9gs95fd41g72n9v2"; + sha256 = "0mlcwgrxfwy1fqfk3wwbh1h9f0jddg4rnj612ckj1zv5asp1rppk"; }; preConfigure = '' |