about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2018-03-03 13:53:43 +0100
committerGitHub <noreply@github.com>2018-03-03 13:53:43 +0100
commit7a04c2ca296c0698f1c7d5c17be7f931f77691f7 (patch)
treecce6f1d0563ed9779dc260420fff3153589c5af8 /pkgs
parent9ccb0f39554d4b7fdb75dcf757e9862029821694 (diff)
parent515a6ad8437e264ec488ffc7d886c586d9b628df (diff)
downloadnixlib-7a04c2ca296c0698f1c7d5c17be7f931f77691f7.tar
nixlib-7a04c2ca296c0698f1c7d5c17be7f931f77691f7.tar.gz
nixlib-7a04c2ca296c0698f1c7d5c17be7f931f77691f7.tar.bz2
nixlib-7a04c2ca296c0698f1c7d5c17be7f931f77691f7.tar.lz
nixlib-7a04c2ca296c0698f1c7d5c17be7f931f77691f7.tar.xz
nixlib-7a04c2ca296c0698f1c7d5c17be7f931f77691f7.tar.zst
nixlib-7a04c2ca296c0698f1c7d5c17be7f931f77691f7.zip
Merge pull request #36243 from dotlambda/dovecot
dovecot: 2.3.0 -> 2.3.0.1
Diffstat (limited to 'pkgs')
-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 = [