diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-11 13:33:25 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-11 13:33:25 +0100 |
| commit | cbfb586151c929fc63f2f15621d3bb6dc2dda95b (patch) | |
| tree | ab3e2dfa87d62b37de713c1cf34d4494b19a9eda /pkgs/development/tools/analysis | |
| parent | 57f5e2aa769c04b239b9788164a80cadd1b4f167 (diff) | |
| parent | 17fae2499a12722f945105e26b1aabc745d642d0 (diff) | |
| download | nixlib-cbfb586151c929fc63f2f15621d3bb6dc2dda95b.tar nixlib-cbfb586151c929fc63f2f15621d3bb6dc2dda95b.tar.gz nixlib-cbfb586151c929fc63f2f15621d3bb6dc2dda95b.tar.bz2 nixlib-cbfb586151c929fc63f2f15621d3bb6dc2dda95b.tar.lz nixlib-cbfb586151c929fc63f2f15621d3bb6dc2dda95b.tar.xz nixlib-cbfb586151c929fc63f2f15621d3bb6dc2dda95b.tar.zst nixlib-cbfb586151c929fc63f2f15621d3bb6dc2dda95b.zip | |
Merge security fixes adapted from #31437
Diffstat (limited to 'pkgs/development/tools/analysis')
| -rw-r--r-- | pkgs/development/tools/analysis/radare2/default.nix | 14 |
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 { |