summary refs log tree commit diff
path: root/pkgs/desktops/gnome-2/desktop/vte/default.nix
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2017-12-09 12:22:51 +0100
committerAndreas Rammhold <andreas@rammhold.de>2017-12-09 12:25:04 +0100
commit4c6f7ee729d6d8830b7b554c9d8133083e61058b (patch)
treef85d26aa5be12cd2f796b3b5e40007a15442568e /pkgs/desktops/gnome-2/desktop/vte/default.nix
parent5ce5ef06ab49a50f1a4a6b437d84bf43288d0b7e (diff)
downloadnixpkgs-4c6f7ee729d6d8830b7b554c9d8133083e61058b.tar
nixpkgs-4c6f7ee729d6d8830b7b554c9d8133083e61058b.tar.gz
nixpkgs-4c6f7ee729d6d8830b7b554c9d8133083e61058b.tar.bz2
nixpkgs-4c6f7ee729d6d8830b7b554c9d8133083e61058b.tar.lz
nixpkgs-4c6f7ee729d6d8830b7b554c9d8133083e61058b.tar.xz
nixpkgs-4c6f7ee729d6d8830b7b554c9d8133083e61058b.tar.zst
nixpkgs-4c6f7ee729d6d8830b7b554c9d8133083e61058b.zip
gnome2.vte: fix CVE-2012-2738
Diffstat (limited to 'pkgs/desktops/gnome-2/desktop/vte/default.nix')
-rw-r--r--pkgs/desktops/gnome-2/desktop/vte/default.nix14
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index e5d2489436e..80c77d9b291 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses
+{ stdenv, fetchurl, fetchpatch, intltool, pkgconfig, glib, gtk, ncurses
 , pythonSupport ? false, python27Packages}:
 
 let
@@ -15,7 +15,17 @@ in stdenv.mkDerivation rec {
     ./alt.patch
     ./change-scroll-region.patch
     # CVE-2012-2738
-    ./vte-0.28.2-limit-arguments.patch
+    # fixed in upstream version 0.32.2
+    (fetchpatch{
+      name = "CVE-2012-2738-1.patch";
+      url = https://git.gnome.org/browse/vte/patch/?id=feeee4b5832b17641e505b7083e0d299fdae318e;
+      sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n";
+    })
+    (fetchpatch{
+      name = "CVE-2012-2738-2.patch";
+      url = https://git.gnome.org/browse/vte/patch/?id=98ce2f265f986fb88c38d508286bb5e3716b9e74;
+      sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn";
+    })
   ];
 
   nativeBuildInputs = [ pkgconfig ];