Skip to content

Commit

Permalink
cairo: add patch to fix CVE-2016-9082
Browse files Browse the repository at this point in the history
cc #20078

(cherry picked from commit 2b2f273)
  • Loading branch information
fpletz committed Nov 3, 2016
1 parent d5b6594 commit 826a5d7
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions pkgs/development/libraries/cairo/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, libiconv, libintlOrEmpty
, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv
, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
, gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12
, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency
Expand All @@ -26,6 +26,15 @@ stdenv.mkDerivation rec {
sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7";
};

patches = [
# from https://bugs.freedesktop.org/show_bug.cgi?id=98165
(fetchpatch {
name = "cairo-CVE-2016-9082.patch";
url = "https://bugs.freedesktop.org/attachment.cgi?id=127421";
sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri";
})
];

prePatch = ''
patches="$patches $(echo $infinality/*_cairo-iu/*.patch)"
'';
Expand Down

0 comments on commit 826a5d7

Please sign in to comment.