Pullup ticket #5824 - requested by bsiegert

net/wireshark: security update

Revisions pulled up:
- net/wireshark/Makefile                                        1.194,1.196
- net/wireshark/distinfo                                        1.113-1.114
- net/wireshark/options.mk                                      1.20
- net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp deleted
- net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp     deleted
- net/wireshark/patches/patch-ui_qt_wireless__frame.cpp         deleted

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Thu Aug 16 13:20:32 UTC 2018

   Modified Files:
           pkgsrc/net/wireshark: Makefile distinfo
   Removed Files:
           pkgsrc/net/wireshark/patches:
               patch-ui_qt_packet__format__group__box.cpp
               patch-ui_qt_time__shift__dialog.cpp patch-ui_qt_wireless__frame.cpp

   Log Message:
   wireshark: update to 2.6.2.

   Wireshark 2.6.2 Release Notes

    What’s New

     Bug Fixes

      The following vulnerabilities have been fixed:

        • wnpa-sec-2018-34[1]

        • BGP dissector large loop. Bug 13741[2]. CVE-2018-14342[3].

        • wnpa-sec-2018-35[4]

        • ISMP dissector crash. Bug 14672[5]. CVE-2018-14344[6].

        • wnpa-sec-2018-36[7]

        • Multiple dissectors could crash. Bug 14675[8]. CVE-2018-14340[9].

        • wnpa-sec-2018-37[10]

        • ASN.1 BER dissector crash. Bug 14682[11]. CVE-2018-14343[12].

        • wnpa-sec-2018-38[13]

        • MMSE dissector infinite loop. Bug 14738[14]. CVE-2018-14339[15].

        • wnpa-sec-2018-39[16]

        • DICOM dissector crash. Bug 14742[17]. CVE-2018-14341[18].

        • wnpa-sec-2018-40[19]

        • Bazaar dissector infinite loop. Bug 14841[20].
          CVE-2018-14368[21].

        • wnpa-sec-2018-41[22]

        • HTTP2 dissector crash. Bug 14869[23]. CVE-2018-14369[24].

        • wnpa-sec-2018-42[25]

        • CoAP dissector crash. Bug 14966[26]. CVE-2018-14367[27].

      The following bugs have been fixed:

        • ISMP.EDP "Tuples" dissected incorrectly. Bug 4943[28].

        • Wireshark - Race issue when switching between files using
          Wireshark’s "Files in Set" dialog. Bug 10870[29].

        • Sorting on "Source port" or "Destination port" column sorts
          alphabetically, not numerically. Bug 11460[30].

        • Wireshark crashes when changing profiles. Bug 11648[31].

        • Crash when starting capture while saving capture file or
          rescanning file after display filter change. Bug 13594[32].

        • Crash when switching to TRANSUM enabled profile. Bug 13697[33].

        • TCP retransmission with additional payload leads to incorrect
          bytes and length in stream. Bug 13700[34].

        • Wireshark crashes with single quote string display filter. Bug
          14084[35].

        • randpkt can write packets that libwiretap can’t read. Bug
          14107[36].

        • Wireshark crashes when loading new file before previous load has
          finished. Bug 14351[37].

        • Valid packet produces Malformed Packet: OpcUa. Bug 14465[38].

        • Error received from dissect_wccp2_hash_assignment_info(). Bug
          14573[39].

        • CRC checker wrong for FPP. Bug 14610[40].

        • Cross-build broken due to make-dissectors and make-taps. Bug
          14622[41].

        • Extraction of SMB file results in wrong size. Bug 14662[42].

        • 6LoWPAN dissector merges fragments from different sources. Bug
          14700[43].

        • IP address to name resolution doesn’t work in TShark. Bug
          14711[44].

        • "Decode as" Modbus RTU over USB doesn’t work with 2.6.0 but with
          2.4.6. Bug 14717[45].

        • proto_tree_add_protocol_format might leak memory. Bug 14719[46].

        • tostring for NSTime objects in lua gives wrong results. Bug
          14720[47].

        • Media type "application/octet-stream" registered for both Thread
          and UASIP. Bug 14729[48].

        • Crash related to SCTP tap. Bug 14733[49].

        • Formatting of OSI area addresses/address prefixes goes past the
          end of the area address/address prefix. Bug 14744[50].

        • ICMPv6 Router Renumbering - Packet Dissector - malformed. Bug
          14755[51].

        • WiMAX HARQ MAP decoder segfaults when length is too short. Bug
          14780[52].

        • HTTP PUT request following a HEAD request is not correctly
          decoded. Bug 14793[53].

        • SYNC PDU type 3 miss the last PDU length. Bug 14823[54].

        • Reversed 128 bits service UUIDs when Bluetooth Low Energy
          advertisement data are dissected. Bug 14843[55].

        • Issues with Wireshark when the user doesn’t have permission to
          capture. Bug 14847[56].

        • Wrong description when LE Bluetooth Device Address type is
          dissected. Bug 14866[57].

        • LE Role advertisement type (0x1c) is not dissected properly
          according to the Bluetooth specification. Bug 14868[58].

        • Regression: Wireshark 2.6.0 and 2.6.1 are unable to read NetMon
          files which were readable by previous versions. Bug 14876[59].

        • Wireshark doesn’t properly display (deliberately) invalid 220
          responses from Postfix. Bug 14878[60].

        • Follow TCP Stream and click reassembled content moves you to
          incorrect current packet. Bug 14898[61].

        • Crash when changing profiles while loading a capture file. Bug
          14918[62].

        • Duplicate PDU during C Arrays Output Export. Bug 14933[63].

        • DCE/RPC not dissected when "reserved for use by implementations"
          flag bits set. Bug 14942[64].

        • Follow TCP Stream truncates output on missing (but ACKed)
          segments. Bug 14944[65].

        • There’s no option to include column headings when printing
          packets or exporting packet dissections with Qt Wireshark. Bug
          14945[66].

        • Qt: SCTP Graph Dialog: Abort when doing analysis. Bug 14971[67].

        • CMake is unable to find LUA libraries. Bug 14983[68].

     Updated Protocol Support

      6LoWPAN, ASN.1 BER, Bazaar, BGP, Bluetooth, Bluetooth HCI_CMD, CIGI,
      Cisco ttag, CoAP, Data, DCERPC, Diameter 3GPP, DICOM, DOCSIS, FPP,
      GSM A GM, GTPv2, HTTP, HTTP2, IAX2, ICMPv6, IEEE 1722, IEEE 802.11,
      IPv4, ISMP, LISP, MMSE, MTP3, MySQL, NFS, OpcUa, PPI GPS, Q.931,
      RNSAP, RPCoRDMA, S1AP, SCTP, SMB, SMTP, STUN, SYNC, T.30, TCP,
      TRANSUM, WAP, WCCP, Wi-SUN, WiMax HARQ Map Message, and WSP

     New and Updated Capture File Support

      Alcatel-Lucent Ascend and Microsoft Network Monitor


   To generate a diff of this commit:
   cvs rdiff -u -r1.193 -r1.194 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.112 -r1.113 pkgsrc/net/wireshark/distinfo
   cvs rdiff -u -r1.1 -r0 \
       pkgsrc/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp \
       pkgsrc/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp \
       pkgsrc/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Sun Sep  2 21:49:06 UTC 2018

   Modified Files:
           pkgsrc/net/wireshark: Makefile distinfo options.mk

   Log Message:
   wireshark: update to 2.6.3.

   Fix some pkglint warnings while here.

   Wireshark 2.6.3 Release Notes

     Bug Fixes

      The following vulnerabilities have been fixed:

        • wnpa-sec-2018-44[1]

        • Bluetooth AVDTP dissector crash. Bug 14884[2]. CVE-2018-16058[3].

        • wnpa-sec-2018-45[4]

        • Bluetooth Attribute Protocol dissector crash. Bug 14994[5].
          CVE-2018-16056[6].

        • wnpa-sec-2018-46[7]

        • Radiotap dissector crash. Bug 15022[8]. CVE-2018-16057[9].

      The following bugs have been fixed:

        • Wireshark Hangs on startup initializing external capture plugins.
          Bug 14657[10].

        • Qt: SCTP Analyse Association Dialog: Segmentation fault when
          clicking twice the Filter Association button. Bug 14970[11].

        • Incorrect presentation of dissected data item (NETMASK) in ISAKMP
          dissector. Bug 14987[12].

        • Decode NFAPI: CONFIG.request Error. Bug 14988[13].

        • udpdump frame too long error. Bug 14989[14].

        • ISDN - LAPD dissector broken since version 2.5.0. Bug 15018[15].

        • ASTERIX Category 062 / 135 Altitude has wrong value. Bug
          15030[16].

        • Wireshark cannot decrypt SSL/TLS session if it was proxied over
          HTTP tunnel. Bug 15042[17].

        • TLS records in a HTTP tunnel are displayed as "Encrypted
          Handshake Message". Bug 15043[18].

        • BTATT Dissector: Temperature Measurement: Celsius and Fahrenheit
          swapped. Bug 15058[19].

        • Diameter AVP User Location Info, Mobile Network Code decoded not
          correctly. Bug 15068[20].

        • Heartbeat message "Info" displayed without comma separator. Bug
          15079[21].

     Updated Protocol Support

      ASTERIX, Bluetooth, Bluetooth ATT, Bluetooth AVDTP, DHCP, DTLS,
      E.212, FP, GSM A RR, HTTP, HTTP2, IEEE 802.11, ISAKMP, ISDN, K12,
      NFAPI, Nordic BLE, PFCP, Radiotap, SSL, Steam IHS Discovery, and TLS
      1.3

     New and Updated Capture File Support

      pcapng

     New and Updated Capture Interfaces support

      ciscodump, udpdump


   To generate a diff of this commit:
   cvs rdiff -u -r1.195 -r1.196 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.113 -r1.114 pkgsrc/net/wireshark/distinfo
   cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/wireshark/options.mk

