Changes 1.10.0:

Wireshark on 32- and 64-bit Windows supports automatic updates.
The packet bytes view is faster.
You can now display a list of resolved host names in "hosts" format within Wireshark.
The wireless toolbar has been updated.
Wireshark on Linux does a better job of detecting interface addition and removal.
It is now possible to compare two fields in a display filter (for example: udp.srcport != udp.dstport). The two fields must be of the same type for this to work.
The Windows installers ship with WinPcap 4.1.3, which supports Windows 8.
USB type and product name support has been improved.
All Bluetooth profiles and protocols are now supported.
Wireshark now calculates HTTP response times and presents the result in a new field in the HTTP response. Links from the request’s frame to the response’s frame and vice-versa are also added.
The main welcome screen and status bar now display file sizes using strict SI prefixes instead of old-style binary prefixes.
Capinfos now prints human-readable statistics with SI suffixes by default.
It is now possible to open a referenced packet (such as the matched request or response packet) in a new window.
Tshark can now display only the hex/ascii packet data without requiring that the packet summary and/or packet details are also displayed. If you want the old behavior, use -Px instead of just -x.
Wireshark can be compiled using GTK+ 3.
The Wireshark application icon, capture toolbar icons, and other icons have been updated.
Tshark’s filtering and multi-pass analysis have been reworked for consistency and in order to support dependent frame calculations during reassembly. See the man page descriptions for -2, -R, and -Y.
Tshark’s -G fields2 and -G fields3 options have been eliminated. The -G fields option now includes the 2 extra fields that -G fields3 previously provided, and the blurb information has been relegated to the last column since in many cases it is blank anyway.
Wireshark dropped the left-handed settings from the preferences. This is still configurable via the GTK settings (add "gtk-scrolled-window-placement = top-right" in the config file, which might be called /.gtkrc-2.0 or /.config/gtk-3.0/settings.ini).
Wireshark now ships with two global configuration files: Bluetooth, which contains coloring rules for Bluetooth and Classic, which contains the old-style coloring rules.
The LOAD() metric in the IO-graph now shows the load in IO units instead of thousands of IO units.

7 files changed, 116 insertions, 51 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 2f91272ed44..8390e5f86ac 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.103 2013/06/11 22:57:58 tron Exp $
+# $NetBSD: Makefile,v 1.104 2013/07/04 21:33:14 adam Exp $
 
-DISTNAME=		wireshark-1.8.8
-CATEGORIES=		net
-MASTER_SITES=		http://www.wireshark.org/download/src/ \
-			${MASTER_SITE_SOURCEFORGE:=wireshark/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	wireshark-1.10.0
+CATEGORIES=	net
+MASTER_SITES=	http://www.wireshark.org/download/src/ \
+		${MASTER_SITE_SOURCEFORGE:=wireshark/}
+EXTRACT_SUFX=	.tar.bz2
 
-OWNER=			tron@NetBSD.org
-HOMEPAGE=		http://www.wireshark.org/
-COMMENT=		Network protocol analyzer
-LICENSE=		gnu-gpl-v2
+OWNER=		tron@NetBSD.org
+HOMEPAGE=	http://www.wireshark.org/
+COMMENT=	Network protocol analyzer
+LICENSE=	gnu-gpl-v2
 
 CONFLICTS+=		ethereal-[0-9]*
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake perl pkg-config yacc lex
 
-USE_LIBTOOL=		YES
+USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	# empty
-CHECK_PORTABILITY_SKIP+= packaging/macosx/*/*
+CHECK_PORTABILITY_SKIP+=packaging/macosx/*/*
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-static=no
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index 8545d7447da..a8d200d5df4 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2012/10/04 20:15:48 tron Exp $
+@comment $NetBSD: PLIST,v 1.25 2013/07/04 21:33:14 adam Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -6,6 +6,7 @@ bin/editcap
 bin/mergecap
 bin/randpkt
 bin/rawshark
+bin/reordercap
 bin/text2pcap
 bin/tshark
 ${PLIST.gtk2}bin/wireshark
@@ -25,6 +26,7 @@ lib/wireshark/plugins/${PKGVERSION}/stats_tree.la
 lib/wireshark/plugins/${PKGVERSION}/unistim.la
 lib/wireshark/plugins/${PKGVERSION}/wimax.la
 lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la
+lib/wireshark/plugins/${PKGVERSION}/wimaxmacphy.la
 man/man1/capinfos.1
 man/man1/dftest.1
 man/man1/dumpcap.1
@@ -32,6 +34,7 @@ man/man1/editcap.1
 man/man1/mergecap.1
 man/man1/randpkt.1
 man/man1/rawshark.1
+man/man1/reordercap.1
 man/man1/text2pcap.1
 man/man1/tshark.1
 ${PLIST.gtk2}man/man1/wireshark.1
@@ -45,8 +48,12 @@ ${PLIST.lua}share/wireshark/console.lua
 share/wireshark/dfilters
 share/wireshark/dftest.html
 share/wireshark/diameter/AlcatelLucent.xml
+share/wireshark/diameter/ChinaTelecom.xml
 share/wireshark/diameter/Cisco.xml
 share/wireshark/diameter/Ericsson.xml
+share/wireshark/diameter/Nokia.xml
+share/wireshark/diameter/NokiaSiemensNetworks.xml
+share/wireshark/diameter/SKT.xml
 share/wireshark/diameter/TGPPGmb.xml
 share/wireshark/diameter/TGPPRx.xml
 share/wireshark/diameter/TGPPS9.xml
@@ -91,7 +98,10 @@ share/wireshark/ipmap.html
 share/wireshark/manuf
 share/wireshark/mergecap.html
 share/wireshark/pdml2html.xsl
+share/wireshark/profiles/Bluetooth/colorfilters
+share/wireshark/profiles/Classic/colorfilters
 share/wireshark/radius/README.radius_dictionary
+share/wireshark/radius/custom.includes
 share/wireshark/radius/dictionary
 share/wireshark/radius/dictionary.3com
 share/wireshark/radius/dictionary.3gpp
@@ -200,9 +210,12 @@ share/wireshark/radius/dictionary.rfc4818
 share/wireshark/radius/dictionary.rfc4849
 share/wireshark/radius/dictionary.rfc5090
 share/wireshark/radius/dictionary.rfc5176
+share/wireshark/radius/dictionary.rfc5447
 share/wireshark/radius/dictionary.rfc5580
 share/wireshark/radius/dictionary.rfc5607
 share/wireshark/radius/dictionary.rfc5904
+share/wireshark/radius/dictionary.rfc6519
+share/wireshark/radius/dictionary.rfc6572
 share/wireshark/radius/dictionary.riverstone
 share/wireshark/radius/dictionary.roaringpenguin
 share/wireshark/radius/dictionary.shasta
@@ -234,6 +247,7 @@ share/wireshark/radius/dictionary.xedia
 share/wireshark/radius/dictionary.zyxel
 share/wireshark/randpkt.html
 share/wireshark/rawshark.html
+share/wireshark/reordercap.html
 share/wireshark/services
 share/wireshark/smi_modules
 share/wireshark/text2pcap.html
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index a38e9a2b59f..aaf2f17ec52 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.66 2013/06/11 22:57:58 tron Exp $
+$NetBSD: distinfo,v 1.67 2013/07/04 21:33:14 adam Exp $
 
-SHA1 (wireshark-1.8.8.tar.bz2) = bfc8d0b7ccbd8ce895762d7f5db2e022c71899f2
-RMD160 (wireshark-1.8.8.tar.bz2) = a6cbe0088fe593d57882b58700e7e57f67bf86ca
-Size (wireshark-1.8.8.tar.bz2) = 24273325 bytes
-SHA1 (patch-AUTHORS) = c2329d7b6d9cdbc9139b356e74dbe77e26e58da3
-SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d
+SHA1 (wireshark-1.10.0.tar.bz2) = c78a5d5e589edc8ebc702eb00a284ccbca7721bc
+RMD160 (wireshark-1.10.0.tar.bz2) = 924e8d94275c1512b9624d009d69fefa8626b5b2
+Size (wireshark-1.10.0.tar.bz2) = 27101631 bytes
+SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc
+SHA1 (patch-aa) = 6d5eac302fbe506af25874d59758088e1759d72c
 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
 SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
 SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
 SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352
 SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e
 SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077
+SHA1 (patch-doc_asn2deb.pod) = c0c46abd562e925d887c87c93c6a1609dd1ff990
+SHA1 (patch-doc_idl2deb.pod) = 9d4c47d6867ea7fe8abda9c95a97a8f0731bcec8
diff --git a/net/wireshark/patches/patch-AUTHORS b/net/wireshark/patches/patch-AUTHORS
index 71ef7d7800f..fd62167a747 100644
--- a/net/wireshark/patches/patch-AUTHORS
+++ b/net/wireshark/patches/patch-AUTHORS
@@ -1,25 +1,34 @@
-$NetBSD: patch-AUTHORS,v 1.1 2013/06/01 07:46:43 wiz Exp $
+$NetBSD: patch-AUTHORS,v 1.2 2013/07/04 21:33:14 adam Exp $
 
 Remove characters that perl-5.18's pod2man doesn't like
 (this file is included verbatim in the docs).
 
---- AUTHORS.orig	2012-06-16 18:38:51.000000000 +0000
+--- AUTHORS.orig	2013-05-29 16:52:27.000000000 +0000
 +++ AUTHORS
-@@ -3550,7 +3550,7 @@ Cvetan Ivanov		<zezo [AT] spnet.net>
- Vasanth Manickam	<vasanth.manickam [AT] bt.com>
- Julian Onions		<julian.onions [AT] gmail.com>
- Samuel Thibault		<samuel.thibault [AT] ens-lyon.org>
--Peter Kovář		<peter.kovar [AT] gmail.com>
-+Peter Kovar		<peter.kovar [AT] gmail.com>
- Paul Ollis		<paul.ollis [AT] roke.co.uk>
- Dominik Kuhlen		<dkuhlen [AT] gmx.net>
- Karl Knoebl		<karl.knoebl [AT] siemens.com>
-@@ -3641,7 +3641,7 @@ Paul Stath		<pstath [AT] axxcelera.com>
- DeCount			<aatrade [AT] libero.it>
- Andras Veres-Szentkiralyi	<vsza [AT] vsza.hu>
- Jakob Hirsch 		<jh.wireshark-bugzilla [AT] plonk.de>
--Роман Донченко		<DXDragon [AT] yandex.ru>
-+			<DXDragon [AT] yandex.ru>
- 			<billyjeans [AT] gmail.com>
- Evan Huus		<eapache [AT] gmail.com>
- Tom Cook		<tcook [AT] ixiacom.com>
+@@ -3509,7 +3509,7 @@ Peter Hatina		<phatina[AT]redhat.com> {
+ 	Gtk3 Wireshark fixes
+ }
+ 
+-Tomasz Moń		<desowin[AT]gmail.com> {
++Tomasz Mon		<desowin[AT]gmail.com> {
+ 	USBPcap support
+ }
+ 
+@@ -3612,7 +3612,7 @@ Cvetan Ivanov		<zezo[AT]spnet.net>
+ Vasanth Manickam	<vasanth.manickam[AT]bt.com>
+ Julian Onions		<julian.onions[AT]gmail.com>
+ Samuel Thibault		<samuel.thibault[AT]ens-lyon.org>
+-Peter Kovář		<peter.kovar[AT]gmail.com>
++Peter Kovar		<peter.kovar[AT]gmail.com>
+ Paul Ollis		<paul.ollis[AT]roke.co.uk>
+ Dominik Kuhlen		<dkuhlen[AT]gmx.net>
+ Karl Knoebl		<karl.knoebl[AT]siemens.com>
+@@ -3703,7 +3703,7 @@ Paul Stath		<pstath[AT]axxcelera.com>
+ DeCount			<aatrade[AT]libero.it>
+ Andras Veres-Szentkiralyi	<vsza[AT]vsza.hu>
+ Jakob Hirsch 		<jh.wireshark-bugzilla[AT]plonk.de>
+-Роман Донченко		<DXDragon[AT]yandex.ru>
++Roman Dontzenko		<DXDragon[AT]yandex.ru>
+ 			<billyjeans[AT]gmail.com>
+ Evan Huus		<eapache[AT]gmail.com>
+ Tom Cook		<tcook[AT]ixiacom.com>
diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa
index 41fa5cdc87f..93637b7fa02 100644
--- a/net/wireshark/patches/patch-aa
+++ b/net/wireshark/patches/patch-aa
@@ -1,15 +1,14 @@
-$NetBSD: patch-aa,v 1.11 2012/08/20 08:34:44 christos Exp $
+$NetBSD: patch-aa,v 1.12 2013/07/04 21:33:14 adam Exp $
 
---- ui/gtk/time_shift_dlg.c.orig	2012-06-05 19:33:15.000000000 +0300
-+++ ui/gtk/time_shift_dlg.c	2012-08-19 19:30:08.000000000 +0300
-@@ -90,6 +90,10 @@
-  */
- static GtkWidget *time_shift_frame_w;
- 
+--- ui/time_shift.c.orig	2013-07-04 20:20:31.000000000 +0000
++++ ui/time_shift.c
+@@ -29,6 +29,9 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <math.h>
 +#ifndef HAVE_FLOORL
 +#define floorl(a) floor((double)(a))
 +#endif
-+
- void
- time_shift_cb(GtkWidget *w _U_, gpointer d _U_)
- {
+ 
+ #include <glib.h>
+ 
diff --git a/net/wireshark/patches/patch-doc_asn2deb.pod b/net/wireshark/patches/patch-doc_asn2deb.pod
new file mode 100644
index 00000000000..31bf6649bcc
--- /dev/null
+++ b/net/wireshark/patches/patch-doc_asn2deb.pod
@@ -0,0 +1,24 @@
+$NetBSD: patch-doc_asn2deb.pod,v 1.1 2013/07/04 21:33:14 adam Exp $
+
+Remove non-printable characters.
+
+--- doc/asn2deb.pod.orig	2013-07-04 22:14:32.000000000 +0200
++++ doc/asn2deb.pod	2013-07-04 22:22:33.000000000 +0200
+@@ -5,8 +5,8 @@
+ 
+ =head1 SYNOPSIS
+ 
+-B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
+-[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
++B<asn2deb> [-aI<ASN.1file>] [--asn=I<ASN.1file>] [B<-d>I<opts>] [B<--dbopts=>I<opts>] [B<-e>I<address>]
++[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
+ 
+ =head1 DESCRIPTION
+ 
+@@ -72,4 +72,4 @@
+ 
+ =head1 COPYRIGHT
+ 
+-Copyright (C) 2003, 2005 W. Borger
+\ No newline at end of file
++Copyright (C) 2003, 2005 W. Borger
diff --git a/net/wireshark/patches/patch-doc_idl2deb.pod b/net/wireshark/patches/patch-doc_idl2deb.pod
new file mode 100644
index 00000000000..99e22fce54e
--- /dev/null
+++ b/net/wireshark/patches/patch-doc_idl2deb.pod
@@ -0,0 +1,17 @@
+$NetBSD: patch-doc_idl2deb.pod,v 1.1 2013/07/04 21:33:14 adam Exp $
+
+Remove non-printable characters.
+
+--- doc/idl2deb.pod.orig	2013-07-04 22:23:37.000000000 +0200
++++ doc/idl2deb.pod	2013-07-04 22:24:00.000000000 +0200
+@@ -5,8 +5,8 @@
+ 
+ =head1 SYNOPSIS
+ 
+-B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
+-[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
++B<idl2deb> [B<-d>I<opts>] [B<--dbopts=>I<opts>] [B<-e>I<address>] [B<--email=>I<address>] [-iI<idlfile>]
++[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n>I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
+ 
+ 
+ =head1 DESCRIPTION