Update "wireshark" package to version 1.8.5. Changes since 1.8.4:

- Bug Fixes
  The following vulnerabilities have been fixed.
    o wnpa-sec-2013-01
      Infinite and large loops in the Bluetooth HCI, CSN.1, DCP-ETSI
      DOCSIS CM-STAUS, IEEE 802.3 Slow Protocols, MPLS, R3, RTPS,
      SDP, and SIP dissectors. Reported by Laurent Butti. (Bugs
      8036, 8037, 8038, 8040, 8041, 8042, 8043, 8198, 8199, 8222)
      Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
      GENERIC-MAP-NOMATCH
    o wnpa-sec-2013-02
      The CLNP dissector could crash. Discovered independently by
      Laurent Butti and the Wireshark development team. (Bug 7871)
      Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
      GENERIC-MAP-NOMATCH
    o wnpa-sec-2013-03
      The DTN dissector could crash. (Bug 7945)
      Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
      GENERIC-MAP-NOMATCH
    o wnpa-sec-2013-04
      The MS-MMC dissector (and possibly others) could crash. (Bug
      8112)
      Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
      GENERIC-MAP-NOMATCH
    o wnpa-sec-2013-05
      The DTLS dissector could crash. Discovered by Laurent Butti.
      (Bug 8111)
      Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
      GENERIC-MAP-NOMATCH
    o wnpa-sec-2013-06
      The ROHC dissector could crash. (Bug 7679)
      Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
      GENERIC-MAP-NOMATCH
    o wnpa-sec-2013-07
      The DCP-ETSI dissector could corrupt memory. Discovered by
      Laurent Butti. (Bug 8213)
      Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
      GENERIC-MAP-NOMATCH
    o wnpa-sec-2013-08
      The Wireshark dissection engine could crash. Discovered by
      Laurent Butti. (Bug 8197)
      Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
      GENERIC-MAP-NOMATCH
    o wnpa-sec-2013-09
      The NTLMSSP dissector could overflow a buffer. Discovered by
      Ulf Härnhammar. (Bug X)
      Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
      GENERIC-MAP-NOMATCH
- The following bugs have been fixed:
    o SNMPv3 Engine ID registration. (Bug 2426)
    o Wrong decoding of gtp.target identification. (Bug 3974)
    o Reassemble.c leaks memory for GLIB > 2.8. (Bug 4141)
    o Wireshark crashes when starting due to out-of-date plugin left
      behind from earlier installation. (Bug 7401)
    o Failed to dissect TLS handshake packets. (Bug 7435)
    o ISUP dissector problem with empty Generic Number. (Bug 7632)
    o Illegal character is used in temporary capture file name. (Bug
      7877)
    o Lua code crashes wireshark after update to 1.8.3. (Bug 7976)
    o Timestamp info is not saved correctly when writing DOS Sniffer
      files. (Bug 7998)
    o 1.8.3 Wireshark User's Guide version is 1.6. (Bug 8009)
    o Core dumped when the file is closed. (Bug 8022)
    o LPP is misspelled in APDU parameter in
      e-CIDMeasurementInitiation request for LPPA message. (Bug
      8023)
    o Wrong packet bytes are selected for ISUP CUG binary code. (Bug
      8035)
    o Decodes FCoE Group Multicast MAC address as Broadcom MAC
      address. (Bug 8046)
    o The SSL dissector stops decrypting the SSL conversation with
      Malformed Packet:SSL error messages. (Bug 8075)
    o Unable to Save/Apply [Unistim Port] in Preferences. (Bug 8078)
    o Some Information Elements in GTPv2 are not dissected
      correctly. (Bug 8079)
    o Wrong bytes highlighted with "Find Packet...". (Bug 8085)
    o 3GPP ULI AVP. SAI is not correctly decoded. (Bug 8098)
    o Wireshark does not show "Start and End Time" information for
      Cisco Netflow/IPFIX with type 154 to 157. (Bug 8105)
    o GPRS Tunnel Protocoll GTP Version 1 does not decode DAF flag
      in Common Flags IE. (Bug 8193)
    o Wrong parcing of ULI of gtpv2 messages - errors in SAC, RAC &
      ECI. (Bug 8208)
    o Version Number in EtherIP dissector. (Bug 8211)
    o Warn Dissector bug, protocol JXTA. (Bug 8212)
    o Electromagnetic Emission Parser parses field Event Id as
      Entity Id. (Bug 8227)
- Updated Protocol Support
  ANSI IS-637-A, ASN.1 PER, AX.25, Bluetooth HCI, CLNP, CSN.1,
  DCP-ETSI, DIAMETER, DIS PDU, DOCSIS CM-STATUS, DTLS, DTN, EtherIP,
  Fibre Channel, GPRS, GTP, GTPv2, HomePlug AV, IEEE 802.3 Slow,
  IEEE 802.15.4, ISUP, JXTA, LAPD, LPPa, MPLS, MS-MMC, NAS-EPS,
  NTLMSSP, ROHC, RSL, RTPS, SDP, SIP, SNMP, SSL
- New and Updated Capture File Support
  DOS Sniffer

2 files changed, 6 insertions, 6 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 0ce6fc37b03..02312295510 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2012/12/02 09:52:11 tron Exp $
+# $NetBSD: Makefile,v 1.93 2013/01/31 10:40:37 tron Exp $
 
-DISTNAME=		wireshark-1.8.4
+DISTNAME=		wireshark-1.8.5
 CATEGORIES=		net
 MASTER_SITES=		http://www.wireshark.org/download/src/ \
 			${MASTER_SITE_SOURCEFORGE:=wireshark/}
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 3affa761968..d3fa6b7f802 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.61 2012/12/02 09:52:11 tron Exp $
+$NetBSD: distinfo,v 1.62 2013/01/31 10:40:38 tron Exp $
 
-SHA1 (wireshark-1.8.4.tar.bz2) = 00265d9196f030848c78025f30556cd014be843d
-RMD160 (wireshark-1.8.4.tar.bz2) = 73f00ccfe86239022679eb2c889bc4371a61942d
-Size (wireshark-1.8.4.tar.bz2) = 24164286 bytes
+SHA1 (wireshark-1.8.5.tar.bz2) = 76c719d92a2e200588a5452bbe61178b915eb99b
+RMD160 (wireshark-1.8.5.tar.bz2) = ecf67d55cd2d9218c28335163ede3969a9776d97
+Size (wireshark-1.8.5.tar.bz2) = 24196532 bytes
 SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d
 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
 SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840