[PATCH] Add wireshark

[PATCH] Add wireshark

[Nicolas Goaziou]

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

Hello,

Here is a new attempt to add a package: wireshark.

I don't like the "python-wrapper" part because it implies a propagated
python. OTOH, providing only "python" generates a lot of screaming
during patch environment phase, but doesn't seem to alter the final
executable.

I'm not sure about the locations of plugins directory. Default is in the
store, which means you cannot add more. I don't use this, so I don't
know if there's a better place.

Anyway, here comes the patch.

Thank you in advance for any feedback.

-- 
Nicolas Goaziou                                                0x80A93738

[-- Attachment #2: Add wireshark --]
[-- Type: text/x-diff, Size: 4380 bytes --]

From e31d8434e26100bc95e2c7fa8a98dafcb4b49c45 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 2 Jun 2016 21:02:14 +0200
Subject: [PATCH] gnu: Add wireshark.

* gnu/packages/networking.scm (wireshark): New variable.
---
 gnu/packages/networking.scm | 71 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 6f4339a..b833e62 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
 ;;; Copyright   2016 John Darrington <jmd@gnu.org>
+;;; Copyright © 2016 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,12 +27,25 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
-  #:use-module (gnu packages tls)
-  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages adns)
+  #:use-module (gnu packages audio)
+  #:use-module (gnu packages bison)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages lua)
+  #:use-module (gnu packages mit-krb5)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages compression))
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tls))
 
 (define-public macchanger
   (package
@@ -273,3 +287,54 @@ DNS queries are allowed.  The bandwidth is asymmetrical, with limited upstream
 and up to 1 Mbit/s downstream.")
     ;; src/md5.[ch] is released under the zlib license
     (license (list license:isc license:zlib))))
+
+(define-public wireshark
+  (package
+    (name "wireshark")
+    (version "2.0.3")
+    (synopsis "Network traffic analyzer")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.wireshark.org/download/src/wireshark-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32
+         "1z358k65frp9m0l07cppwxhvbcp1w9ya5sml87pzs8gyfmp3g5p1"))))
+    (build-system glib-or-gtk-build-system)
+    (inputs `(("bison" ,bison)
+              ("c-ares" ,c-ares)
+              ("flex" ,flex)
+              ("gnutls" ,gnutls)
+              ("gtk+" ,gtk+)
+              ("libcap" ,libcap)
+              ("libgcrypt" ,libgcrypt)
+              ("libnl" ,libnl)
+              ("libpcap" ,libpcap)
+              ("lua" ,lua)
+              ("krb5" ,mit-krb5)
+              ("openssl" ,openssl)
+              ("portaudio" ,portaudio)
+              ("sbc" ,sbc)
+              ("zlib" ,zlib)))
+    (native-inputs `(("perl" ,perl)
+                     ("pkg-config" ,pkg-config)
+                     ("python" ,python-wrapper)))
+    (arguments
+     `(#:configure-flags
+       `(,(string-append "--with-c-ares=" (assoc-ref %build-inputs "c-ares"))
+         ,(string-append "--with-krb5=" (assoc-ref %build-inputs "krb5"))
+         ,(string-append "--with-libcap=" (assoc-ref %build-inputs "libcap"))
+         ,(string-append "--with-lua=" (assoc-ref %build-inputs "lua"))
+         ,(string-append "--with-pcap=" (assoc-ref %build-inputs "libpcap"))
+         ,(string-append "--with-portaudio="
+                         (assoc-ref %build-inputs "portaudio"))
+         ,(string-append "--with-sbc=" (assoc-ref %build-inputs "sbc"))
+         ,(string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))
+         ,(string-append "--with-zlib=" (assoc-ref %build-inputs "zlib"))
+         "--without-qt")))
+    (description "Wireshark is a network protocol analyzer, or
+\"packet sniffer\", that lets you capture and interactively browse the
+contents of network frames.")
+    (license license:gpl2+)
+    (home-page "https://www.wireshark.org/")))
-- 
2.8.3

Re: [PATCH] Add wireshark

[Ludovic Courtès]

Nicolas Goaziou <mail@nicolasgoaziou.fr> skribis:

> Here is a new attempt to add a package: wireshark.
>
> I don't like the "python-wrapper" part because it implies a propagated
> python. OTOH, providing only "python" generates a lot of screaming
> during patch environment phase, but doesn't seem to alter the final
> executable.

Right, it’s not listed in ‘guix gc --references’, so that’s fine.

> I'm not sure about the locations of plugins directory. Default is in the
> store, which means you cannot add more. I don't use this, so I don't
> know if there's a better place.

I guess we can revisit it later when someone needs a plugin.

> From e31d8434e26100bc95e2c7fa8a98dafcb4b49c45 Mon Sep 17 00:00:00 2001
> From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
> Date: Thu, 2 Jun 2016 21:02:14 +0200
> Subject: [PATCH] gnu: Add wireshark.
>
> * gnu/packages/networking.scm (wireshark): New variable.

Applied with minor changes:

> +       `(,(string-append "--with-c-ares=" (assoc-ref %build-inputs "c-ares"))
> +         ,(string-append "--with-krb5=" (assoc-ref %build-inputs "krb5"))

I changed it to (list (string-append …) …), which I find more readable.

> +\"packet sniffer\", that lets you capture and interactively browse the
   ^

I changed it to @dfn{packet sniffer}.

Thank you!

Ludo’.