From 8e510a059875cdfe17fa97fa47d7773f939e344f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 18 Jul 2024 22:08:04 +0200 Subject: [PATCH] gtk2: apply patch fixing CVE-2024-6655 Upstream issue: https://gitlab.gnome.org/GNOME/gtk/-/issues/6786 --- pkgs/development/libraries/gtk/2.x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 9d9b855c9da8..ed0900ee1a92 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -2,6 +2,7 @@ , lib , stdenv , fetchurl +, fetchpatch , atk , buildPackages , cairo @@ -63,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./patches/2.0-immodules.cache.patch ./patches/gtk2-theme-paths.patch + (fetchpatch { + # https://gitlab.gnome.org/GNOME/gtk/-/issues/6786 + name = "CVE-2024-6655.patch"; + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch"; + hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-darwin-x11.patch