pyrox.dev
Merge pull request #27832 from lsix/update_wireshark
wireshark: 2.2.7 -> 2.4.0
authored by Lancelot SIX and committed by GitHub 90282d95 b725e408
+132
pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch
+132
pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch
···
1
+
diff -Nur wireshark-2.4.0/doc/udpdump.pod wireshark-2.4.0-p/doc/udpdump.pod
2
+
--- wireshark-2.4.0/doc/udpdump.pod 1970-01-01 01:00:00.000000000 +0100
3
+
+++ wireshark-2.4.0-p/doc/udpdump.pod 2017-08-01 10:48:40.551431319 +0200
4
+
@@ -0,0 +1,128 @@
5
+
+
6
+
+=head1 NAME
7
+
+
8
+
+udpdump - Provide an UDP receiver that gets packets from network devices (like Aruba routers) and exports them in PCAP format.
9
+
+
10
+
+=head1 SYNOPSIS
11
+
+
12
+
+B<udpdump>
13
+
+S<[ B<--help> ]>
14
+
+S<[ B<--version> ]>
15
+
+S<[ B<--extcap-interfaces> ]>
16
+
+S<[ B<--extcap-dlts> ]>
17
+
+S<[ B<--extcap-interface>=E<lt>interfaceE<gt> ]>
18
+
+S<[ B<--extcap-config> ]>
19
+
+S<[ B<--capture> ]>
20
+
+S<[ B<--fifo>=E<lt>path to file or pipeE<gt> ]>
21
+
+S<[ B<--port>=E<lt>portE<gt> ]>
22
+
+S<[ B<--payload>=E<lt>typeE<gt> ]>
23
+
+
24
+
+=head1 DESCRIPTION
25
+
+
26
+
+B<udpdump> is a extcap tool that provides an UDP receiver that listens for exported datagrams coming from
27
+
+any source (like Aruba routers) and exports them in PCAP format. This provides the user two basic
28
+
+functionalities: the first one is to have a listener that prevents the localhost to send back an ICMP
29
+
+port-unreachable packet. The second one is to strip out the lower layers (layer 2, IP, UDP) that are useless
30
+
+(are used just as export vector). The format of the exported datagrams are EXPORTED_PDU, as specified in
31
+
+https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob;f=epan/exported_pdu.h;hb=refs/heads/master
32
+
+
33
+
+=head1 OPTIONS
34
+
+
35
+
+=over 4
36
+
+
37
+
+=item --help
38
+
+
39
+
+Print program arguments.
40
+
+
41
+
+=item --version
42
+
+
43
+
+Print program version.
44
+
+
45
+
+=item --extcap-interfaces
46
+
+
47
+
+List available interfaces.
48
+
+
49
+
+=item --extcap-interface=E<lt>interfaceE<gt>
50
+
+
51
+
+Use specified interfaces.
52
+
+
53
+
+=item --extcap-dlts
54
+
+
55
+
+List DLTs of specified interface.
56
+
+
57
+
+=item --extcap-config
58
+
+
59
+
+List configuration options of specified interface.
60
+
+
61
+
+=item --capture
62
+
+
63
+
+Start capturing from specified interface save saved it in place specified by --fifo.
64
+
+
65
+
+=item --fifo=E<lt>path to file or pipeE<gt>
66
+
+
67
+
+Save captured packet to file or send it through pipe.
68
+
+
69
+
+=item --port=E<lt>portE<gt>
70
+
+
71
+
+Set the listerner port. Port 5555 is the default.
72
+
+
73
+
+=item --payload=E<lt>typeE<gt>
74
+
+
75
+
+Set the payload of the exported PDU. Default: data.
76
+
+
77
+
+=back
78
+
+
79
+
+=head1 EXAMPLES
80
+
+
81
+
+To see program arguments:
82
+
+
83
+
+ udpdump --help
84
+
+
85
+
+To see program version:
86
+
+
87
+
+ udpdump --version
88
+
+
89
+
+To see interfaces:
90
+
+
91
+
+ udpdump --extcap-interfaces
92
+
+
93
+
+ Example output:
94
+
+ interface {value=udpdump}{display=UDP Listener remote capture}
95
+
+
96
+
+To see interface DLTs:
97
+
+
98
+
+ udpdump --extcap-interface=udpdump --extcap-dlts
99
+
+
100
+
+ Example output:
101
+
+ dlt {number=252}{name=udpdump}{display=Exported PDUs}
102
+
+
103
+
+To see interface configuration options:
104
+
+
105
+
+ udpdump --extcap-interface=udpdump --extcap-config
106
+
+
107
+
+ Example output:
108
+
+ arg {number=0}{call=--port}{display=Listen port}{type=unsigned}{range=1,65535}{default=5555}{tooltip=The port the receiver listens on}
109
+
+
110
+
+To capture:
111
+
+
112
+
+ udpdump --extcap-interface=randpkt --fifo=/tmp/randpkt.pcapng --capture
113
+
+
114
+
+NOTE: To stop capturing CTRL+C/kill/terminate application.
115
+
+
116
+
+=head1 SEE ALSO
117
+
+
118
+
+wireshark(1), tshark(1), dumpcap(1), extcap(4)
119
+
+
120
+
+=head1 NOTES
121
+
+
122
+
+B<udpdump> is part of the B<Wireshark> distribution. The latest version
123
+
+of B<Wireshark> can be found at L<https://www.wireshark.org>.
124
+
+
125
+
+HTML versions of the Wireshark project man pages are available at:
126
+
+L<https://www.wireshark.org/docs/man-pages>.
127
+
+
128
+
+=head1 AUTHORS
129
+
+
130
+
+ Original Author
131
+
+ ---------------
132
+
+ Dario Lombardo <lomato[AT]gmail.com>
+19
-5
pkgs/applications/networking/sniffers/wireshark/default.nix
+19
-5
pkgs/applications/networking/sniffers/wireshark/default.nix
···
1
1
{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
2
2
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
3
-
, libssh, zlib, cmake, extra-cmake-modules
3
+
, libssh, zlib, cmake, extra-cmake-modules, fetchpatch
4
4
, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
5
5
, withQt ? false, qt5 ? null
6
6
, ApplicationServices, SystemConfiguration, gmp
···
12
12
with stdenv.lib;
13
13
14
14
let
15
-
version = "2.2.7";
15
+
version = "2.4.0";
16
16
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
17
17
18
18
in stdenv.mkDerivation {
19
19
name = "wireshark-${variant}-${version}";
20
20
21
21
src = fetchurl {
22
-
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
23
-
sha256 = "1dfvhra5v6xhzbp097qsxi0zvirw0srbasl4v1wjf58v49idz7b8";
22
+
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
23
+
sha256 = "011vvrj76z1azkpvyy2j40b1x1z56ymld508zfc4xw3gh8dv82w9";
24
24
};
25
+
26
+
cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";
25
27
26
28
nativeBuildInputs = [
27
29
bison cmake extra-cmake-modules flex
···
35
37
++ optionals stdenv.isLinux [ libcap libnl ]
36
38
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
37
39
38
-
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
40
+
patches = [ ./wireshark-lookup-dumpcap-in-path.patch
41
+
42
+
# Backported from master. Will probably have to be dropped during next
43
+
# update.
44
+
(fetchpatch {
45
+
name = "AUTHORS_add_newline_after_bracket";
46
+
url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=patch;h=27c6b12626d6e7b8e4d7a11784c2c5e2bfb87fde";
47
+
sha256 = "1x30rkrq7dzgdlwrjv2r5ibdpdgwnn5wzvki77rdf13b0547vcw3";
48
+
})
49
+
# A file is missing from distribution. This should be fixed in upcoming
50
+
# releases
51
+
./add_missing_udpdump_pod.patch
52
+
];
39
53
40
54
postInstall = optionalString (withQt || withGtk) ''
41
55
${optionalString withGtk ''