summary refs log tree commit diff
path: root/pkgs/servers/mail/dovecot/default.nix
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2018-02-01 03:55:38 +0100
committerAndreas Rammhold <andreas@rammhold.de>2018-02-01 04:28:14 +0100
commite27e02653991c297ba174de053f60a0ccded7baf (patch)
treefaad6dcbdfdc9e06adf1ce2d134427ed175ad8e6 /pkgs/servers/mail/dovecot/default.nix
parentbe4c6311f3bc808cacff94e5e11240a7c37cbf9c (diff)
downloadnixpkgs-e27e02653991c297ba174de053f60a0ccded7baf.tar
nixpkgs-e27e02653991c297ba174de053f60a0ccded7baf.tar.gz
nixpkgs-e27e02653991c297ba174de053f60a0ccded7baf.tar.bz2
nixpkgs-e27e02653991c297ba174de053f60a0ccded7baf.tar.lz
nixpkgs-e27e02653991c297ba174de053f60a0ccded7baf.tar.xz
nixpkgs-e27e02653991c297ba174de053f60a0ccded7baf.tar.zst
nixpkgs-e27e02653991c297ba174de053f60a0ccded7baf.zip
dovecot: fix CVE-2017-15132
Diffstat (limited to 'pkgs/servers/mail/dovecot/default.nix')
-rw-r--r--pkgs/servers/mail/dovecot/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index e995763a4a2..6b2adf57217 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl
+{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl
 , bzip2, zlib, lz4, inotify-tools, pam, libcap
 , clucene_core_2, icu, openldap, libsodium, libstemmer
 # Auth modules
@@ -47,6 +47,16 @@ stdenv.mkDerivation rec {
     # so we can symlink plugins from several packages there.
     # The symlinking needs to be done in NixOS.
     ./2.2.x-module_dir.patch
+    (fetchpatch {
+      name = "CVE-2017-14132_part1.patch";
+      url = https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060.patch;
+      sha256 = "1pcfzxr8xlwbpa7z19grp7mlvdnan6ln8zw74dj4pdmynmlk4aw9";
+    })
+    (fetchpatch {
+      name = "CVE-2017-14132_part2.patch";
+      url = https://github.com/dovecot/core/commit/a9b135760aea6d1790d447d351c56b78889dac22.patch;
+      sha256 = "0082iid5rvjmh003xi9s09jld2rb31hbvni0yai1h1ggbmd5zf8l";
+    })
   ];
 
   configureFlags = [