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

dovecot22: Update from 2.2.6 to 2.2.12

Browse Source
This commit is contained in:
Rickard Nilsson 2014-03-14 10:34:21 +01:00
parent 147e6ed4c9
commit 191bd1c26a
2 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
diff -ur dovecot-2.2.2-orig/src/auth/main.c dovecot-2.2.2/src/auth/main.c diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
--- dovecot-2.2.2-orig/src/auth/main.c 2013-03-13 15:26:46.000000000 +0100 --- dovecot-2.2.12-orig/src/auth/main.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.2/src/auth/main.c 2013-05-20 20:23:58.126024535 +0200 +++ dovecot-2.2.12/src/auth/main.c 2014-03-14 09:28:17.642334838 +0100
@@ -193,7 +193,7 @@ @@ -193,7 +193,7 @@
mod_set.debug = global_auth_settings->debug; mod_set.debug = global_auth_settings->debug;
mod_set.filter_callback = auth_module_filter; 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); &mod_set);
module_dir_init(modules); 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 diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/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.12-orig/src/config/all-settings.c 2014-02-11 23:31:37.000000000 +0100
+++ dovecot-2.2.2/src/config/all-settings.c 2013-05-21 00:31:46.624073562 +0200 +++ dovecot-2.2.12/src/config/all-settings.c 2014-03-14 09:32:08.907608311 +0100
@@ -766,7 +766,7 @@ @@ -773,7 +773,7 @@
.last_valid_gid = 0, .last_valid_gid = 0,
.mail_plugins = "", .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): ", .mail_log_prefix = "%s(%u): ",
@@ -3274,7 +3274,7 @@ @@ -3304,7 +3304,7 @@
.base_dir = PKG_RUNDIR, .base_dir = PKG_RUNDIR,
.libexec_dir = PKG_LIBEXECDIR, .libexec_dir = PKG_LIBEXECDIR,
.mail_plugins = "", .mail_plugins = "",
- .mail_plugin_dir = MODULEDIR, - .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules", + .mail_plugin_dir = "/var/lib/dovecot/modules",
.auth_socket_path = "auth-userdb",
.doveadm_socket_path = "doveadm-server", .doveadm_socket_path = "doveadm-server",
.doveadm_worker_count = 0, .doveadm_worker_count = 0,
.doveadm_port = 0, Only in dovecot-2.2.12/src/config: all-settings.c.orig
diff -ur dovecot-2.2.2-orig/src/config/config-parser.c dovecot-2.2.2/src/config/config-parser.c diff -ur dovecot-2.2.12-orig/src/config/config-parser.c dovecot-2.2.12/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.12-orig/src/config/config-parser.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.2/src/config/config-parser.c 2013-05-20 20:23:58.106024534 +0200 +++ dovecot-2.2.12/src/config/config-parser.c 2014-03-14 09:28:17.645334840 +0100
@@ -990,7 +990,7 @@ @@ -990,7 +990,7 @@
memset(&mod_set, 0, sizeof(mod_set)); 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); module_dir_init(modules);
i_array_init(&new_roots, 64); 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 diff -ur dovecot-2.2.12-orig/src/dict/main.c dovecot-2.2.12/src/dict/main.c
--- dovecot-2.2.2-orig/src/dict/main.c 2013-02-04 22:05:42.000000000 +0100 --- dovecot-2.2.12-orig/src/dict/main.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.2/src/dict/main.c 2013-05-20 20:23:58.101024534 +0200 +++ dovecot-2.2.12/src/dict/main.c 2014-03-14 09:28:17.645334840 +0100
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.abi_version = DOVECOT_ABI_VERSION;
mod_set.require_init_funcs = TRUE; 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); module_dir_init(modules);
/* Register only after loading modules. They may contain SQL drivers, /* 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 diff -ur dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c dovecot-2.2.12/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.12-orig/src/doveadm/doveadm-settings.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.2/src/doveadm/doveadm-settings.c 2013-05-20 20:23:58.399024539 +0200 +++ dovecot-2.2.12/src/doveadm/doveadm-settings.c 2014-03-14 09:32:56.540087069 +0100
@@ -76,7 +76,7 @@ @@ -77,7 +77,7 @@
.base_dir = PKG_RUNDIR, .base_dir = PKG_RUNDIR,
.libexec_dir = PKG_LIBEXECDIR, .libexec_dir = PKG_LIBEXECDIR,
.mail_plugins = "", .mail_plugins = "",
- .mail_plugin_dir = MODULEDIR, - .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules", + .mail_plugin_dir = "/var/lib/dovecot/modules",
.auth_socket_path = "auth-userdb",
.doveadm_socket_path = "doveadm-server", .doveadm_socket_path = "doveadm-server",
.doveadm_worker_count = 0, .doveadm_worker_count = 0,
.doveadm_port = 0, Only in dovecot-2.2.12/src/doveadm: doveadm-settings.c.orig
diff -ur dovecot-2.2.2-orig/src/lib-fs/fs-api.c dovecot-2.2.2/src/lib-fs/fs-api.c 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.2-orig/src/lib-fs/fs-api.c 2013-04-18 16:07:26.000000000 +0200 --- dovecot-2.2.12-orig/src/lib-fs/fs-api.c 2014-02-11 23:23:37.000000000 +0100
+++ dovecot-2.2.2/src/lib-fs/fs-api.c 2013-05-20 20:23:58.099024534 +0200 +++ dovecot-2.2.12/src/lib-fs/fs-api.c 2014-03-14 09:28:17.646334843 +0100
@@ -82,7 +82,7 @@ @@ -89,7 +89,7 @@
mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.abi_version = DOVECOT_ABI_VERSION;
mod_set.ignore_missing = TRUE; 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_name, &mod_set);
module_dir_init(fs_modules); 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 Only in dovecot-2.2.12/src/lib-fs: fs-api.c.orig
--- dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c 2013-04-09 22:45:19.000000000 +0200 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.2/src/lib-ssl-iostream/iostream-ssl.c 2013-05-20 20:23:58.089024534 +0200 --- dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c 2014-02-11 23:23:37.000000000 +0100
@@ -28,7 +28,7 @@ +++ 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)); 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>";
@ -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"); ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
if (ssl_vfuncs == NULL) { 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 Only in dovecot-2.2.12/src/lib-ssl-iostream: iostream-ssl.c.orig
--- dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c 2013-05-15 12:20:00.000000000 +0200 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.2/src/lib-storage/mail-storage-settings.c 2013-05-20 20:23:57.858024531 +0200 --- dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c 2014-02-11 23:23:37.000000000 +0100
@@ -260,7 +260,7 @@ +++ 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, .last_valid_gid = 0,
.mail_plugins = "", .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): ", .mail_log_prefix = "%s(%u): ",
Only in dovecot-2.2.12/src/lib-storage: mail-storage-settings.c.orig

4
pkgs/servers/mail/dovecot/2.2.x.nix
View File

@ -2,13 +2,13 @@
, inotifyTools }: , inotifyTools }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dovecot-2.2.6"; name = "dovecot-2.2.12";
buildInputs = [perl systemd openssl pam bzip2 zlib openldap inotifyTools]; buildInputs = [perl systemd openssl pam bzip2 zlib openldap inotifyTools];
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 = "1rfnsg0a57cv02pl68h3jhbd5v3071a75bvf9gs95fd41g72n9v2"; sha256 = "0mlcwgrxfwy1fqfk3wwbh1h9f0jddg4rnj612ckj1zv5asp1rppk";
}; };
preConfigure = '' preConfigure = ''