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

Merge pull request #12290 from abbradar/dovecot-updates

Browse Source 
Rework dovecot module, add and update plugins, default Dovecot to 2.2
This commit is contained in:
Nikolay Amiantov
2016-01-23 12:02:23 +03:00
parent 34769a3d72 5b5e2c05c4
commit bf208745ab
6 changed files with 174 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
+10 -10
View File
@@ -6,7 +6,7 @@ diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
mod_set.filter_callback = auth_module_filter;
- modules = module_dir_load(AUTH_MODULE_DIR, NULL, &mod_set);
+ modules = module_dir_load("/var/lib/dovecot/modules/auth", NULL, &mod_set);
+ modules = module_dir_load("/etc/dovecot/modules/auth", NULL, &mod_set);
module_dir_init(modules);
if (!worker)
@@ -15,7 +15,7 @@ diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
mod_set.ignore_missing = TRUE;
- modules = module_dir_load_missing(modules, AUTH_MODULE_DIR, names,
+ modules = module_dir_load_missing(modules, "/var/lib/dovecot/modules/auth", names,
+ modules = module_dir_load_missing(modules, "/etc/dovecot/modules/auth", names,
&mod_set);
module_dir_init(modules);
}
@@ -27,7 +27,7 @@ diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules",
+ .mail_plugin_dir = "/etc/dovecot/modules",
.mail_log_prefix = "%s(%u): ",
@@ -36,7 +36,7 @@ diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config
.libexec_dir = PKG_LIBEXECDIR,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules",
+ .mail_plugin_dir = "/etc/dovecot/modules",
.auth_socket_path = "auth-userdb",
.doveadm_socket_path = "doveadm-server",
.doveadm_worker_count = 0,
@@ -49,7 +49,7 @@ diff -ur dovecot-2.2.12-orig/src/config/config-parser.c dovecot-2.2.12/src/confi
memset(&mod_set, 0, sizeof(mod_set));
mod_set.abi_version = DOVECOT_ABI_VERSION;
- modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set);
+ modules = module_dir_load("/var/lib/dovecot/modules/settings", NULL, &mod_set);
+ modules = module_dir_load("/etc/dovecot/modules/settings", NULL, &mod_set);
module_dir_init(modules);
i_array_init(&new_roots, 64);
@@ -61,7 +61,7 @@ diff -ur dovecot-2.2.12-orig/src/dict/main.c dovecot-2.2.12/src/dict/main.c
mod_set.require_init_funcs = TRUE;
- modules = module_dir_load(DICT_MODULE_DIR, NULL, &mod_set);
+ modules = module_dir_load("/var/lib/dovecot/modules/dict", NULL, &mod_set);
+ modules = module_dir_load("/etc/dovecot/modules/dict", NULL, &mod_set);
module_dir_init(modules);
/* Register only after loading modules. They may contain SQL drivers,
@@ -73,7 +73,7 @@ diff -ur dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c dovecot-2.2.12/src/d
.libexec_dir = PKG_LIBEXECDIR,
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules",
+ .mail_plugin_dir = "/etc/dovecot/modules",
.auth_socket_path = "auth-userdb",
.doveadm_socket_path = "doveadm-server",
.doveadm_worker_count = 0,
@@ -86,7 +86,7 @@ diff -ur dovecot-2.2.12-orig/src/lib-fs/fs-api.c dovecot-2.2.12/src/lib-fs/fs-ap
mod_set.ignore_missing = TRUE;
- fs_modules = module_dir_load_missing(fs_modules, MODULE_DIR,
+ fs_modules = module_dir_load_missing(fs_modules, "/var/lib/dovecot/modules",
+ fs_modules = module_dir_load_missing(fs_modules, "/etc/dovecot/modules",
module_name, &mod_set);
module_dir_init(fs_modules);
@@ -99,7 +99,7 @@ diff -ur dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.12/
mod_set.abi_version = DOVECOT_ABI_VERSION;
mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
- ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
+ ssl_module = module_dir_load("/var/lib/dovecot/modules", 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) {
@@ -112,7 +112,7 @@ diff -ur dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2
.mail_plugins = "",
- .mail_plugin_dir = MODULEDIR,
+ .mail_plugin_dir = "/var/lib/dovecot/modules",
+ .mail_plugin_dir = "/etc/dovecot/modules",
.mail_log_prefix = "%s(%u): ",
pkgs/servers/mail/dovecot/2.2.x.nix
+36 -18
View File
@@ -1,23 +1,38 @@
{ stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap
, inotify-tools, clucene_core_2, sqlite }:
{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl
, bzip2, zlib, inotify-tools, pam, libcap
, clucene_core_2, icu, openldap
# Auth modules
, withMySQL ? false, libmysql
, withPgSQL ? false, postgresql
, withSQLite ? true, sqlite
}:
stdenv.mkDerivation rec {
name = "dovecot-2.2.19";
name = "dovecot-2.2.21";
buildInputs = [ perl openssl bzip2 zlib openldap clucene_core_2 sqlite ]
++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ];
nativeBuildInputs = [ perl pkgconfig ];
buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
++ lib.optional withMySQL libmysql
++ lib.optional withPgSQL postgresql
++ lib.optional withSQLite sqlite;
src = fetchurl {
url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
sha256 = "17sf5aancad4pg1vx1606k99389wg76blpqzmnmxlz4hklzix7km";
sha256 = "080bil83gr2dski4gk2bxykg2g497kqm2hn2z4xkbw71b6g17dvs";
};
preConfigure = ''
substituteInPlace src/config/settings-get.pl --replace \
"/usr/bin/env perl" "${perl}/bin/perl"
patchShebangs src/config/settings-get.pl
'';
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
# We need this for sysconfdir, see remark below.
installFlags = [ "DESTDIR=$(out)" ];
postInstall = ''
cp -r $out/$out/* $out
rm -rf $out/$(echo "$out" | cut -d "/" -f2)
'' + lib.optionalString stdenv.isDarwin ''
install_name_tool -change libclucene-shared.1.dylib \
${clucene_core_2}/lib/libclucene-shared.1.dylib \
$out/lib/dovecot/lib21_fts_lucene_plugin.so
@@ -27,10 +42,9 @@ stdenv.mkDerivation rec {
'';
patches = [
# Make dovecot look for plugins in /var/lib/dovecot/modules
# so we can symlink plugins from several packages there
# The symlinking needs to be done in NixOS, as part of the
# dovecot service start-up
# Make dovecot look for plugins in /etc/dovecot/modules
# so we can symlink plugins from several packages there.
# The symlinking needs to be done in NixOS.
./2.2.x-module_dir.patch
];
@@ -38,15 +52,19 @@ stdenv.mkDerivation rec {
# It will hardcode this for /var/lib/dovecot.
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
"--localstatedir=/var"
# We need this so utilities default to reading /etc/dovecot/dovecot.conf file.
"--sysconfdir=/etc"
"--with-ldap"
"--with-lucene"
"--with-ssl=openssl"
"--with-sqlite"
"--with-zlib"
"--with-bzlib"
] ++ stdenv.lib.optionals (stdenv.isLinux) [
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
"--with-ldap"
"--with-lucene"
"--with-icu"
] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
++ lib.optional withMySQL "--with-mysql"
++ lib.optional withPgSQL "--with-pgsql"
++ lib.optional withSQLite "--with-sqlite";
meta = {
homepage = "http://dovecot.org/";
pkgs/servers/mail/dovecot/plugins/antispam/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ stdenv, fetchhg, autoconf, automake, dovecot, openssl }:
stdenv.mkDerivation {
name = "dovecot-antispam-20130429";
src = fetchhg {
url = "http://hg.dovecot.org/dovecot-antispam-plugin/";
rev = "5ebc6aae4d7c";
sha256 = "181i79c9sf3a80mgmycfq1f77z7fpn3j2s0qiddrj16h3yklf4gv";
};
buildInputs = [ dovecot openssl ];
nativeBuildInputs = [ autoconf automake ];
preConfigure = ''
./autogen.sh
# Ugly hack; any ideas?
sed "s,^dovecot_moduledir=.*,dovecot_moduledir=$out/lib/dovecot," ${dovecot}/lib/dovecot/dovecot-config > dovecot-config
'';
configureFlags = [
"--with-dovecot=."
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://wiki2.dovecot.org/Plugins/Antispam;
description = "An antispam plugin for the Dovecot IMAP server";
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
};
}
pkgs/servers/mail/dovecot-pigeonhole/default.nix → pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+13 -10
View File
@@ -1,15 +1,15 @@
{stdenv, fetchurl, dovecot22, openssl}:
{ stdenv, fetchurl, dovecot, openssl }:
stdenv.mkDerivation rec {
name = "dovecot-pigeonhole-${version}";
version = "0.4.3";
version = "0.4.10";
src = fetchurl {
url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
sha256 = "0mypnkc980s3kd1bmy4f93dliwg6n8jfsac8r51jrpvv0ymz94nn";
};
sha256 = "0vvjj1yjr189rn8f41z5rj8gfvk24a8j33q6spb6bd6k1wbfgpz9";
};
buildInputs = [ dovecot22 openssl ];
buildInputs = [ dovecot openssl ];
preConfigure = ''
substituteInPlace src/managesieve/managesieve-settings.c --replace \
@@ -18,18 +18,21 @@ stdenv.mkDerivation rec {
substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \
".executable = \"managesieve-login\"" \
".executable = \"$out/libexec/dovecot/managesieve-login\""
'';
'';
configureFlags = [
"--with-dovecot=${dovecot22}/lib/dovecot"
configureFlags = [
"--with-dovecot=${dovecot}/lib/dovecot"
"--without-dovecot-install-dirs"
"--with-moduledir=$(out)/lib/dovecot"
];
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://pigeonhole.dovecot.org/;
description = "A sieve plugin for the Dovecot IMAP server";
license = licenses.lgpl21;
maintainers = [ maintainers.rickynils ];
};
platforms = platforms.linux;
};
}
pkgs/top-level/all-packages.nix
+6 -2
View File
@@ -9231,13 +9231,17 @@ let
dnschain = callPackage ../servers/dnschain { };
dovecot = dovecot21;
dovecot = dovecot22;
dovecot21 = callPackage ../servers/mail/dovecot { };
dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { };
dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole {
dovecot = dovecot22;
};
dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { };
dspam = callPackage ../servers/mail/dspam {
inherit (perlPackages) NetSMTP;