summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2017-11-08 21:49:40 +0100
committerAndreas Rammhold <andreas@rammhold.de>2017-11-09 12:48:21 +0100
commit8312eaf11c688715f6ff2dd380c4393d19e69ccd (patch)
tree8e1f0bdcd533d3dea1208d27ce7f202b084bb349 /pkgs/development/tools
parentf8b53a70f1bcc628f255830fccffe77ee469b68e (diff)
downloadnixlib-8312eaf11c688715f6ff2dd380c4393d19e69ccd.tar
nixlib-8312eaf11c688715f6ff2dd380c4393d19e69ccd.tar.gz
nixlib-8312eaf11c688715f6ff2dd380c4393d19e69ccd.tar.bz2
nixlib-8312eaf11c688715f6ff2dd380c4393d19e69ccd.tar.lz
nixlib-8312eaf11c688715f6ff2dd380c4393d19e69ccd.tar.xz
nixlib-8312eaf11c688715f6ff2dd380c4393d19e69ccd.tar.zst
nixlib-8312eaf11c688715f6ff2dd380c4393d19e69ccd.zip
radare2: 2.0.0 -> 2.0.1 (+ fix for CVE-2017-15385)
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/analysis/radare2/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 1754727bb364..9468842f0c4d 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
+{stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig, libusb, readline, libewf, perl, zlib, openssl,
 gtk2 ? null, vte ? null, gtkdialog ? null,
 python ? null,
 ruby ? null,
@@ -13,16 +13,24 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  version = "2.0.0";
+  version = "2.0.1";
   name = "radare2-${version}";
 
   src = fetchFromGitHub {
     owner = "radare";
     repo = "radare2";
     rev = version;
-    sha256 = "1ahai9x6jc15wjzdbdkri3rc88ark2i5s8nv2pxcp0wwldvawlzi";
+    sha256 = "031ndvinsypagpkdszxjq0hj91ijq9zx4dzk53sz7il7s3zn65c7";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2017-15385.patch";
+      url = https://github.com/radare/radare2/commit/21a6f570ba33fa9f52f1bba87f07acc4e8c178f4.patch;
+      sha256 = "19qg5j9yr5r62nrq2b6mscxsz0wyyfah2z5jz8dvj9kqxq186d43";
+    })
+  ];
+
   postPatch = let
     cs_ver = "3.0.4"; # version from $sourceRoot/shlr/Makefile
     capstone = fetchurl {