From e212b9975172a43f329aefa4afaa41525323d87f Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 20 Nov 2018 12:51:26 -0800
Subject: amass: 2.8.3 -> 2.8.5

---
 pkgs/tools/networking/amass/default.nix | 20 +++++++++++++-------
 pkgs/tools/networking/amass/deps.nix    |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'pkgs/tools/networking/amass')

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index adb43c4aa086b..16e87d2a5c97e 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -1,11 +1,12 @@
 { buildGoPackage
 , fetchFromGitHub
+, fetchpatch
 , lib
 }:
 
 buildGoPackage rec {
   name = "amass-${version}";
-  version = "2.8.3";
+  version = "2.8.5";
 
   goPackagePath = "github.com/OWASP/Amass";
 
@@ -13,17 +14,19 @@ buildGoPackage rec {
     owner = "OWASP";
     repo = "Amass";
     rev = version;
-    sha256 = "1pidi7bpg5z04l6ryfd7rqxshayvkqmgav0f6f1fxz4jwrmx9nnc";
+    sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy";
   };
 
-  # NOTE: this must be removed once amass > 2.8.3 is released. This version has
-  # a broken import caused by the project migrating to a new home.
-  preBuild = ''
-    sed -e 's:github.com/caffix/amass/amass/core:github.com/OWASP/Amass/amass/core:g' -i "go/src/${goPackagePath}/cmd/amass.netdomains/main.go"
-  '';
+  outputs = [ "bin" "out" "wordlists" ];
 
   goDeps = ./deps.nix;
 
+  postInstall = ''
+    mkdir -p $wordlists
+    cp -R $src/wordlists/*.txt $wordlists
+    gzip $wordlists/*.txt
+  '';
+
   meta = with lib; {
     description = "In-Depth DNS Enumeration and Network Mapping";
     longDescription = ''
@@ -33,6 +36,9 @@ buildGoPackage rec {
       uses the IP addresses obtained during resolution to discover associated
       netblocks and ASNs. All the information is then used to build maps of the
       target networks.
+
+      Amass ships with a set of wordlist (to be used with the amass -w flag)
+      that are found under the wordlists output.
       '';
     homepage = https://www.owasp.org/index.php/OWASP_Amass_Project;
     license = licenses.asl20;
diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix
index 711d64fd313e3..e9b5acf618e25 100644
--- a/pkgs/tools/networking/amass/deps.nix
+++ b/pkgs/tools/networking/amass/deps.nix
@@ -94,8 +94,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "93218def8b18e66adbdab3eca8ec334700329f1f";
-      sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz";
+      rev = "ec83556a53fe16b65c452a104ea9d1e86a671852";
+      sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f";
     };
   }
 ]
-- 
cgit 1.4.1