diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2020-11-22 13:23:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-22 13:23:37 +0100 |
| commit | 5a9e4f07f714e811bded0a45ed8fe55c5c6048fd (patch) | |
| tree | b947d11cd4ef59be43d73041778041efb687ca96 | |
| parent | Merge pull request #104481 from taku0/thunderbird-bin-78.5.0_release-20.03 (diff) | |
| parent | mutt: apply patch for CVE-2020-28896 (diff) | |
| download | nixpkgs-5a9e4f07f714e811bded0a45ed8fe55c5c6048fd.tar.gz | |
Merge pull request #104583 from stigtsp/package/mutt-patch-CVE-2020-28896-release-20.03
[20.03] mutt: apply patch for CVE-2020-28896
| -rw-r--r-- | pkgs/applications/networking/mailreaders/mutt/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 220dd01a80df..12c750846cfb 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -34,10 +34,18 @@ stdenv.mkDerivation rec { sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7"; }; - patches = optional smimeSupport (fetchpatch { - url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch"; - sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi"; - }); + patches = [ + # CVE-2020-28896 + (fetchpatch { + url = "https://gitlab.com/muttmua/mutt/-/commit/04b06aaa3e0cc0022b9b01dbca2863756ebbf59a.patch"; + sha256 = "117mm757yj4k4cb9f1cmc9p0dqmi2mf92qsxvi8a794b9kdj5m2z"; + }) + ] ++ optional smimeSupport [ + (fetchpatch { + url = "https://salsa.debian.org/mutt-team/mutt/raw/debian/1.10.1-2/debian/patches/misc/smime.rc.patch"; + sha256 = "0b4i00chvx6zj9pcb06x2jysmrcb2znn831lcy32cgfds6gr3nsi"; + }) + ]; buildInputs = [ ncurses which perl ] |