Merge remote-tracking branch 'gum/master'

1 files changed, 15 insertions, 7 deletions

diff --git a/makefu/5pkgs/beef/default.nix b/makefu/5pkgs/beef/default.nix
index 82540cde9..d444dbded 100644
--- a/makefu/5pkgs/beef/default.nix
+++ b/makefu/5pkgs/beef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bundlerEnv, ruby, fetchFromGitHub }:
+{ stdenv, bundlerEnv, ruby, fetchFromGitHub, nodejs }:
 # nix-shell --command "bundler install && bundix" in the clone, copy gemset.nix, Gemfile and Gemfile.lock
 let
   gems = bundlerEnv {
@@ -7,13 +7,17 @@ let
     gemdir  = ./.;
   };
 in stdenv.mkDerivation {
-  name = "beef-2017-09-21";
+  name = "beef-2018-09-21";
   src = fetchFromGitHub {
     owner = "beefproject";
     repo = "beef";
-    rev = "69aa2a3";
-    sha256 = "1rky61i0wzpwcq3kqfa0m5hf6wyz8q8jgzs7dpfh04w9qh32ic4p";
+    rev = "d237c95";
+    sha256 = "1mykbjwjcbd2a18wycaf35hi3b9rmvqz1jnk2v55sd4c39f0jpf2";
   };
+  prePatch = ''
+    ls -alhtr
+  '';
+  patches = [ ./db-in-homedir.patch ];
   buildInputs = [gems ruby];
   installPhase = ''
     mkdir -p $out/{bin,share/beef}
@@ -25,13 +29,17 @@ in stdenv.mkDerivation {
     bin=$out/bin/beef
     cat > $bin <<EOF
 #!/bin/sh -e
+PATH=$PATH:${nodejs}/bin/
 exec ${gems}/bin/bundle exec ${ruby}/bin/ruby $out/share/beef/beef "\$@"
 EOF
     chmod +x $bin
   '';
 
-  # crashes with segfault
-  # also, db cannot be set
-  meta.broken = true;
+  meta = with stdenv.lib; {
+    homepage = https://beefproject.com/;
+    description = "The Browser Exploitation Framework";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ makefu ];
+  };
 
 }