Updated wireshark to 2.0.4.

                         Wireshark 2.0.4 Release Notes
What's New

  Bug Fixes

   The following vulnerabilities have been fixed:
     * [1]wnpa-sec-2016-29
       The SPOOLS dissector could go into an infinite loop. Discovered by
       the CESG.
     * [2]wnpa-sec-2016-30
       The IEEE 802.11 dissector could crash. ([3]Bug 11585)
     * [4]wnpa-sec-2016-31
       The IEEE 802.11 dissector could crash. Discovered by Mateusz
       Jurczyk. ([5]Bug 12175)
     * [6]wnpa-sec-2016-32
       The UMTS FP dissector could crash. ([7]Bug 12191)
     * [8]wnpa-sec-2016-33
       Some USB dissectors could crash. Discovered by Mateusz Jurczyk.
       ([9]Bug 12356)
     * [10]wnpa-sec-2016-34
       The Toshiba file parser could crash. Discovered by iDefense Labs.
       ([11]Bug 12394)
     * [12]wnpa-sec-2016-35
       The CoSine file parser could crash. Discovered by iDefense Labs.
       ([13]Bug 12395)
     * [14]wnpa-sec-2016-36
       The NetScreen file parser could crash. Discovered by iDefense Labs.
       ([15]Bug 12396)
     * [16]wnpa-sec-2016-37
       The Ethernet dissector could crash. ([17]Bug 12440)

   The following bugs have been fixed:
     * Saving pcap capture file with ERF encapsulation creates an invalid
       pcap file. ([18]Bug 3606)
     * Questionable calling of Ethernet dissector by encapsulating
       protocol dissectors. ([19]Bug 9933)
     * Wireshark 1.12.0 does not dissect HTTP correctly. ([20]Bug 10335)
     * Don't copy details of hidden columns. ([21]Bug 11788)
     * RTP audio player crashes. ([22]Bug 12166)
     * Crash when saving RTP audio Telephony->RTP->RTP
       Streams->Analyze->Save->Audio. ([23]Bug 12211)
     * Edit - preferences - add column field not showing dropdown for
       choices. ([24]Bug 12321)
     * Using _ws.expert in a filter can cause a crash. ([25]Bug 12335)
     * Crash in SCCP dissector UAT (Qt UI only). ([26]Bug 12364)
     * J1939 frame without data = malformed packet ? ([27]Bug 12366)
     * The stream number in tshark's "-z follow,tcp,<stream number>"
       option is 0-origin rather than 1-origin. ([28]Bug 12383)
     * IP Header Length display filter should show calculated value.
       ([29]Bug 12387)
     * Multiple file radio buttons should be check boxes. ([30]Bug 12388)
     * Wrong check for getaddrinfo and gethostbyname on Solaris 11.
       ([31]Bug 12391)
     * ICMPv6 dissector doesn't respect actual packet length. ([32]Bug
       12400)
     * Format DIS header timestamp mm:ss.nnnnnn. ([33]Bug 12402)
     * RTP Stream Analysis can no longer be sorted in 2.0.3. ([34]Bug
       12405)
     * RTP Stream Analysis fails to complete in 2.0.3 when packets are
       sliced. ([35]Bug 12406)
     * Network-Layer Name Resolution uses first 32-bits of IPv6 DNS
       address as IPv4 address in some circumstances. ([36]Bug 12412)
     * BACnet decoder incorrectly flags a valid APDU as a "Malformed
       Packet". ([37]Bug 12422)
     * Valid ISUP messages marked with warnings. ([38]Bug 12423)
     * Profile command line switch "-C" not working in Qt interface.
       ([39]Bug 12425)
     * MRCPv2: info column not showing info correctly. ([40]Bug 12426)
     * Diameter: Experimental result code 5142. ([41]Bug 12428)
     * Tshark crashes when analyzing RTP due to pointer being freed not
       allocated. ([42]Bug 12430)
     * NFS: missing information in getattr for supported exclusive create
       attributes. ([43]Bug 12435)
     * Ethernet type field with a value of 9100 is shown as "Unknown".
       ([44]Bug 12441)
     * Documentation does not include support for Windows Server 2012 R2.
       ([45]Bug 12455)
     * Column preferences ruined too easily. ([46]Bug 12465)
     * SMB Open andX extended response decoded incorrectly. ([47]Bug
       12472)
     * SMB NtCreate andX with extended response sometimes incorrect.
       ([48]Bug 12473)
     * Viewing NFSv3 Data, checking SRTs doesn't work. ([49]Bug 12478)
     * Make wireshark with Qt enabled buildable on ARM. ([50]Bug 12483)

  Updated Protocol Support

   AFS, ANSI IS-637 A, BACapp, BT BNEP, Cisco FabricPath MiM, CSN.1,
   DCERPC SPOOLS, DIS, Ethernet, GSM A RR, ICMPv6, IEEE 802.11, IPv4,
   ISUP, J1939, JXTA, LAPSat, LPADm, LTE-RRC, MRCPv2, NFS, OpenFlow,
   SGsAP, SMB, STT, TZSP, UMTS FP, and USB

  New and Updated Capture File Support

   Aethra, Catapult DCT2000, CoSine, DBS Etherwatch, ERF, iSeries, Ixia
   IxVeriWave, NetScreen, Toshiba, and VMS TCPIPtrace

2 files changed, 7 insertions, 7 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index a57977086bd..dd30b67ec4f 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.147 2016/04/24 10:02:13 wiz Exp $
+# $NetBSD: Makefile,v 1.148 2016/06/11 14:40:17 wiz Exp $
 
-DISTNAME=	wireshark-2.0.3
+DISTNAME=	wireshark-2.0.4
 CATEGORIES=	net
 MASTER_SITES=	https://www.wireshark.org/download/src/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index dae643bef82..862b6b81bd0 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.88 2016/04/24 10:02:13 wiz Exp $
+$NetBSD: distinfo,v 1.89 2016/06/11 14:40:17 wiz Exp $
 
-SHA1 (wireshark-2.0.3.tar.bz2) = 9805d62b4fb108cc1e755d8c47f8c1e21eee8b73
-RMD160 (wireshark-2.0.3.tar.bz2) = 24504bb0acd10fb7c1d93eab0a1de0f49b6b82c4
-SHA512 (wireshark-2.0.3.tar.bz2) = 37d64b5f84249f263eae3159794450f642857c91d4fffe483cd562fa8abc93cc8a3152f66ca6b6230b2990e36c28a4ffbf696ff630058990154946eed457f076
-Size (wireshark-2.0.3.tar.bz2) = 31110988 bytes
+SHA1 (wireshark-2.0.4.tar.bz2) = 9d76a28ba4f7566bef1aefbb2868e1ddcb93e999
+RMD160 (wireshark-2.0.4.tar.bz2) = c767f062c421e15cde8f1d83c8fcd7c2c2a138eb
+SHA512 (wireshark-2.0.4.tar.bz2) = f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07
+Size (wireshark-2.0.4.tar.bz2) = 31121258 bytes
 SHA1 (patch-ui_qt_mtp3__summary__dialog.cpp) = 3d434377581e1993802fbe4b02c98849d0e6a9bb