From d2dfeb16fd2096a34d3d0fb852829ca463d12c3e Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 10 Oct 2022 10:19:14 +0200 Subject: [PATCH] sylpheed: apply patch for CVE-2021-37746 (cherry picked from commit fc7ca788a3ff6f044972dcaedd3d1d33f867ca7a) --- .../networking/mailreaders/sylpheed/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 9a65bec21c20..32350bb5cfa7 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -19,13 +19,17 @@ stdenv.mkDerivation rec { (fetchpatch { # patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306 name = "patch-libsylph_ssl_c.patch"; + extraPrefix = ""; url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain"; - sha256 = "sha256-k9OwPtHrEjaxXdH0trNqXgJMhR8kjgtei9pi6OFvILk="; + sha256 = "sha256-+FetU5vrfvE78nYAjKK/QFZnFw+Zr2PvoUGRWCuZczs="; + }) + (fetchpatch { + name = "CVE-2021-37746.patch"; + url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=ac286a71ed78429e16c612161251b9ea90ccd431"; + sha256 = "sha256-oLmUShtvO6io3jibKT67eO0O58vEDZEeaB51QTd3UkU="; }) ]; - patchFlags = [ "-p0" ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]