diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-07 09:25:40 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-07 09:25:40 +0100 |
| commit | 8154fe90fe9eecedc09b689b810aaf8acfd112c2 (patch) | |
| tree | 5c3a0c4a318691863a463d1babae5d71dbff8ce9 /pkgs/desktops/gnome-3 | |
| parent | cde9585b97dcc57cef6a6ce19534f1f16226ffe8 (diff) | |
| parent | 3de02449cfb241753460d798e2e70359a4edb6d1 (diff) | |
| download | nixlib-8154fe90fe9eecedc09b689b810aaf8acfd112c2.tar nixlib-8154fe90fe9eecedc09b689b810aaf8acfd112c2.tar.gz nixlib-8154fe90fe9eecedc09b689b810aaf8acfd112c2.tar.bz2 nixlib-8154fe90fe9eecedc09b689b810aaf8acfd112c2.tar.lz nixlib-8154fe90fe9eecedc09b689b810aaf8acfd112c2.tar.xz nixlib-8154fe90fe9eecedc09b689b810aaf8acfd112c2.tar.zst nixlib-8154fe90fe9eecedc09b689b810aaf8acfd112c2.zip | |
Merge #33539: libcroco: upstream security patches
CVE-2017-7960 & CVE-2017-7961
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/libcroco/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 4141afeb821d..744ec3c2fe62 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: +{ stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch }: stdenv.mkDerivation rec { name = "libcroco-0.6.12"; @@ -8,6 +8,19 @@ stdenv.mkDerivation rec { sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-7960.patch"; + url = "https://git.gnome.org/browse/libcroco/patch/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394"; + sha256 = "1xjwdqijxf4b7mhdp3kkgnb6c14y0bn3b3gg79kyrm82x696d94l"; + }) + (fetchpatch { + name = "CVE-2017-7961.patch"; + url = "https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7"; + sha256 = "0zakd72ynzjgzskwyvqglqiznsb93j1bkvc1lgyrzgv9rwrbwv9s"; + }) + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; |