CVS commit: pkgsrc/net/wireshark

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Oct  9 21:13:22 UTC 2016

Modified Files:
        pkgsrc/net/wireshark: Makefile distinfo
        pkgsrc/net/wireshark/patches: patch-extcap.c

Log Message:
Updated wireshark to 2.2.1.

What's New

  Bug Fixes

   The following vulnerabilities have been fixed:
     * [1]wnpa-sec-2016-56
       The Bluetooth L2CAP dissector could crash. ([2]Bug 12825)
     * [3]wnpa-sec-2016-57
       The NCP dissector could crash. ([4]Bug 12945)

   The following bugs have been fixed:
     * Flow Graph colored data arrows. ([5]Bug 12065)
     * Capture File Properties under Statistics Grayed Out after Stopping
       a Capture. ([6]Bug 12071)
     * Qt: Hidden columns displayed during live capture. ([7]Bug 12377)
     * Unable to save changes to coloring rules. ([8]Bug 12814)
     * Bad description for NBSS error code 0x81. ([9]Bug 12835)
     * Live capture from USBPcap fails immediately. ([10]Bug 12846)
     * Cannot decrypt EAP-TTLS traffic (not recognized as conversation).
       ([11]Bug 12879)
     * Export packet dissections Option disabled after capturing traffic.
       ([12]Bug 12898)
     * Failure to open file named with Chinese or other multibyte
       characters. ([13]Bug 12900)
     * k12 text file format causes errors. ([14]Bug 12903)
     * File | File Set | List Files dialog is blank. ([15]Bug 12904)
     * Decoding/Display of an INAP CONNECT message goes wrong for the
       Destination Routing Address part. ([16]Bug 12911)
     * TLS padding extension dissector length parsing bug. ([17]Bug 12922)
     * Diameter dictionary bugs. ([18]Bug 12927)
     * File open from menu bar with filter in place causes Wireshark to
       crash. ([19]Bug 12929)
     * Unable to capture USBPcap trace using tshark with extcap built.
       ([20]Bug 12949)
     * P1 dissector fails a TVB assertion. ([21]Bug 12976)
     * Multiple PortableApps instances can once again be run at the same
       time.

  Updated Protocol Support

   6LowPAN, BT L2CAP, CIP, DCOM IRemUnknown, Diameter, DMP, EAP, ISUP,
   NBT, NCP, NetFlow, SSL / TLS, and U3V

  New and Updated Capture File Support

   Ascend, and K12


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/net/wireshark/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/wireshark/patches/patch-extcap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.156 pkgsrc/net/wireshark/Makefile:1.157
--- pkgsrc/net/wireshark/Makefile:1.156 Thu Sep 29 20:11:08 2016
+++ pkgsrc/net/wireshark/Makefile       Sun Oct  9 21:13:22 2016
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.156 2016/09/29 20:11:08 markd Exp $
+# $NetBSD: Makefile,v 1.157 2016/10/09 21:13:22 wiz Exp $
 
-DISTNAME=      wireshark-2.2.0
-PKGREVISION=   2
+DISTNAME=      wireshark-2.2.1
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/net/wireshark/distinfo
diff -u pkgsrc/net/wireshark/distinfo:1.94 pkgsrc/net/wireshark/distinfo:1.95
--- pkgsrc/net/wireshark/distinfo:1.94  Thu Sep 29 20:11:08 2016
+++ pkgsrc/net/wireshark/distinfo       Sun Oct  9 21:13:22 2016
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.94 2016/09/29 20:11:08 markd Exp $
+$NetBSD: distinfo,v 1.95 2016/10/09 21:13:22 wiz Exp $
 
-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 (wireshark-2.2.1.tar.bz2) = fe07ab3582f39111ce5c78f5de6f44a8667000ac
+RMD160 (wireshark-2.2.1.tar.bz2) = 46214dad4b4ac3b9f1f3f8fc95192d0cc1e3377d
+SHA512 (wireshark-2.2.1.tar.bz2) = 11f09853f5640cdd9003f2f0f309346cf76366edec2e4c24b5493dfc198a0f3e8918d21a38cf50ee5a1516bfdae853d364cda53338baef58f50cde0a929deae6
+Size (wireshark-2.2.1.tar.bz2) = 32154087 bytes
 SHA1 (patch-epan_dissectors_packet-kerberos.c) = 8069e9cdf997b1e32c149e3351ec39e400c3c81b
 SHA1 (patch-epan_dissectors_packet-kerberos.h) = ef0d17c9d7b7f49677abd32b87f3767b5c194a9a
-SHA1 (patch-extcap.c) = 70615218f803d24c89ad8237d6ede2119606a21b
+SHA1 (patch-extcap.c) = 57f71d7074bdbf94283a0307ed27e99cc5043c18

Index: pkgsrc/net/wireshark/patches/patch-extcap.c
diff -u pkgsrc/net/wireshark/patches/patch-extcap.c:1.2 pkgsrc/net/wireshark/patches/patch-extcap.c:1.3
--- pkgsrc/net/wireshark/patches/patch-extcap.c:1.2     Mon Sep 12 11:04:54 2016
+++ pkgsrc/net/wireshark/patches/patch-extcap.c Sun Oct  9 21:13:22 2016
@@ -1,9 +1,9 @@
-$NetBSD: patch-extcap.c,v 1.2 2016/09/12 11:04:54 wiz Exp $
+$NetBSD: patch-extcap.c,v 1.3 2016/10/09 21:13:22 wiz Exp $
 
 Fix linking on NetBSD.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12883
 
---- extcap.c.orig      2016-09-07 16:59:05.000000000 +0000
+--- extcap.c.orig      2016-10-04 18:27:54.000000000 +0000
 +++ extcap.c
 @@ -35,6 +35,8 @@
  #else
@@ -13,4 +13,4 @@ https://bugs.wireshark.org/bugzilla/show
 +#include <sys/wait.h>
  #endif
  
- #include <glib.h>
+ #ifdef HAVE_SYS_TYPES_H