Update "wireshark" package to version 1.8.3. Changes since 1.8.2:

- Bug Fixes
  The following vulnerabilities have been fixed.
    o wnpa-sec-2012-26
      The HSRP dissector could go into an infinite loop. (Bug 7581)
      Versions affected: 1.8.0 to 1.8.2.
      CVE-2012-5237
    o wnpa-sec-2012-27
      The PPP dissector could abort. (Bug 7316, bug 7668)
      Versions affected: 1.8.0 to 1.8.2.
      CVE-2012-5238
    o wnpa-sec-2012-28
      Martin Wilck discovered an infinite loop in the DRDA
      dissector. (Bug 7666)
      Versions affected: 1.6.0 to 1.6.10, 1.8.0 to 1.8.2.
      CVE-2012-5239
    o wnpa-sec-2012-29
      Laurent Butti discovered a buffer overflow in the LDP
      dissector. (Bug 7567)
      Versions affected: 1.8.0 to 1.8.2.
      CVE-2012-5240
  The following bugs have been fixed:
    o The HTTP dissector does not reassemble headers when the first
      TCP segment does not contain a full header line.
    o HDCP2 uses the wrong protocol id.
    o Several I/O graph problems have been fixed.
    o No markers show up when maps are displayed. (Bug 5016)
    o Assertion when using tshark/wireshark on large captures. (Bug
      5699)
    o Volume label field of "SMB/TRANS2-QUERY_FS_INFO/InfoVolume
      level" reply packet is not displayed correctly due alignment
      issue. (Bug 5778)
    o 64-bit Wireshark appears to hit 2-Gbyte memory limit on 64-bit
      Windows. (Bug 5979)
    o Truncated/partial JPEG files are not dissected. (Bug 6230)
    o Support for MPLS Packet Loss and Delay Measurement, RFC 6374.
      (Bug 6881)
    o Memory leak in voip_calls.c. (Bug 7320)
    o When listing protocols available for "Decode As", plugins are
      sorted after built-ins. (Bug 7348)
    o Hidden columns should not be printed when printing packet
      summary line. (Bug 7356)
    o Size wrong in "File Set List" for just-finished captures. (Bug
      7370)
    o Error: no dependency information found for
      debian/wireshark-common/usr/lib/wireshark/libwsutil.so.2 (used
      by debian/wireshark/usr/bin/wireshark). (Bug 7408)
    o Parse and properly display LTE RADIUS AVP
      3GPP-User-Location-Info. (Bug 7474)
    o [PATCH] HomeplugAV dissector: decode device id. (Bug 7548)
    o BACnet GetEnrollmentSummary-ACK does not decode correctly.
      (Bug 7556)
    o epan/dissectors/packet-per.c
      dissect_per_constrained_integer_64b fails for 64 bits. (Bug
      7624)
    o New SCTP PPID 48. (Bug 7635)
    o dissector of Qos attribute "Reliability Class" in GMM/SM
      message. (Bug 7670)
    o Performance regression in tshark -z io,stat. (Bug 7674)
    o Incorrect io-stat table format when unsupported "-t" operand
      is specified and when using AVG of relative_time fields. (Bug
      7685)
    o IEEE 802.11 TKIP dissection : wrong IS_TKIP macro. (Bug 7691)
    o Homeplug AV dissectors does not properly dissect short frames.
      (Bug 7707)
    o mm_context_nas_dl_cnt and mm_context_nas_ul_cnt are not
      dissected properly in ContextResponse message in Gtpv2. (Bug
      7718)
    o This trace causes Wireshark to crash when VoIP Calls selected.
      (Bug 7724)
    o Some diameter Gx enumerations are missing values or value is
      incorrect. (Bug 7727)
    o Wireshark 1.8.2 is only displaying 2 filters from the
      drop-down menu even when preferences are set to higher
      integer. (Bug 7731)
    o BGP bad decoding for Graceful Restart Capability with only
      helper support & for Enhanced Route Refresh Capability. (Bug
      7734)
    o Dissection error of D-RELEASE and D-CONNECT in TETRA
      dissector. (Bug 7736)
    o DND can cause Wireshark to crash. (Bug 7744)
    o SCSI: WRITE BUFFER fields always display as zero. (Bug 7753)
