Merge pull request #124737 from dotlambda/CVE-2020-18032

graphviz: patch CVE-2020-18032
This commit is contained in:
Michael Raskin 2021-05-28 17:41:58 +00:00 committed by GitHub
commit 37c851d50d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,7 +21,14 @@ let
buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out";
};
# 2.42 has the patch included
patches = optional (lib.versionOlder version "2.42") patchToUse;
patches = optional (lib.versionOlder version "2.42") patchToUse
++ optionals (lib.versionOlder version "2.46.0") [
(fetchpatch {
name = "CVE-2020-18032.patch";
url = "https://gitlab.com/graphviz/graphviz/-/commit/784411ca3655c80da0f6025ab20634b2a6ff696b.patch";
sha256 = "1nkw9ism8lkfvxsp5fh95i2l5s5cbjsidbb3g1kjfv10rxkyb41m";
})
];
in
stdenv.mkDerivation {