Update "wireshark" package to version 1.6.5. Changes since 1.6.4:

- Bug Fixes
  The following vulnerabilities have been fixed.
     o wnpa-sec-2012-01
       Laurent Butti discovered that Wireshark failed to properly
       check record sizes for many packet capture file formats. (Bug
       6663, bug 6666, bug 6667, bug 6668, bug 6669, bug 6670)
       Versions affected: 1.4.0 to 1.4.10, 1.6.0 to 1.6.4.
     o wnpa-sec-2012-02
       Wireshark could dereference a NULL pointer and crash. (Bug
       6634)
       Versions affected: 1.4.0 to 1.4.10, 1.6.0 to 1.6.4.
     o wnpa-sec-2012-03
       The RLC dissector could overflow a buffer. (Bug 6391)
       Versions affected: 1.4.0 to 1.4.10, 1.6.0 to 1.6.4.
   The following bugs have been fixed:
     o "Closing File!" Dialog Hangs. (Bug 3046)
     o Sub-fields of data field should appear in exported PDML as
       children of the data field instead of as siblings to it. (Bug
       3809)
     o Incorrect time differences displayed with time reference set.
       (Bug 5580)
     o Wrong packet type association of SNMP trap after TFTP
       transfer. (Bug 5727)
     o SSL/TLS decryption needs wireshark to be rebooted. (Bug 6032)
     o Export HTTP Objects -> save all crashes Wireshark. (Bug 6250)
     o Wireshark Netflow dissector complains there is no template
       found though the template is exported. (Bug 6325)
     o DCERPC EPM tower UUID must be interpreted always as little
       endian. (Bug 6368)
     o Crash if no recent files. (Bug 6549)
     o IPv6 frame containing routing header with 0 segments left
       calculates wrong UDP checksum. (Bug 6560)
     o IPv4 UDP/TCP Checksum incorrect if routing header present.
       (Bug 6561)
     o Incorrect Parsing of SCPS Capabilities Option introduced in
       response to bug 6194. (Bug 6562)
     o Various crashes after loading NetMon2.x capture file. (Bug
       6578)
     o Fixed compilation of dumpcap on some systems (when
       MUST_DO_SELECT is defined). (Bug 6614)
     o SIGSEGV in SVN 40046. (Bug 6634)
     o Wireshark dissects TCP option 25 as an "April 1" option. (Bug
       6643)
     o ZigBee ZCL Dissector reports invalid status. (Bug 6649)
     o ICMPv6 DNSSL option malformed on padding. (Bug 6660)
     o Wrong tvb_get_bits function call in packet-csn1.c. (Bug 6708)
     o [UDP] - Length Field of Pseudo Header while computing CheckSum
       is not correct. (Bug 6711)
     o pcapio.c: bug in libpcap_write_interface_description_block.
       (Bug 6719)
     o Memory leaks in various dissectors.
     o Bytes highlighted in wrong Byte pane when field selected in
       Details pane.
- Updated Protocol Support
   BGP, BMC CSN1, DCERPC EPM, DCP(ETSI) DMP DTLS GSM Management, H245
   HPTEAM, ICMPv6, IEEE 802.15.4 IPSEC IPv4, IPv6, ISAKMP KERBEROS
   LDSS NFS RLC, RPC-NETLOGON RRC RTMPT SIGCOMP SSL SYSLOG TCP, UDP,
   XML ZigBee ZCL
- New and Updated Capture File Support
   Accellent 5Views, AIX iptrace, HP-UX nettl, I4B, Microsoft Network
   Monitor, Novell LANalyzer, PacketLogger, Pcap-ng, Sniffer,
   Tektronix K12, WildPackets {Airo,Ether}Peek.

3 files changed, 6 insertions, 27 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 4dac4dd788e..39cd6f80034 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2011/12/10 18:55:37 roy Exp $
+# $NetBSD: Makefile,v 1.73 2012/01/11 09:48:24 tron Exp $
 
-DISTNAME=		wireshark-1.6.4
-PKGREVISION=		1
+DISTNAME=		wireshark-1.6.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 7a7ba3e11b2..38d9d55e220 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.51 2011/12/10 18:55:38 roy Exp $
+$NetBSD: distinfo,v 1.52 2012/01/11 09:48:24 tron Exp $
 
-SHA1 (wireshark-1.6.4.tar.bz2) = 8abd7681e8c05841b7cf31d5dc83c1092c54e79f
-RMD160 (wireshark-1.6.4.tar.bz2) = 9437c416a5963aee1c049c0275bdfd3edd7488e8
-Size (wireshark-1.6.4.tar.bz2) = 21464517 bytes
+SHA1 (wireshark-1.6.5.tar.bz2) = 42870fedaa6460681df30f6af9f18039a322b4a4
+RMD160 (wireshark-1.6.5.tar.bz2) = 33c03112c1f97a94bc7306de918d882a29ada26d
+Size (wireshark-1.6.5.tar.bz2) = 21505901 bytes
 SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9
 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
 SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
@@ -10,4 +10,3 @@ SHA1 (patch-ae) = 7af195e797f8636a9636d30cdea4ee464fd853df
 SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
 SHA1 (patch-bb) = 0758ca0be8054b8b95bb56a304605e6fea0a8f72
 SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e
-SHA1 (patch-bd) = ebfa36d84a9fd3125932b2f40e02684c6e4d003b
diff --git a/net/wireshark/patches/patch-bd b/net/wireshark/patches/patch-bd
deleted file mode 100644
index 5bf1c320274..00000000000
--- a/net/wireshark/patches/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2011/12/10 18:55:38 roy Exp $
-
-Fix ICMPv6 DNSSL padding
-
---- epan/dissectors/packet-icmpv6.c.orig	2011-12-10 13:44:00.000000000 +0000
-+++ epan/dissectors/packet-icmpv6.c	2011-12-10 17:03:28.000000000 +0000
-@@ -1940,7 +1940,11 @@
-                 opt_offset += 4;
-                 while(opt_offset < (offset + opt_len) ) {
- 
--                    if(tvb_get_guint8(tvb, opt_offset) == 0){ /* if Zero there is padding, skip the loop */
-+                    if(tvb_get_guint8(tvb, opt_offset) == 0){
-+                        /* Padding... */
-+                        int padd_length = (offset + opt_len) - opt_offset;
-+                        proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, FALSE);
-+                        opt_offset += padd_length;
-                         break;
-                     }
-                     dnssl_len = get_dns_name(tvb, opt_offset, 0, opt_offset, &dnssl_name);