Update "wireshark" package to version 1.6.3. Changes since version 1.6.2:

- The following vulnerabilities have been fixed.
  o wnpa-sec-2011-17
    The CSN.1 dissector could crash. (Bug 6351)
    Versions affected: 1.6.0 to 1.6.2.
  o wnpa-sec-2011-18
    Huzaifa Sidhpurwala of Red Hat Security Response Team
    discovered that the Infiniband dissector could dereference a
    NULL pointer. (Bug 6476)
    Versions affected: 1.4.0 to 1.4.9, 1.6.0 to 1.6.2.
  o wnpa-sec-2011-19
    Huzaifa Sidhpurwala of Red Hat Security Response Team
    discovered a buffer overflow in the ERF file reader. (Bug
    6479)
    Versions affected: 1.4.0 to 1.4.9, 1.6.0 to 1.6.2.
- The following bugs have been fixed:
  o Assertion failed when doing File->Quit->Save during live
    capture. (Bug 1710)
  o Wrong PCEP XRO sub-object decoding. (Bug 3778)
  o Wireshark window takes very long time to show up if invalid
    network file path is at recent file list (Bug 3810)
  o Decoding [Status Records] Timestamp Sequence Field in Bundle
    Protocol fails if over 32 bits. (Bug 4109)
  o ISUP party number dissection. (Bug 5221)
  o wireshark-1.4.2 crashes when testing the example python
    dissector because of a dissector count assertion. (Bug 5431)
  o Ethernet packets with both VLAN tag and LLC header no longer
    displayed correctly. (Bug 5645)
  o SLL encapsuled 802.1Q VLAN is not dissected. (Bug 5680)
  o Wireshark crashes when attempting to open a file via drag &
    drop when there's already a file open. (Bug 5987)
  o Adding and removing custom HTTP headers requires a restart.
    (Bug 6241)
  o Can't read full 64-bit SNMP values. (Bug 6295)
  o Dissection fails for frames with Gigamon Header and VLAN. (Bug
    6305)
  o RTP Stream Analysis does not work for TURN-encapsulated RTP.
    (Bug 6322)
  o packet-csn1.c doesn't process CSN_CHOICE entries properly.
    (Bug 6328)
  o BACnet property time-synchronization-interval (204) name shown
    incorrectly as time-synchronization-recipients. (Bug 6336)
  o GUI crash on invalid IEEE 802.11 GAS frame. (Bug 6345)
  o [ASN.1 PER] Incorrect decoding of BIT STRING type. (Bug 6347)
  o ICMPv6 router advertisement Prefix Information Flag R "Router
    Address" missing. (Bug 6350)
  o Export -> Object -> HTTP -> save all: Error on saving files.
    (Bug 6362)
  o Inner tag of 802.1ad frames not parsed properly. (Bug 6366)
  o Added cursor type decoding to MySQL dissector. (Bug 6396)
  o Incorrect identification of UDP-encapsulated NAT-keepalive
    packets. (Bug 6414)
  o WPA IE pairwise cipher suite dissector uses incorrect
    value_string list. (Bug 6420)
  o S1AP protocol can't decode IPv6 transportLayerAddress. (Bug
    6435)
  o RTPS2 dissector doesn't handle 0 in the octestToNextHeader
    field. (Bug 6449)
  o packet-ajp13 fix, cleanup, and enhancement. (Bug 6452)
  o Network Instruments Observer file format bugs. (Bug 6453)
  o Wireshark crashes when using "Open Recent" 2 times in a row.
    (Bug 6457)
  o Wireshark packet_gsm-sms, display bug: Filler bits in TP-User
    Data Header. (Bug 6469)
  o wireshark unable to decode NetFlow options which have system
    scope size != 4 bytes. (Bug 6471)
  o Display filter Expression Dialog Box Error. (Bug 6472)
  o text_import_scanner.l missing. (Bug 6531)
- Updated Protocol Support
  AJP13, ASN.1 PER, BACnet, CSN.1, DTN, Ethernet, ICMPv6, IEEE
  802.11, IEEE 802.1q, Infiniband, IPsec, MySQL, PCEP, PN-RT, RTP,
  S1AP, SSL
- New and Updated Capture File Support
  Endace ERF.

3 files changed, 21 insertions, 11 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 771bd580b48..3c90d8f2957 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2011/11/01 06:11:57 sbd Exp $
+# $NetBSD: Makefile,v 1.70 2011/11/02 07:56:24 tron Exp $
 
-DISTNAME=		wireshark-1.6.2
-PKGREVISION=		1
+DISTNAME=		wireshark-1.6.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 5b2f5d63d03..619d38f0f77 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2011/07/20 18:42:44 tron Exp $
+@comment $NetBSD: PLIST,v 1.21 2011/11/02 07:56:24 tron Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -19,6 +19,7 @@ lib/wireshark/plugins/${PKGVERSION}/cosnaming.la
 lib/wireshark/plugins/${PKGVERSION}/docsis.la
 lib/wireshark/plugins/${PKGVERSION}/ethercat.la
 lib/wireshark/plugins/${PKGVERSION}/gryphon.la
+lib/wireshark/plugins/${PKGVERSION}/interlink.la
 lib/wireshark/plugins/${PKGVERSION}/irda.la
 lib/wireshark/plugins/${PKGVERSION}/m2m.la
 lib/wireshark/plugins/${PKGVERSION}/mate.la