6 files changed, 14 insertions, 60 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index b971df7c5e6..c934368bff1 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.190 2018/06/21 12:22:10 adam Exp $
+# $NetBSD: Makefile,v 1.190.2.1 2018/09/10 19:32:13 spz Exp $
 
-DISTNAME=	wireshark-2.6.1
-PKGREVISION=	1
+DISTNAME=	wireshark-2.6.3
 CATEGORIES=	net
 MASTER_SITES=	https://www.wireshark.org/download/src/
 EXTRACT_SUFX=	.tar.xz
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index b89a0bbd056..12becd161c7 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.112 2018/06/21 12:22:10 adam Exp $
+$NetBSD: distinfo,v 1.112.2.1 2018/09/10 19:32:13 spz Exp $
 
-SHA1 (wireshark-2.6.1.tar.xz) = a0cf45d99ab9a42e087af150cbdec08650b9977a
-RMD160 (wireshark-2.6.1.tar.xz) = a7f187de0c44b801b51e8b72df41681bbc1835f8
-SHA512 (wireshark-2.6.1.tar.xz) = e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
-Size (wireshark-2.6.1.tar.xz) = 28386244 bytes
-SHA1 (patch-ui_qt_packet__format__group__box.cpp) = 05d45f3aaa246622ed16a8b7819587ca89e66f14
-SHA1 (patch-ui_qt_time__shift__dialog.cpp) = 4622d8828fee3baf625ee00e36f03cca9c491d58
-SHA1 (patch-ui_qt_wireless__frame.cpp) = 4ba3a2fc90ae0058be2c27b6313d6ff777b9adac
+SHA1 (wireshark-2.6.3.tar.xz) = d239fd091d59968ac8a1b42b28e61aeef09c20b7
+RMD160 (wireshark-2.6.3.tar.xz) = 74a558e7a004c64ff118870d525025beda4a665d
+SHA512 (wireshark-2.6.3.tar.xz) = 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
+Size (wireshark-2.6.3.tar.xz) = 28384004 bytes
diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk
index b3c8f9ddfec..338faf96deb 100644
--- a/net/wireshark/options.mk
+++ b/net/wireshark/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2018/06/21 12:22:10 adam Exp $
+# $NetBSD: options.mk,v 1.19.2.1 2018/09/10 19:32:13 spz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.wireshark
 PKG_SUPPORTED_OPTIONS=		gtk3 lua
