pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/wireshark Updated wireshark to 2.2.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/11c4977255f3
branches: trunk
changeset: 352309:11c4977255f3
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Sep 12 10:59:55 2016 +0000
description:
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.
diffstat:
net/wireshark/Makefile | 10 ++-
net/wireshark/PLIST | 15 ++++-
net/wireshark/distinfo | 12 ++--
net/wireshark/patches/patch-extcap.c | 15 +++++
net/wireshark/patches/patch-ui_qt_mtp3__summary__dialog.cpp | 36 -------------
5 files changed, 41 insertions(+), 47 deletions(-)
diffs (187 lines):
diff -r 7d985455ca88 -r 11c4977255f3 net/wireshark/Makefile
--- a/net/wireshark/Makefile Mon Sep 12 10:15:25 2016 +0000
+++ b/net/wireshark/Makefile Mon Sep 12 10:59:55 2016 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2016/08/03 10:23:18 adam Exp $
+# $NetBSD: Makefile,v 1.153 2016/09/12 10:59:55 wiz Exp $
-DISTNAME= wireshark-2.0.5
-PKGREVISION= 1
+DISTNAME= wireshark-2.2.0
CATEGORIES= net
MASTER_SITES= https://www.wireshark.org/download/src/
EXTRACT_SUFX= .tar.bz2
@@ -20,6 +19,9 @@
SHLIBTOOL_OVERRIDE= # empty
CHECK_PORTABILITY_SKIP+=packaging/macosx/*/*
+# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12831
+KRB5_ACCEPTED= mit-krb5
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-static=no
CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
@@ -80,5 +82,7 @@
.include "../../security/openssl/buildlink3.mk"
.include "../../lang/python/application.mk"
+.include "../../security/mit-krb5/buildlink3.mk"
+#.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 7d985455ca88 -r 11c4977255f3 net/wireshark/PLIST
--- a/net/wireshark/PLIST Mon Sep 12 10:15:25 2016 +0000
+++ b/net/wireshark/PLIST Mon Sep 12 10:59:55 2016 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2016/04/24 10:02:13 wiz Exp $
-bin/androiddump
+@comment $NetBSD: PLIST,v 1.31 2016/09/12 10:59:55 wiz Exp $
bin/capinfos
bin/captype
bin/dftest
@@ -16,7 +15,11 @@
${PLIST.qt5}bin/wireshark
lib/libwireshark.la
lib/libwiretap.la
+lib/libwscodecs.la
lib/libwsutil.la
+lib/pkgconfig/wireshark.pc
+lib/wireshark/extcap/androiddump
+lib/wireshark/extcap/randpktdump
lib/wireshark/plugins/${PKGVERSION}/docsis.la
lib/wireshark/plugins/${PKGVERSION}/ethercat.la
lib/wireshark/plugins/${PKGVERSION}/gryphon.la
@@ -37,11 +40,13 @@
man/man1/editcap.1
man/man1/mergecap.1
man/man1/randpkt.1
+man/man1/randpktdump.1
man/man1/rawshark.1
man/man1/reordercap.1
man/man1/text2pcap.1
man/man1/tshark.1
${PLIST.mans}man/man1/wireshark.1
+man/man4/extcap.4
man/man4/wireshark-filter.4
${PLIST.icons}share/appdata/wireshark.appdata.xml
${PLIST.icons}share/applications/wireshark-gtk.desktop
@@ -77,12 +82,14 @@
share/wireshark/androiddump.html
share/wireshark/capinfos.html
share/wireshark/cfilters
+share/wireshark/ciscodump.html
share/wireshark/colorfilters
${PLIST.lua}share/wireshark/console.lua
share/wireshark/dfilters
share/wireshark/dftest.html
share/wireshark/diameter/AlcatelLucent.xml
share/wireshark/diameter/Cisco.xml
+share/wireshark/diameter/CiscoSystems.xml
share/wireshark/diameter/Custom.xml
share/wireshark/diameter/Ericsson.xml
share/wireshark/diameter/HP.xml
@@ -118,6 +125,7 @@
share/wireshark/dtds/xcap-error.dtd
share/wireshark/dumpcap.html
share/wireshark/editcap.html
+share/wireshark/extcap.html
share/wireshark/help/capture_filters.txt
share/wireshark/help/capturing.txt
share/wireshark/help/display_filters.txt
@@ -292,6 +300,7 @@
share/wireshark/radius/dictionary.roaringpenguin
share/wireshark/radius/dictionary.ruckus
share/wireshark/radius/dictionary.ruggedcom
+share/wireshark/radius/dictionary.sangoma
share/wireshark/radius/dictionary.sg
share/wireshark/radius/dictionary.shasta
share/wireshark/radius/dictionary.shiva
@@ -332,10 +341,12 @@
share/wireshark/radius/dictionary.zte
share/wireshark/radius/dictionary.zyxel
share/wireshark/randpkt.html
+share/wireshark/randpktdump.html
share/wireshark/rawshark.html
share/wireshark/reordercap.html
share/wireshark/services
share/wireshark/smi_modules
+share/wireshark/sshdump.html
share/wireshark/text2pcap.html
share/wireshark/tpncp/tpncp.dat
share/wireshark/tshark.html
diff -r 7d985455ca88 -r 11c4977255f3 net/wireshark/distinfo
--- a/net/wireshark/distinfo Mon Sep 12 10:15:25 2016 +0000
+++ b/net/wireshark/distinfo Mon Sep 12 10:59:55 2016 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.91 2016/07/28 14:33:20 wiz Exp $
+$NetBSD: distinfo,v 1.92 2016/09/12 10:59:55 wiz Exp $
-SHA1 (wireshark-2.0.5.tar.bz2) = ab77c632d8babf731bf0ecac0876fe3ff2923d04
-RMD160 (wireshark-2.0.5.tar.bz2) = 6b6755986c23fd195ddda9344d340a132439420c
-SHA512 (wireshark-2.0.5.tar.bz2) = 5b04165e1c18b30743ec6fc0bc81a02eb4906e87cbdc128da1e16662d855ed4a0545eb249aadba8a7e82b3abb4e1fdc5c56c06faaf730f56616332c0b7775e9c
-Size (wireshark-2.0.5.tar.bz2) = 31124989 bytes
-SHA1 (patch-ui_qt_mtp3__summary__dialog.cpp) = 6f6dc44812ac2c9dae1901a2f54d8bd6550d254f
+SHA1 (wireshark-2.2.0.tar.bz2) = 4b47bf8e2053073585318646e27d2aa9dc7c7238
+RMD160 (wireshark-2.2.0.tar.bz2) = bfcd77da458dc9f427cd423876a60968e8fa66ad
+SHA512 (wireshark-2.2.0.tar.bz2) = 03dd1ce686b0e012d3498d6966382db1ff39844e2b03286eded5d77062a958d2dc939b00558708ae37b8e354d95ee6c4aa32023477d862b35bff4e2a0f8f3326
+Size (wireshark-2.2.0.tar.bz2) = 32141141 bytes
+SHA1 (patch-extcap.c) = 4a52bc544e12aed502a1220a2a9dc46f86ff0aec
diff -r 7d985455ca88 -r 11c4977255f3 net/wireshark/patches/patch-extcap.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/wireshark/patches/patch-extcap.c Mon Sep 12 10:59:55 2016 +0000
@@ -0,0 +1,15 @@
+$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>
diff -r 7d985455ca88 -r 11c4977255f3 net/wireshark/patches/patch-ui_qt_mtp3__summary__dialog.cpp
--- a/net/wireshark/patches/patch-ui_qt_mtp3__summary__dialog.cpp Mon Sep 12 10:15:25 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-ui_qt_mtp3__summary__dialog.cpp,v 1.2 2016/07/28 14:33:20 wiz Exp $
-
-Fix build on NetBSD. sys/siginfo.h defines si_code.
-https://code.wireshark.org/review/#/c/16750/
-
---- ui/qt/mtp3_summary_dialog.cpp.orig 2015-12-29 21:49:23.000000000 +0000
-+++ ui/qt/mtp3_summary_dialog.cpp
-@@ -208,7 +208,7 @@ QString Mtp3SummaryDialog::summaryToHtml
- << table_hheader15_tmpl.arg(tr("Bytes/s"))
- << table_row_end;
-
-- for (size_t si_code = 0; si_code < MTP3_NUM_SI_CODE; si_code++) {
-+ for (size_t ws_si_code = 0; ws_si_code < MTP3_NUM_SI_CODE; ws_si_code++) {
- int si_msus = 0;
- int si_bytes = 0;
- QString msus_s_str = n_a;
-@@ -216,8 +216,8 @@ QString Mtp3SummaryDialog::summaryToHtml
- QString bytes_s_str = n_a;
-
- for (size_t stat_idx = 0; stat_idx < mtp3_num_used; stat_idx++) {
-- si_msus += mtp3_stat[stat_idx].mtp3_si_code[si_code].num_msus;
-- si_bytes += mtp3_stat[stat_idx].mtp3_si_code[si_code].size;
-+ si_msus += mtp3_stat[stat_idx].mtp3_si_code[ws_si_code].num_msus;
-+ si_bytes += mtp3_stat[stat_idx].mtp3_si_code[ws_si_code].size;
- }
- total_msus += si_msus;
- total_bytes += si_bytes;
-@@ -232,7 +232,7 @@ QString Mtp3SummaryDialog::summaryToHtml
- }
-
- out << table_row_begin
-- << table_data_tmpl.arg(mtp3_service_indicator_code_short_vals[si_code].strptr)
-+ << table_data_tmpl.arg(mtp3_service_indicator_code_short_vals[ws_si_code].strptr)
- << table_data_tmpl.arg(si_msus)
- << table_data_tmpl.arg(msus_s_str)
- << table_data_tmpl.arg(si_bytes)
Home |
Main Index |
Thread Index |
Old Index