diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 08:55:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 08:55:26 +0200 |
| commit | 5328aac7be5b7ebf794349f915a379efd04b018b (patch) | |
| tree | 029547f7673a785c42f12770a68a3ec31a297bf9 /pkgs/servers/mail | |
| parent | f203b32bb8e824a75f89fd9805680b4a8e92d2a5 (diff) | |
| parent | c73f0caea5f0822ea044b4f90de4b64706d91362 (diff) | |
| download | nixpkgs-5328aac7be5b7ebf794349f915a379efd04b018b.tar nixpkgs-5328aac7be5b7ebf794349f915a379efd04b018b.tar.gz nixpkgs-5328aac7be5b7ebf794349f915a379efd04b018b.tar.bz2 nixpkgs-5328aac7be5b7ebf794349f915a379efd04b018b.tar.lz nixpkgs-5328aac7be5b7ebf794349f915a379efd04b018b.tar.xz nixpkgs-5328aac7be5b7ebf794349f915a379efd04b018b.tar.zst nixpkgs-5328aac7be5b7ebf794349f915a379efd04b018b.zip | |
Merge branch 'staging'
Comparison looks OK; I'll try some fixes on master directly. http://hydra.nixos.org/eval/1372577?compare=1372497
Diffstat (limited to 'pkgs/servers/mail')
| -rw-r--r-- | pkgs/servers/mail/exim/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index bf7b5d8d6ed..d503a4d7b57 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,4 @@ -{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: +{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv, fetchpatch }: stdenv.mkDerivation rec { name = "exim-4.89"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "09lndv34jsxwglq5zsh9y4xaqj5g37g9ca4x0zb25fvvm4f0lj8c"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-1000369.patch"; + url = "https://anonscm.debian.org/git/pkg-exim4/exim4.git/plain/debian/patches/79_CVE-2017-1000369.patch?h=4.89-2%2bdeb9u1"; + sha256 = "0v46zywgkv1rdqhybqqrd0rwkdaj6q1f4x0a3vm9p0wz8vad3023"; + }) + ]; + buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; preBuild = '' |