- Updated Protocol Support
  ASN.1 PER, BACnet, BGP, DIAMETER, DRDA, DVB CI, DVB, GSM
  Management, GTP, GTPv2, HDCP2, HomePlug AV, ICMP, ICMPv6, IEEE
  802.11, IEEE 802a, Interlink, JPEG, LDP, LPP, MPEG, MPLS, PCAP,
  PPP, RANAP, RRC, RRLP, SCCP, SCSI, SCTP, SDP, SMB, TETRA

4 files changed, 8 insertions, 37 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index a4e3b51c26c..f75b57deb49 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.88 2012/10/03 21:57:13 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2012/10/04 20:15:48 tron Exp $
 
-DISTNAME=		wireshark-1.8.2
-PKGREVISION=		6
+DISTNAME=		wireshark-1.8.3
 CATEGORIES=		net
 MASTER_SITES=		http://www.wireshark.org/download/src/ \
 			${MASTER_SITE_SOURCEFORGE:=wireshark/}
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index e612c98bb97..8545d7447da 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2012/08/20 12:21:53 tron Exp $
+@comment $NetBSD: PLIST,v 1.24 2012/10/04 20:15:48 tron Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -44,6 +44,7 @@ share/wireshark/colorfilters
 ${PLIST.lua}share/wireshark/console.lua
 share/wireshark/dfilters
 share/wireshark/dftest.html
+share/wireshark/diameter/AlcatelLucent.xml
 share/wireshark/diameter/Cisco.xml
 share/wireshark/diameter/Ericsson.xml
 share/wireshark/diameter/TGPPGmb.xml
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index cc68675ecfb..d96edbd3277 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.59 2012/09/04 23:08:38 tron Exp $
+$NetBSD: distinfo,v 1.60 2012/10/04 20:15:48 tron Exp $
 
-SHA1 (wireshark-1.8.2.tar.bz2) = 4737d9745dbf002444ea42615243abf3bb80b943
-RMD160 (wireshark-1.8.2.tar.bz2) = 5fece857d5187b146a690fda111a0611e108c2a9
-Size (wireshark-1.8.2.tar.bz2) = 24121798 bytes
-SHA1 (patch-CVE-2012-3548) = 0d72d0e485ed09e1c28bd85bf1f06aa390be4981
+SHA1 (wireshark-1.8.3.tar.bz2) = 3e1322eea5794c71de752b7923af9379bcc95299
+RMD160 (wireshark-1.8.3.tar.bz2) = ba9d74f06999ec6af9ccf9d8bc2ddece5c22b6d5
+Size (wireshark-1.8.3.tar.bz2) = 24123989 bytes
 SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d
 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
 SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
diff --git a/net/wireshark/patches/patch-CVE-2012-3548 b/net/wireshark/patches/patch-CVE-2012-3548
deleted file mode 100644
index 3f6a2650679..00000000000
--- a/net/wireshark/patches/patch-CVE-2012-3548
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-CVE-2012-3548,v 1.1 2012/09/04 23:08:38 tron Exp $
-
-Fix for the remote DoS security vulnerability reported in CVE-2012-3548.
-The patch was taken from the Wireshark SVN repository:
-
-http://anonsvn.wireshark.org/viewvc?view=revision&revision=44749
-
---- epan/dissectors/packet-drda.c.orig	2012-06-05 17:33:38.000000000 +0100
-+++ epan/dissectors/packet-drda.c	2012-09-04 21:38:12.000000000 +0100
-@@ -55,6 +55,7 @@
- #include <epan/packet.h>
- #include <epan/conversation.h>
- #include <epan/prefs.h>
-+#include <epan/expert.h>
- #include "packet-tcp.h"
- 
- static int proto_drda = -1;
-@@ -696,6 +697,10 @@
-     {
-         iCommand = tvb_get_ntohs(tvb, offset + 8);
-         iLength = tvb_get_ntohs(tvb, offset + 0);
-+        if (iLength < 10) {
-+            expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Invalid length detected (%u): should be at least 10 bytes long", iLength);
-+            break;
-+        }
-         /* iCommandEnd is the length of the packet up to the end of the current command */
-         iCommandEnd += iLength;
-