summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Palmquist <stig@stig.io>2020-11-22 11:27:10 +0100
committerStig Palmquist <stig@stig.io>2020-11-22 11:27:10 +0100
commit4586b2f0d0cce2916766dfcd1b717c0940d865ef (patch)
treeb947d11cd4ef59be43d73041778041efb687ca96
parentMerge pull request #104481 from taku0/thunderbird-bin-78.5.0_release-20.03 (diff)
downloadnixpkgs-4586b2f0d0cce2916766dfcd1b717c0940d865ef.tar.gz
mutt: apply patch for CVE-2020-28896
mutt has improper handling of broken IMAP connections, this could result in authentication credentials being sent over an unencrypted connection, without $ssl_force_tls being consulted. https://security.archlinux.org/CVE-2020-28896 https://gitlab.com/muttmua/mutt/-/commit/04b06aaa3e0cc0022b9b01dbca2863756ebbf59a
-rw-r--r--pkgs/applications/networking/mailreaders/mutt/default.nix16
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 ]