@@ -33,9 +33,7 @@ CONFIGURE_ENV+=		UIC=${QTDIR}/bin/uic
 PLIST.qt=		yes
 .endif
 
-.if empty(PKG_OPTIONS:Mgtk3)
-CONFIGURE_ARGS+=	--without-gtk
-.else
+.if !empty(PKG_OPTIONS:Mgtk3)
 CONFIGURE_ARGS+=	--with-gtk=3
 PLIST.gtk3=		yes
 POST_INSTALL_TARGETS+=	install-gtk-desktop
@@ -47,6 +45,8 @@ install-gtk-desktop:
 	${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \
 		${DESTDIR}${PREFIX}/share/applications/
 
+.else
+CONFIGURE_ARGS+=	--without-gtk
 .endif
 
 # We might install the qt front end one day as well,
@@ -86,12 +86,12 @@ install-icons:
 .  endif
 .endif
 
-.if empty(PKG_OPTIONS:Mlua)
-CONFIGURE_ARGS+=	--with-lua=no
-.else
+.if !empty(PKG_OPTIONS:Mlua)
 LUA_VERSIONS_INCOMPATIBLE=	53
 .include "../../lang/lua/buildlink3.mk"
 
 CONFIGURE_ARGS+=	--with-lua=yes
 PLIST.lua=		yes
+.else
+CONFIGURE_ARGS+=	--with-lua=no
 .endif
diff --git a/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp b/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp
deleted file mode 100644
index f36db70e020..00000000000
--- a/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ui_qt_packet__format__group__box.cpp,v 1.1 2018/06/21 12:22:10 adam Exp $
-
-Fix for Qt 5.11.
-
---- ui/qt/packet_format_group_box.cpp.orig	2018-06-21 09:11:22.000000000 +0000
-+++ ui/qt/packet_format_group_box.cpp
-@@ -10,6 +10,7 @@
- #include <ui_packet_format_group_box.h>
- 
- #include <QStyle>
-+#include <QStyleOption>
- 
- PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
-     QGroupBox(parent),
diff --git a/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp b/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp
deleted file mode 100644
index ef3ff639198..00000000000
--- a/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ui_qt_time__shift__dialog.cpp,v 1.1 2018/06/21 12:22:10 adam Exp $
-
-Fix for Qt 5.11.
-
---- ui/qt/time_shift_dialog.cpp.orig	2018-06-21 09:15:54.000000000 +0000
-+++ ui/qt/time_shift_dialog.cpp
-@@ -14,6 +14,7 @@
- #include <ui/time_shift.h>
- #include <ui/qt/utils/tango_colors.h>
- 
-+#include <QStyleOption>
- 
- TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
-     QDialog(parent),
diff --git a/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp b/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp
deleted file mode 100644
index 8c051361114..00000000000
--- a/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ui_qt_wireless__frame.cpp,v 1.1 2018/06/21 12:22:10 adam Exp $
-
-Fix for Qt 5.11.
-
---- ui/qt/wireless_frame.cpp.orig	2018-06-21 09:19:08.000000000 +0000
-+++ ui/qt/wireless_frame.cpp
-@@ -23,6 +23,7 @@
- #include <wsutil/frequency-utils.h>
- 
- #include <QProcess>
-+#include <QAbstractItemView>
- 
- // To do:
- // - Disable or hide invalid channel types.