cairo: add patch to fix CVE-2016-9082

cc #20078
This commit is contained in:
Franz Pletz 2016-11-02 17:30:50 +01:00
parent 08fb099b82
commit 2b2f273375
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, libiconv, libintlOrEmpty { stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv
, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12 , xcbSupport ? true # no longer experimental since 1.12
, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency
@ -26,6 +26,15 @@ stdenv.mkDerivation rec {
sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7"; 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 = '' prePatch = ''
patches="$patches $(echo $infinality/*_cairo-iu/*.patch)" patches="$patches $(echo $infinality/*_cairo-iu/*.patch)"
''; '';