From 754354c9280bf36c234fa954fd7ce81460812629 Mon Sep 17 00:00:00 2001
From: Ryan Desfosses <rdes@protonmail.com>
Date: Sat, 20 Feb 2021 15:36:39 -0500
Subject: [PATCH 3/3] Added whatweb and added copyright lines

---
 gnu/packages/cybersecurity.scm | 39 ++++++++++++++++++++++++++++++++++
 gnu/packages/networking.scm    | 14 +++++++-----
 gnu/packages/ruby.scm          |  1 +
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm
index e13c342342..7a49e89e44 100644
--- a/gnu/packages/cybersecurity.scm
+++ b/gnu/packages/cybersecurity.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 Ryan Desfosses <rdes@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,9 +20,12 @@
 
 (define-module (gnu packages cybersecurity)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix packages)
+  #:use-module (gnu packages ruby)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system ruby)
   #:use-module (gnu packages engineering))
 
 (define-public ropgadget
@@ -44,3 +48,38 @@
 gadgets in binaries.  Some facilities are included for automatically generating
 chains of gadgets to execute system calls.")
     (license license:bsd-3)))
+
+(define-public whatweb
+  (package
+    (name "whatweb")
+    (version "0.5.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/urbanadventurer/WhatWeb")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "108426k32rj134ddbbi4rmxikp37g93j64pf7hd7zwh23vkpkc8w"))))
+    (build-system ruby-build-system)
+    (arguments
+     `(#:tests? #f)); FIXME: No files matching pattern:  "\\.gemspec$"
+    (propagated-inputs
+     `(("ruby-addressable" ,ruby-addressable)
+       ("ruby-json" ,ruby-json)
+       ("ruby-ipaddr" ,ruby-ipaddr)))
+    (native-inputs
+     `(("ruby-rake" ,ruby-rake)
+       ("ruby-minitest" ,ruby-minitest)
+       ("ruby-rubocop" ,ruby-rubocop)
+       ("ruby-rdoc" ,ruby-rdoc)
+       ("ruby-coderay" ,ruby-coderay)
+       ("budler-audit" ,bundler-audit)
+       ("ruby-simplecov" ,ruby-simplecov)))
+    (synopsis "Web scanner")
+    (description "Identify the technology stack that powers a website
+ and explore the Web of Things.")
+    (home-page "https://morningstarsecurity.com/research/whatweb")
+    (license license:gpl2)))
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 804d4dce0c..c7955abebb 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1426,6 +1426,13 @@ network frames.")
     (home-page "https://www.wireshark.org/")
     (license license:gpl2+)))
 
+(define-public tshark
+  (package
+    (inherit wireshark)
+    (name "tshark")
+    (arguments
+     `(#:configure-flags '("-DBUILD_wireshark=OFF")))))
+
 (define-public fping
   (package
     (name "fping")
@@ -1454,13 +1461,13 @@ round-robin fashion.")
 (define-public gandi.cli
   (package
     (name "gandi.cli")
-    (version "1.6")
+    (version "1.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri name version))
        (sha256
-        (base32 "1h36jahbp7273wn3yd747kbiwjc0bm3sja67bcxdsd54ln0vyndg"))))
+        (base32 "110wc9zgxsrvw4yzp21p0ian5lcf7vhcpxhnmsc4fg9pzl2bwxd5"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -1484,11 +1491,8 @@ round-robin fashion.")
                #t))))))
     (native-inputs
      `(("python-docutils" ,python-docutils)   ; for rst2man.py
-       ("python-pytest" ,python-pytest)
        ("python-pytest-cov" ,python-pytest-cov)
        ("python-tox" ,python-tox)))
-    (propagated-inputs
-     `(("openssh" ,openssh)))           ; used by gandi/cli/modules/iass.py
     (inputs
      `(("openssl" ,openssl)
        ("python-click" ,python-click)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 5be7638600..85bb626a70 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -26,6 +26,7 @@
 ;;; Copyright © 2020 Holgr Peters <holger.peters@posteo.de>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2021 EuAndreh <eu@euandre.org>
+;;; Copyright © 2021 Ryan Desfosses <rdes@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
2.30.1