From 515a6ad8437e264ec488ffc7d886c586d9b628df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Mar 2018 12:08:25 +0100 Subject: [PATCH] dovecot: 2.3.0 -> 2.3.0.1 Release notes: https://dovecot.org/list/dovecot-news/2018-February/000371.html CVE-2017-15132 is patched in this release, so the patches were removed. They were erroneously referencing CVE-2017-14132, but were indeed patches for CVE-2017-15132. --- pkgs/servers/mail/dovecot/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 6b2adf5721756b..0060a59d807183 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.3.0"; + name = "dovecot-2.3.0.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y"; + sha256 = "0lzisrdgrj5qqwjb7bv99mf2aljm568r6g108yisp0s644z2nxxb"; }; preConfigure = '' @@ -47,16 +47,6 @@ 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 = [