@@ -31,7 +32,6 @@ lib/wireshark/plugins/${PKGVERSION}/tango.la
 lib/wireshark/plugins/${PKGVERSION}/unistim.la
 lib/wireshark/plugins/${PKGVERSION}/wimax.la
 lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la
-lib/wireshark/plugins/${PKGVERSION}/interlink.la
 man/man1/capinfos.1
 man/man1/dftest.1
 man/man1/dumpcap.1
@@ -104,8 +104,11 @@ share/wireshark/radius/dictionary.3com
 share/wireshark/radius/dictionary.3gpp
 share/wireshark/radius/dictionary.3gpp2
 share/wireshark/radius/dictionary.acc
+share/wireshark/radius/dictionary.acme
 share/wireshark/radius/dictionary.airespace
 share/wireshark/radius/dictionary.alcatel
+share/wireshark/radius/dictionary.alcatel.esam
+share/wireshark/radius/dictionary.alcatel.sr
 share/wireshark/radius/dictionary.alteon
 share/wireshark/radius/dictionary.altiga
 share/wireshark/radius/dictionary.alvarion
@@ -114,6 +117,7 @@ share/wireshark/radius/dictionary.aptis
 share/wireshark/radius/dictionary.aruba
 share/wireshark/radius/dictionary.ascend
 share/wireshark/radius/dictionary.asn
+share/wireshark/radius/dictionary.audiocodes
 share/wireshark/radius/dictionary.avaya
 share/wireshark/radius/dictionary.azaire
 share/wireshark/radius/dictionary.bay
@@ -149,6 +153,7 @@ share/wireshark/radius/dictionary.gemtek
 share/wireshark/radius/dictionary.h3c
 share/wireshark/radius/dictionary.hp
 share/wireshark/radius/dictionary.huawei
+share/wireshark/radius/dictionary.iea
 share/wireshark/radius/dictionary.infonet
 share/wireshark/radius/dictionary.ipunplugged
 share/wireshark/radius/dictionary.issanni
@@ -165,6 +170,7 @@ share/wireshark/radius/dictionary.merit
 share/wireshark/radius/dictionary.microsoft
 share/wireshark/radius/dictionary.mikrotik
 share/wireshark/radius/dictionary.motorola
+share/wireshark/radius/dictionary.motorola.wimax
 share/wireshark/radius/dictionary.navini
 share/wireshark/radius/dictionary.netscreen
 share/wireshark/radius/dictionary.networkphysics
@@ -193,12 +199,16 @@ share/wireshark/radius/dictionary.rfc3576
 share/wireshark/radius/dictionary.rfc3580
 share/wireshark/radius/dictionary.rfc4072
 share/wireshark/radius/dictionary.rfc4372
+share/wireshark/radius/dictionary.rfc4603
 share/wireshark/radius/dictionary.rfc4675
 share/wireshark/radius/dictionary.rfc4679
 share/wireshark/radius/dictionary.rfc4818
 share/wireshark/radius/dictionary.rfc4849
 share/wireshark/radius/dictionary.rfc5090
 share/wireshark/radius/dictionary.rfc5176
+share/wireshark/radius/dictionary.rfc5580
+share/wireshark/radius/dictionary.rfc5607
+share/wireshark/radius/dictionary.rfc5904
 share/wireshark/radius/dictionary.riverstone
 share/wireshark/radius/dictionary.roaringpenguin
 share/wireshark/radius/dictionary.shasta
@@ -213,8 +223,7 @@ share/wireshark/radius/dictionary.telebit
 share/wireshark/radius/dictionary.telkom
 share/wireshark/radius/dictionary.trapeze
 share/wireshark/radius/dictionary.tropos
-share/wireshark/radius/dictionary.tunnel
-share/wireshark/radius/dictionary.unisphere
+share/wireshark/radius/dictionary.ukerna
 share/wireshark/radius/dictionary.unix
 share/wireshark/radius/dictionary.usr
 share/wireshark/radius/dictionary.utstarcom
@@ -223,7 +232,9 @@ share/wireshark/radius/dictionary.versanet
 share/wireshark/radius/dictionary.vqp
 share/wireshark/radius/dictionary.walabi
 share/wireshark/radius/dictionary.waverider
+share/wireshark/radius/dictionary.wichorus
 share/wireshark/radius/dictionary.wimax
+share/wireshark/radius/dictionary.wimax.wichorus
 share/wireshark/radius/dictionary.wispr
 share/wireshark/radius/dictionary.xedia
 share/wireshark/radius/dictionary.xylan
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 42ecb354c3c..cabb3ce78d5 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.48 2011/09/09 13:02:04 adam Exp $
+$NetBSD: distinfo,v 1.49 2011/11/02 07:56:24 tron Exp $
 
-SHA1 (wireshark-1.6.2.tar.bz2) = a18d4e8eaf56fe0214b19d7fde0eb91a06817a49
-RMD160 (wireshark-1.6.2.tar.bz2) = e343d9bb5600b236dea708bb68ecad805a9ee20a
-Size (wireshark-1.6.2.tar.bz2) = 21408664 bytes
+SHA1 (wireshark-1.6.3.tar.bz2) = de73a1011a9edfa9a1dfbe2d05e32fbd702a0cab
+RMD160 (wireshark-1.6.3.tar.bz2) = 96f221a2fc47c4bb297408a01e8d9f8b0a59fc3b
+Size (wireshark-1.6.3.tar.bz2) = 21468737 bytes
 SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9
 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
 SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840