about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-03-03 12:08:25 +0100
committerRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-03-03 12:08:25 +0100
commit515a6ad8437e264ec488ffc7d886c586d9b628df (patch)
tree0e2caee5cbd812502e78d37d4452ef2157130a9b
parentb98e1601ddb7fed04245e49faa5aa4add33cd3d1 (diff)
downloadnixlib-515a6ad8437e264ec488ffc7d886c586d9b628df.tar
nixlib-515a6ad8437e264ec488ffc7d886c586d9b628df.tar.gz
nixlib-515a6ad8437e264ec488ffc7d886c586d9b628df.tar.bz2
nixlib-515a6ad8437e264ec488ffc7d886c586d9b628df.tar.lz
nixlib-515a6ad8437e264ec488ffc7d886c586d9b628df.tar.xz
nixlib-515a6ad8437e264ec488ffc7d886c586d9b628df.tar.zst
nixlib-515a6ad8437e264ec488ffc7d886c586d9b628df.zip
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.
-rw-r--r--pkgs/servers/mail/dovecot/default.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 6b2adf572175..0060a59d8071 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 = [