From f4bac5cdb782f087ffc2d633fce5ca4feca36354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 11 Sep 2017 16:47:15 +0200 Subject: [PATCH] wireshark: 2.4.0 -> 2.4.1 Remove patches that have been merged upstream. --- .../wireshark/add_missing_udpdump_pod.patch | 132 ------------------ .../networking/sniffers/wireshark/default.nix | 18 +-- 2 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch diff --git a/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch b/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch deleted file mode 100644 index a009057307b..00000000000 --- a/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -Nur wireshark-2.4.0/doc/udpdump.pod wireshark-2.4.0-p/doc/udpdump.pod ---- wireshark-2.4.0/doc/udpdump.pod 1970-01-01 01:00:00.000000000 +0100 -+++ wireshark-2.4.0-p/doc/udpdump.pod 2017-08-01 10:48:40.551431319 +0200 -@@ -0,0 +1,128 @@ -+ -+=head1 NAME -+ -+udpdump - Provide an UDP receiver that gets packets from network devices (like Aruba routers) and exports them in PCAP format. -+ -+=head1 SYNOPSIS -+ -+B -+S<[ B<--help> ]> -+S<[ B<--version> ]> -+S<[ B<--extcap-interfaces> ]> -+S<[ B<--extcap-dlts> ]> -+S<[ B<--extcap-interface>=EinterfaceE ]> -+S<[ B<--extcap-config> ]> -+S<[ B<--capture> ]> -+S<[ B<--fifo>=Epath to file or pipeE ]> -+S<[ B<--port>=EportE ]> -+S<[ B<--payload>=EtypeE ]> -+ -+=head1 DESCRIPTION -+ -+B is a extcap tool that provides an UDP receiver that listens for exported datagrams coming from -+any source (like Aruba routers) and exports them in PCAP format. This provides the user two basic -+functionalities: the first one is to have a listener that prevents the localhost to send back an ICMP -+port-unreachable packet. The second one is to strip out the lower layers (layer 2, IP, UDP) that are useless -+(are used just as export vector). The format of the exported datagrams are EXPORTED_PDU, as specified in -+https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob;f=epan/exported_pdu.h;hb=refs/heads/master -+ -+=head1 OPTIONS -+ -+=over 4 -+ -+=item --help -+ -+Print program arguments. -+ -+=item --version -+ -+Print program version. -+ -+=item --extcap-interfaces -+ -+List available interfaces. -+ -+=item --extcap-interface=EinterfaceE -+ -+Use specified interfaces. -+ -+=item --extcap-dlts -+ -+List DLTs of specified interface. -+ -+=item --extcap-config -+ -+List configuration options of specified interface. -+ -+=item --capture -+ -+Start capturing from specified interface save saved it in place specified by --fifo. -+ -+=item --fifo=Epath to file or pipeE -+ -+Save captured packet to file or send it through pipe. -+ -+=item --port=EportE -+ -+Set the listerner port. Port 5555 is the default. -+ -+=item --payload=EtypeE -+ -+Set the payload of the exported PDU. Default: data. -+ -+=back -+ -+=head1 EXAMPLES -+ -+To see program arguments: -+ -+ udpdump --help -+ -+To see program version: -+ -+ udpdump --version -+ -+To see interfaces: -+ -+ udpdump --extcap-interfaces -+ -+ Example output: -+ interface {value=udpdump}{display=UDP Listener remote capture} -+ -+To see interface DLTs: -+ -+ udpdump --extcap-interface=udpdump --extcap-dlts -+ -+ Example output: -+ dlt {number=252}{name=udpdump}{display=Exported PDUs} -+ -+To see interface configuration options: -+ -+ udpdump --extcap-interface=udpdump --extcap-config -+ -+ Example output: -+ arg {number=0}{call=--port}{display=Listen port}{type=unsigned}{range=1,65535}{default=5555}{tooltip=The port the receiver listens on} -+ -+To capture: -+ -+ udpdump --extcap-interface=randpkt --fifo=/tmp/randpkt.pcapng --capture -+ -+NOTE: To stop capturing CTRL+C/kill/terminate application. -+ -+=head1 SEE ALSO -+ -+wireshark(1), tshark(1), dumpcap(1), extcap(4) -+ -+=head1 NOTES -+ -+B is part of the B distribution. The latest version -+of B can be found at L. -+ -+HTML versions of the Wireshark project man pages are available at: -+L. -+ -+=head1 AUTHORS -+ -+ Original Author -+ --------------- -+ Dario Lombardo diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 340c2e0babe..a4a3741aeee 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.0"; + version = "2.4.1"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "011vvrj76z1azkpvyy2j40b1x1z56ymld508zfc4xw3gh8dv82w9"; + sha256 = "1k8zj44pkb2ny2x46f100y7cxddm1kh0zh7f6qggm78gn7wvrp82"; }; cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; @@ -37,19 +37,7 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch - - # Backported from master. Will probably have to be dropped during next - # update. - (fetchpatch { - name = "AUTHORS_add_newline_after_bracket"; - url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=patch;h=27c6b12626d6e7b8e4d7a11784c2c5e2bfb87fde"; - sha256 = "1x30rkrq7dzgdlwrjv2r5ibdpdgwnn5wzvki77rdf13b0547vcw3"; - }) - # A file is missing from distribution. This should be fixed in upcoming - # releases - ./add_missing_udpdump_pod.patch - ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk ''