Mon Sep 12 10:59:55 2016 UTC ()
Updated wireshark to 2.2.0.

What's New

  Bug Fixes

     * Upgrading to latest version uninstalls Microsoft Visual C++
       redistributable. ([1]Bug 12712)
     * Extcap errors not reported back to UI. ([2]Bug 11892)

  New and Updated Features

   The following features are new (or have been significantly updated)
   since version 2.2.0rc1:

   "Decode As" supports SSL (TLS) over TCP.

   The following features are new (or have been significantly updated)
   since version 2.1.1:
     * Invalid coloring rules are now disabled instead of discarded. This
       will provide backward compatibility with a coloring rule change in
       Wireshark 2.2.

   The following features are new (or have been significantly updated)
   since version 2.1.0:
     * Added -d option for Decode As support in Wireshark (mimics TShark
       functionality)
     * The Qt UI, GTK+ UI, and TShark can now export packets as JSON.
       TShark can additionally export packets as Elasticsearch-compatible
       JSON.
     * The Qt UI now supports the -j, -J, and -l flags. The -m flag is now
       deprecated.
     * The Conversations and Endpoints dialogs are more responsive when
       viewing large numbers of items.
     * The RTP player now allows up to 30 minutes of silence frames.
     * Packet bytes can now be displayed as EBCDIC.
     * The Qt UI loads captures faster on Windows.
     * proto_tree_add_checksum was added as an API. This attempts to
       standardize how checksums are reported and filtered for within
       *Shark. There are no more individual "good" and "bad" filter
       fields, protocols now have a "checksum.status" field that records
       "Good", "Bad" and "Unverified" (neither good or bad). Color filters
       provided with Wireshark have been adjusted to the new display
       filter names, but custom ones may need to be updated.

   The following features are new (or have been significantly updated)
   since version 2.0.0:
     * The intelligent scroll bar now sits to the left of a normal scroll
       bar and provides a clickable map of nearby packets.
     * You can now switch between between Capture and File Format
       dissection of the current capture file via the View menu in the Qt
       GUI.
     * You can now show selected packet bytes as ASCII, HTML, Image, ISO
       8859-1, Raw, UTF-8, a C array, or YAML.
     * You can now use regular expressions in Find Packet and in the
       advanced preferences.
     * Name resolution for packet capture now supports asynchronous DNS
       lookups only. Therefore the "concurrent DNS resolution" preference
       has been deprecated and is a no-op. To enable DNS name resolution
       some build dependencies must be present (currently c-ares). If that
       is not the case DNS name resolution will be disabled (but other
       name resolution mechanisms, such as host files, are still
       available).
     * The byte under the mouse in the Packet Bytes pane is now
       highlighted.
     * TShark supports exporting PDUs via the -U flag.
     * The Windows and OS X installers now come with the "sshdump" and
       "ciscodump" extcap interfaces.
     * Most dialogs in the Qt UI now save their size and positions.
     * The Follow Stream dialog now supports UTF-16.
     * The Firewall ACL Rules dialog has returned.
     * The Flow (Sequence) Analysis dialog has been improved.
     * We no longer provide packages for 32-bit versions of OS X.
     * The Bluetooth Device details dialog has been added.

  New File Format Decoding Support

   Wireshark is able to display the format of some types of files (rather
   than displaying the contents of those files). This is useful when
   you're curious about, or debugging, a file and its format. To open a
   capture file (such as PCAP) in this mode specify "MIME Files Format" as
   the file's format in the Open File dialog.

  New Protocol Support

   Apache Cassandra - CQL version 3.0, Bachmann bluecom Protocol,
   Bluetooth Pseudoheader for BR/EDR, Cisco ERSPAN3 Marker, Cisco ttag,
   Digital Equipment Corporation Local Area Transport, Distributed Object
   Framework, DOCSIS Upstream Channel Descriptor Type 35, Edge Control
   Protocol (ECP), Encrypted UDP based FTP with multicast, Ericsson IPOS
   Kernel Packet Header Dissector Added (IPOS), Extensible Control &
   Management Protocol (eCMP), FLEXRAY Protocol dissector added
   (automotive bus), IEEE 802.1BR E-Tag, Intel Omni-Path Architecture, ISO
   8583-1, ISO14443, ITU-T G.7041/Y.1303 Generic Framing Procedure (GFP),
   LAT protocol (DECNET), Metamako trailers, Network Service Header for
   Ethernet & GRE, Network-Based IP Flow Mobility (NBIFOM), Nokia
   Intelligent Service Interface (ISI), Open Mobile Alliance Lightweight
   Machine to Machine TLV payload Added (LwM2M TLV), Real Time Location
   System (RTLS), RTI TCP Transport Layer (RTITCP), SMB Witness Service,
   STANAG 5602 SIMPLE, Standard Interface for Multiple Platform Link
   Evaluation (SIMPLE), USB3 Vision Protocol (USB machine vision cameras),
   USBIP Protocol, UserLog Protocol, and Zigbee Protocol Clusters
   Dissectors Added (Closures Lighting General Measurement & Sensing HVAC
   Security & Safety)

  Updated Protocol Support

   Bluetooth OBEX dissector (btobex) was renamed to Obex Dissector (obex),
   allow to DecodeAs it over USB, TCP and UDP.

   A preference was added to TCP dissector for handling IPFIX process
   information. It has been disabled by default.

  New and Updated Capture File Support

   Micropross mplog

  New and Updated Capture Interfaces support

   Non-empty section placeholder.

  Major API Changes

   The libwireshark API has undergone some major changes:
     * The address macros (e.g., SET_ADDRESS) have been removed. Use the
       (lower case) functions of the same names instead.
     * "old style" dissector functions (that don't return number of bytes
       used) have been replaced in name with the "new style" dissector
       functions.
     * tvb_get_string and tvb_get_stringz have been replaced with
       tvb_get_string_enc and tvb_get_stringz_enc respectively.


(wiz)
diff -r1.152 -r1.153 pkgsrc/net/wireshark/Makefile
diff -r1.30 -r1.31 pkgsrc/net/wireshark/PLIST
diff -r1.91 -r1.92 pkgsrc/net/wireshark/distinfo
diff -r0 -r1.1 pkgsrc/net/wireshark/patches/patch-extcap.c
diff -r1.2 -r0 pkgsrc/net/wireshark/patches/patch-ui_qt_mtp3__summary__dialog.cpp

cvs diff -r1.152 -r1.153 pkgsrc/net/wireshark/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2016/08/03 10:23:18 1.152
+++ pkgsrc/net/wireshark/Makefile 2016/09/12 10:59:55 1.153
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile,v 1.152 2016/08/03 10:23:18 adam Exp $ 1# $NetBSD: Makefile,v 1.153 2016/09/12 10:59:55 wiz Exp $
2 2
3DISTNAME= wireshark-2.0.5 3DISTNAME= wireshark-2.2.0
4PKGREVISION= 1 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= https://www.wireshark.org/download/src/ 5MASTER_SITES= https://www.wireshark.org/download/src/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.wireshark.org/ 9HOMEPAGE= http://www.wireshark.org/
11COMMENT= Network protocol analyzer 10COMMENT= Network protocol analyzer
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14CONFLICTS+= ethereal-[0-9]* 13CONFLICTS+= ethereal-[0-9]*
15 14
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17USE_TOOLS+= gmake perl pkg-config yacc lex 16USE_TOOLS+= gmake perl pkg-config yacc lex
18 17
19USE_LIBTOOL= yes 18USE_LIBTOOL= yes
20SHLIBTOOL_OVERRIDE= # empty 19SHLIBTOOL_OVERRIDE= # empty
21CHECK_PORTABILITY_SKIP+=packaging/macosx/*/* 20CHECK_PORTABILITY_SKIP+=packaging/macosx/*/*
22 21
 22# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12831
 23KRB5_ACCEPTED= mit-krb5
 24
23GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
24CONFIGURE_ARGS+= --enable-static=no 26CONFIGURE_ARGS+= --enable-static=no
25CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 27CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
26CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} 28CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap}
27CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 29CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
28CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc} 30CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc}
29CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} 31CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
30 32
31PTHREAD_OPTS+= require 33PTHREAD_OPTS+= require
32 34
33PYTHON_FOR_BUILD_ONLY= yes 35PYTHON_FOR_BUILD_ONLY= yes
34PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.10.5 36PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.10.5
35REPLACE_PYTHON+= help/faq.py 37REPLACE_PYTHON+= help/faq.py
@@ -70,15 +72,17 @@ BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1 @@ -70,15 +72,17 @@ BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
70# [-Wint-conversion] 72# [-Wint-conversion]
71BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED 73BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
72 74
73.include "../../devel/glib2/buildlink3.mk" 75.include "../../devel/glib2/buildlink3.mk"
74.include "../../devel/pcre/buildlink3.mk" 76.include "../../devel/pcre/buildlink3.mk"
75.include "../../devel/zlib/buildlink3.mk" 77.include "../../devel/zlib/buildlink3.mk"
76.include "../../net/libpcap/buildlink3.mk" 78.include "../../net/libpcap/buildlink3.mk"
77.include "../../devel/libsmi/buildlink3.mk" 79.include "../../devel/libsmi/buildlink3.mk"
78.include "../../security/libgcrypt/buildlink3.mk" 80.include "../../security/libgcrypt/buildlink3.mk"
79.include "../../security/gnutls/buildlink3.mk" 81.include "../../security/gnutls/buildlink3.mk"
80.include "../../security/openssl/buildlink3.mk" 82.include "../../security/openssl/buildlink3.mk"
81 83
82.include "../../lang/python/application.mk" 84.include "../../lang/python/application.mk"
 85.include "../../security/mit-krb5/buildlink3.mk"
 86#.include "../../mk/krb5.buildlink3.mk"
83.include "../../mk/pthread.buildlink3.mk" 87.include "../../mk/pthread.buildlink3.mk"
84.include "../../mk/bsd.pkg.mk" 88.include "../../mk/bsd.pkg.mk"

cvs diff -r1.30 -r1.31 pkgsrc/net/wireshark/PLIST (expand / switch to unified diff)

--- pkgsrc/net/wireshark/PLIST 2016/04/24 10:02:13 1.30
+++ pkgsrc/net/wireshark/PLIST 2016/09/12 10:59:55 1.31
@@ -1,57 +1,62 @@ @@ -1,57 +1,62 @@
1@comment $NetBSD: PLIST,v 1.30 2016/04/24 10:02:13 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.31 2016/09/12 10:59:55 wiz Exp $
2bin/androiddump 
3bin/capinfos 2bin/capinfos
4bin/captype 3bin/captype
5bin/dftest 4bin/dftest
6bin/dumpcap 5bin/dumpcap
7bin/editcap 6bin/editcap
8bin/idl2wrs 7bin/idl2wrs
9bin/mergecap 8bin/mergecap
10bin/randpkt 9bin/randpkt
11bin/rawshark 10bin/rawshark
12bin/reordercap 11bin/reordercap
13bin/text2pcap 12bin/text2pcap
14bin/tshark 13bin/tshark
15${PLIST.gtk3}bin/wireshark-gtk 14${PLIST.gtk3}bin/wireshark-gtk
16${PLIST.qt5}bin/wireshark 15${PLIST.qt5}bin/wireshark
17lib/libwireshark.la 16lib/libwireshark.la
18lib/libwiretap.la 17lib/libwiretap.la
 18lib/libwscodecs.la
19lib/libwsutil.la 19lib/libwsutil.la
 20lib/pkgconfig/wireshark.pc
 21lib/wireshark/extcap/androiddump
 22lib/wireshark/extcap/randpktdump
20lib/wireshark/plugins/${PKGVERSION}/docsis.la 23lib/wireshark/plugins/${PKGVERSION}/docsis.la
21lib/wireshark/plugins/${PKGVERSION}/ethercat.la 24lib/wireshark/plugins/${PKGVERSION}/ethercat.la
22lib/wireshark/plugins/${PKGVERSION}/gryphon.la 25lib/wireshark/plugins/${PKGVERSION}/gryphon.la
23lib/wireshark/plugins/${PKGVERSION}/irda.la 26lib/wireshark/plugins/${PKGVERSION}/irda.la
24lib/wireshark/plugins/${PKGVERSION}/m2m.la 27lib/wireshark/plugins/${PKGVERSION}/m2m.la
25lib/wireshark/plugins/${PKGVERSION}/mate.la 28lib/wireshark/plugins/${PKGVERSION}/mate.la
26lib/wireshark/plugins/${PKGVERSION}/opcua.la 29lib/wireshark/plugins/${PKGVERSION}/opcua.la
27lib/wireshark/plugins/${PKGVERSION}/profinet.la 30lib/wireshark/plugins/${PKGVERSION}/profinet.la
28lib/wireshark/plugins/${PKGVERSION}/stats_tree.la 31lib/wireshark/plugins/${PKGVERSION}/stats_tree.la
29lib/wireshark/plugins/${PKGVERSION}/unistim.la 32lib/wireshark/plugins/${PKGVERSION}/unistim.la
30lib/wireshark/plugins/${PKGVERSION}/wimax.la 33lib/wireshark/plugins/${PKGVERSION}/wimax.la
31lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la 34lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la
32lib/wireshark/plugins/${PKGVERSION}/wimaxmacphy.la 35lib/wireshark/plugins/${PKGVERSION}/wimaxmacphy.la
33man/man1/androiddump.1 36man/man1/androiddump.1
34man/man1/capinfos.1 37man/man1/capinfos.1
35man/man1/dftest.1 38man/man1/dftest.1
36man/man1/dumpcap.1 39man/man1/dumpcap.1
37man/man1/editcap.1 40man/man1/editcap.1
38man/man1/mergecap.1 41man/man1/mergecap.1
39man/man1/randpkt.1 42man/man1/randpkt.1
 43man/man1/randpktdump.1
40man/man1/rawshark.1 44man/man1/rawshark.1
41man/man1/reordercap.1 45man/man1/reordercap.1
42man/man1/text2pcap.1 46man/man1/text2pcap.1
43man/man1/tshark.1 47man/man1/tshark.1
44${PLIST.mans}man/man1/wireshark.1 48${PLIST.mans}man/man1/wireshark.1
 49man/man4/extcap.4
45man/man4/wireshark-filter.4 50man/man4/wireshark-filter.4
46${PLIST.icons}share/appdata/wireshark.appdata.xml 51${PLIST.icons}share/appdata/wireshark.appdata.xml
47${PLIST.icons}share/applications/wireshark-gtk.desktop 52${PLIST.icons}share/applications/wireshark-gtk.desktop
48${PLIST.gtk3}share/applications/wireshark.desktop 53${PLIST.gtk3}share/applications/wireshark.desktop
49${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png 54${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png
50${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png 55${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
51${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png 56${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
52${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png 57${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png
53${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png 58${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png
54${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png 59${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png
55${PLIST.icons}share/icons/hicolor/24x24/apps/wireshark.png 60${PLIST.icons}share/icons/hicolor/24x24/apps/wireshark.png
56${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png 61${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png
57${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png 62${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png
@@ -67,32 +72,34 @@ ${PLIST.icons}share/icons/hicolor/48x48/ @@ -67,32 +72,34 @@ ${PLIST.icons}share/icons/hicolor/48x48/
67${PLIST.icons}share/icons/hicolor/64x64/apps/wireshark.png 72${PLIST.icons}share/icons/hicolor/64x64/apps/wireshark.png
68${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png 73${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png
69${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png 74${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png
70${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg 75${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg
71${PLIST.icons}share/icons/locolor/16x16/apps/wireshark.png 76${PLIST.icons}share/icons/locolor/16x16/apps/wireshark.png
72${PLIST.icons}share/icons/locolor/32x32/apps/wireshark.png 77${PLIST.icons}share/icons/locolor/32x32/apps/wireshark.png
73${PLIST.icons}share/icons/locolor/48x48/apps/wireshark.png 78${PLIST.icons}share/icons/locolor/48x48/apps/wireshark.png
74${PLIST.icons}share/mime/packages/wireshark.xml 79${PLIST.icons}share/mime/packages/wireshark.xml
75share/wireshark/AUTHORS-SHORT 80share/wireshark/AUTHORS-SHORT
76share/wireshark/COPYING 81share/wireshark/COPYING
77share/wireshark/androiddump.html 82share/wireshark/androiddump.html
78share/wireshark/capinfos.html 83share/wireshark/capinfos.html
79share/wireshark/cfilters 84share/wireshark/cfilters
 85share/wireshark/ciscodump.html
80share/wireshark/colorfilters 86share/wireshark/colorfilters
81${PLIST.lua}share/wireshark/console.lua 87${PLIST.lua}share/wireshark/console.lua
82share/wireshark/dfilters 88share/wireshark/dfilters
83share/wireshark/dftest.html 89share/wireshark/dftest.html
84share/wireshark/diameter/AlcatelLucent.xml 90share/wireshark/diameter/AlcatelLucent.xml
85share/wireshark/diameter/Cisco.xml 91share/wireshark/diameter/Cisco.xml
 92share/wireshark/diameter/CiscoSystems.xml
86share/wireshark/diameter/Custom.xml 93share/wireshark/diameter/Custom.xml
87share/wireshark/diameter/Ericsson.xml 94share/wireshark/diameter/Ericsson.xml
88share/wireshark/diameter/HP.xml 95share/wireshark/diameter/HP.xml
89share/wireshark/diameter/Nokia.xml 96share/wireshark/diameter/Nokia.xml
90share/wireshark/diameter/NokiaSolutionsAndNetworks.xml 97share/wireshark/diameter/NokiaSolutionsAndNetworks.xml
91share/wireshark/diameter/Oracle.xml 98share/wireshark/diameter/Oracle.xml
92share/wireshark/diameter/Starent.xml 99share/wireshark/diameter/Starent.xml
93share/wireshark/diameter/TGPP.xml 100share/wireshark/diameter/TGPP.xml
94share/wireshark/diameter/TGPP2.xml 101share/wireshark/diameter/TGPP2.xml
95share/wireshark/diameter/Vodafone.xml 102share/wireshark/diameter/Vodafone.xml
96share/wireshark/diameter/chargecontrol.xml 103share/wireshark/diameter/chargecontrol.xml
97share/wireshark/diameter/dictionary.dtd 104share/wireshark/diameter/dictionary.dtd
98share/wireshark/diameter/dictionary.xml 105share/wireshark/diameter/dictionary.xml
@@ -108,26 +115,27 @@ share/wireshark/dtds/dc.dtd @@ -108,26 +115,27 @@ share/wireshark/dtds/dc.dtd
108share/wireshark/dtds/itunes.dtd 115share/wireshark/dtds/itunes.dtd
109share/wireshark/dtds/mscml.dtd 116share/wireshark/dtds/mscml.dtd
110share/wireshark/dtds/pocsettings.dtd 117share/wireshark/dtds/pocsettings.dtd
111share/wireshark/dtds/presence.dtd 118share/wireshark/dtds/presence.dtd
112share/wireshark/dtds/reginfo.dtd 119share/wireshark/dtds/reginfo.dtd
113share/wireshark/dtds/rlmi.dtd 120share/wireshark/dtds/rlmi.dtd
114share/wireshark/dtds/rss.dtd 121share/wireshark/dtds/rss.dtd
115share/wireshark/dtds/smil.dtd 122share/wireshark/dtds/smil.dtd
116share/wireshark/dtds/watcherinfo.dtd 123share/wireshark/dtds/watcherinfo.dtd
117share/wireshark/dtds/xcap-caps.dtd 124share/wireshark/dtds/xcap-caps.dtd
118share/wireshark/dtds/xcap-error.dtd 125share/wireshark/dtds/xcap-error.dtd
119share/wireshark/dumpcap.html 126share/wireshark/dumpcap.html
120share/wireshark/editcap.html 127share/wireshark/editcap.html
 128share/wireshark/extcap.html
121share/wireshark/help/capture_filters.txt 129share/wireshark/help/capture_filters.txt
122share/wireshark/help/capturing.txt 130share/wireshark/help/capturing.txt
123share/wireshark/help/display_filters.txt 131share/wireshark/help/display_filters.txt
124share/wireshark/help/faq.txt 132share/wireshark/help/faq.txt
125share/wireshark/help/getting_started.txt 133share/wireshark/help/getting_started.txt
126share/wireshark/help/overview.txt 134share/wireshark/help/overview.txt
127share/wireshark/help/toc 135share/wireshark/help/toc
128${PLIST.lua}share/wireshark/init.lua 136${PLIST.lua}share/wireshark/init.lua
129share/wireshark/ipmap.html 137share/wireshark/ipmap.html
130share/wireshark/manuf 138share/wireshark/manuf
131share/wireshark/mergecap.html 139share/wireshark/mergecap.html
132share/wireshark/pdml2html.xsl 140share/wireshark/pdml2html.xsl
133share/wireshark/profiles/Bluetooth/colorfilters 141share/wireshark/profiles/Bluetooth/colorfilters
@@ -282,26 +290,27 @@ share/wireshark/radius/dictionary.rfc657 @@ -282,26 +290,27 @@ share/wireshark/radius/dictionary.rfc657
282share/wireshark/radius/dictionary.rfc6677 290share/wireshark/radius/dictionary.rfc6677
283share/wireshark/radius/dictionary.rfc6911 291share/wireshark/radius/dictionary.rfc6911
284share/wireshark/radius/dictionary.rfc6929 292share/wireshark/radius/dictionary.rfc6929
285share/wireshark/radius/dictionary.rfc6930 293share/wireshark/radius/dictionary.rfc6930
286share/wireshark/radius/dictionary.rfc7055 294share/wireshark/radius/dictionary.rfc7055
287share/wireshark/radius/dictionary.rfc7155 295share/wireshark/radius/dictionary.rfc7155
288share/wireshark/radius/dictionary.rfc7268 296share/wireshark/radius/dictionary.rfc7268
289share/wireshark/radius/dictionary.rfc7499 297share/wireshark/radius/dictionary.rfc7499
290share/wireshark/radius/dictionary.riverbed 298share/wireshark/radius/dictionary.riverbed
291share/wireshark/radius/dictionary.riverstone 299share/wireshark/radius/dictionary.riverstone
292share/wireshark/radius/dictionary.roaringpenguin 300share/wireshark/radius/dictionary.roaringpenguin
293share/wireshark/radius/dictionary.ruckus 301share/wireshark/radius/dictionary.ruckus
294share/wireshark/radius/dictionary.ruggedcom 302share/wireshark/radius/dictionary.ruggedcom
 303share/wireshark/radius/dictionary.sangoma
295share/wireshark/radius/dictionary.sg 304share/wireshark/radius/dictionary.sg
296share/wireshark/radius/dictionary.shasta 305share/wireshark/radius/dictionary.shasta
297share/wireshark/radius/dictionary.shiva 306share/wireshark/radius/dictionary.shiva
298share/wireshark/radius/dictionary.siemens 307share/wireshark/radius/dictionary.siemens
299share/wireshark/radius/dictionary.slipstream 308share/wireshark/radius/dictionary.slipstream
300share/wireshark/radius/dictionary.sofaware 309share/wireshark/radius/dictionary.sofaware
301share/wireshark/radius/dictionary.sonicwall 310share/wireshark/radius/dictionary.sonicwall
302share/wireshark/radius/dictionary.springtide 311share/wireshark/radius/dictionary.springtide
303share/wireshark/radius/dictionary.starent 312share/wireshark/radius/dictionary.starent
304share/wireshark/radius/dictionary.starent.vsa1 313share/wireshark/radius/dictionary.starent.vsa1
305share/wireshark/radius/dictionary.surfnet 314share/wireshark/radius/dictionary.surfnet
306share/wireshark/radius/dictionary.symbol 315share/wireshark/radius/dictionary.symbol
307share/wireshark/radius/dictionary.t_systems_nova 316share/wireshark/radius/dictionary.t_systems_nova
@@ -322,25 +331,27 @@ share/wireshark/radius/dictionary.walabi @@ -322,25 +331,27 @@ share/wireshark/radius/dictionary.walabi
322share/wireshark/radius/dictionary.waverider 331share/wireshark/radius/dictionary.waverider
323share/wireshark/radius/dictionary.wichorus 332share/wireshark/radius/dictionary.wichorus
324share/wireshark/radius/dictionary.wimax 333share/wireshark/radius/dictionary.wimax
325share/wireshark/radius/dictionary.wimax.alvarion 334share/wireshark/radius/dictionary.wimax.alvarion
326share/wireshark/radius/dictionary.wimax.wichorus 335share/wireshark/radius/dictionary.wimax.wichorus
327share/wireshark/radius/dictionary.wispr 336share/wireshark/radius/dictionary.wispr
328share/wireshark/radius/dictionary.xedia 337share/wireshark/radius/dictionary.xedia
329share/wireshark/radius/dictionary.xylan 338share/wireshark/radius/dictionary.xylan
330share/wireshark/radius/dictionary.yubico 339share/wireshark/radius/dictionary.yubico
331share/wireshark/radius/dictionary.zeus 340share/wireshark/radius/dictionary.zeus
332share/wireshark/radius/dictionary.zte 341share/wireshark/radius/dictionary.zte
333share/wireshark/radius/dictionary.zyxel 342share/wireshark/radius/dictionary.zyxel
334share/wireshark/randpkt.html 343share/wireshark/randpkt.html
 344share/wireshark/randpktdump.html
335share/wireshark/rawshark.html 345share/wireshark/rawshark.html
336share/wireshark/reordercap.html 346share/wireshark/reordercap.html
337share/wireshark/services 347share/wireshark/services
338share/wireshark/smi_modules 348share/wireshark/smi_modules
 349share/wireshark/sshdump.html
339share/wireshark/text2pcap.html 350share/wireshark/text2pcap.html
340share/wireshark/tpncp/tpncp.dat 351share/wireshark/tpncp/tpncp.dat
341share/wireshark/tshark.html 352share/wireshark/tshark.html
342share/wireshark/wimaxasncp/dictionary.dtd 353share/wireshark/wimaxasncp/dictionary.dtd
343share/wireshark/wimaxasncp/dictionary.xml 354share/wireshark/wimaxasncp/dictionary.xml
344share/wireshark/wireshark-filter.html 355share/wireshark/wireshark-filter.html
345share/wireshark/wireshark.html 356share/wireshark/wireshark.html
346share/wireshark/ws.css 357share/wireshark/ws.css

cvs diff -r1.91 -r1.92 pkgsrc/net/wireshark/distinfo (expand / switch to unified diff)

--- pkgsrc/net/wireshark/distinfo 2016/07/28 14:33:20 1.91
+++ pkgsrc/net/wireshark/distinfo 2016/09/12 10:59:55 1.92
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.91 2016/07/28 14:33:20 wiz Exp $ 1$NetBSD: distinfo,v 1.92 2016/09/12 10:59:55 wiz Exp $
2 2
3SHA1 (wireshark-2.0.5.tar.bz2) = ab77c632d8babf731bf0ecac0876fe3ff2923d04 3SHA1 (wireshark-2.2.0.tar.bz2) = 4b47bf8e2053073585318646e27d2aa9dc7c7238
4RMD160 (wireshark-2.0.5.tar.bz2) = 6b6755986c23fd195ddda9344d340a132439420c 4RMD160 (wireshark-2.2.0.tar.bz2) = bfcd77da458dc9f427cd423876a60968e8fa66ad
5SHA512 (wireshark-2.0.5.tar.bz2) = 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c 5SHA512 (wireshark-2.2.0.tar.bz2) = 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326
6Size (wireshark-2.0.5.tar.bz2) = 31124989 bytes 6Size (wireshark-2.2.0.tar.bz2) = 32141141 bytes
7SHA1 (patch-ui_qt_mtp3__summary__dialog.cpp) = 6f6dc44812ac2c9dae1901a2f54d8bd6550d254f 7SHA1 (patch-extcap.c) = 4a52bc544e12aed502a1220a2a9dc46f86ff0aec

File Added: pkgsrc/net/wireshark/patches/Attic/patch-extcap.c
$NetBSD: patch-extcap.c,v 1.1 2016/09/12 10:59:55 wiz Exp $

Fix linking on NetBSD.

--- extcap.c.orig	2016-09-07 16:59:05.000000000 +0000
+++ extcap.c
@@ -35,6 +35,8 @@
 #else
 /* Include for unlink */
 #include <unistd.h>
+/* for WEXITSTATUS */
+#include <sys/wait.h>
 #endif
 
 #include <glib.h>

File Deleted: pkgsrc/net/wireshark/patches/Attic/patch-ui_qt_mtp3__summary__dialog.cpp