Update "wireshark" package to version 1.2.2. Changes since version 1.2.1:

- The following vulnerabilities have been fixed. See the security
  advisory for details and a workaround.
  - The GSM A RR dissector could crash.
    Versions affected: 1.2.0 to 1.2.1
  - The OpcUa dissector could use excessive CPU and memory.
    Versions affected: 0.99.6 to 1.0.8, 1.2.0 to 1.2.1
  - The TLS dissector could crash on some platforms.
    Versions affected: 1.2.0 to 1.2.1
- The following bugs have been fixed:
  - The "Capture->Interfaces" window can't be closed. (Bug 1740)
  - tshark-1.0.2 (dumpcap) signal abort core saved. (Bug 2767)
  - Memory leak fixes. (Bug 3330)
  - Display filter autocompletion doesn't work for some RADIUS and
    WiMAX ASNCP fields. (Bug 3538)
  - Wireshark Portable includes wrong WinPcap installer. (Bug
    3547)
  - Crash when loading a profile. (Bug 3640)
  - The proto,colinfo tap doesn't work if the INFO column isn't
    being printed. (Bug 3675)
  - Flow Graph adds too much unnecessary garbage. (Bug 3693)
  - The EAP Diameter dictionary file was missing in the
    distribution. (Bug 3761)
  - Graph analysis window is behind other window. (Bug 3773)
  - IKEv2 Cert Request payload dissection error. (Bug 3782)
  - DNS NAPTR RR (RFC 3403) replacement MUST be a fully qualified
    domain-name. (Bug 3792)
  - Malformed RTCP Packet error while sending Payload specific
    RTCP feedback packet( as per RFC 4585). (Bug 3800)
  - 802.11n Block Ack packet Bitmap field missing. (Bug 3806)
  - Wireshark doesn't decode WBXML/ActiveSync information
    correctly. (Bug 3811)
  - Malformed packet when IPv6 packet has Next Header == 59. (Bug
    3820)
  - Wireshark could crash while reading an ERF file. (Bug 3849)
  - Minor errors in gsm rr dissectors. (Bug 3889)
  - WPA Decryption Issues. (Bug 3890)
  - GSM A RR sys info dissection problem. (Bug 3901)
  - GSM A RR inverts MEAS-VALID values. (Bug 3915)
  - PDML output leaks ~300 bytes / packet. (Bug 3913)
  - Incorrect station identifier parsing in Kingfisher dissector.
    (Bug 3946)
  - DHCPv6, Vendor-Specific Informantion, SubOption"Option
    Request" parser incorrect. (Bug 3987)
  - Wireshark could leak memory while analyzing SSL.
  - Wireshark could crash while updating menu items after reading
    a file in some cases.
  - The Mac OS X ChmodBPF script now works correctly under Snow
    Leopard.
- Updated Protocol Support
  DCERPC, DHCPv6, DNS, E.212, GSM A RR, GTPv2, H.248, IEEE 802.11,
  IPMI, ISAKMP/IKE, ISUP, Kingfisher, LDAP, OpcUA, RTCP, SCTP, SIP,
  SSL, TCP, WBXML, ZRTP
- Updated Capture File Support
  ERF

3 files changed, 8 insertions, 8 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 471cf0670d0..4510ae64a26 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2009/08/26 19:58:46 sno Exp $
+# $NetBSD: Makefile,v 1.37 2009/09/19 06:36:18 tron Exp $
 
-DISTNAME=		wireshark-1.2.1
-PKGREVISION=		1
+DISTNAME=		wireshark-1.2.2
 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 c7d0a71dcd0..997369c8453 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/07/21 20:39:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/09/19 06:36:18 tron Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -54,6 +54,7 @@ share/wireshark/diameter/TGPPSh.xml
 share/wireshark/diameter/chargecontrol.xml
 share/wireshark/diameter/dictionary.dtd
 share/wireshark/diameter/dictionary.xml
+share/wireshark/diameter/eap.xml
 share/wireshark/diameter/etsie2e4.xml
 share/wireshark/diameter/gqpolicy.xml
 share/wireshark/diameter/imscxdx.xml
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 24fd8e87a79..855edbe203e 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2009/07/21 20:39:41 tron Exp $
+$NetBSD: distinfo,v 1.24 2009/09/19 06:36:18 tron Exp $
 
-SHA1 (wireshark-1.2.1.tar.bz2) = ff565edd4b8c7b8d131060145dd35873c0dd8fa9
-RMD160 (wireshark-1.2.1.tar.bz2) = 335814f79b56805b2dc5c130b2b91ed9b33d1591
-Size (wireshark-1.2.1.tar.bz2) = 15129422 bytes
+SHA1 (wireshark-1.2.2.tar.bz2) = ad73bf93096344341cd7c99614816555bebdbf45
+RMD160 (wireshark-1.2.2.tar.bz2) = 6adbd80e3027a63b456b971edba0185411d30546
+Size (wireshark-1.2.2.tar.bz2) = 15186702 bytes
 SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9
 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
 SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840