Received: by mail.netbsd.org (Postfix, from userid 605) id 3DC1A84D25; Sun, 2 Sep 2018 21:49:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 405F884D22 for ; Sun, 2 Sep 2018 21:49:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id MUqR2VZXSMhV for ; Sun, 2 Sep 2018 21:49:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 326A584CDC for ; Sun, 2 Sep 2018 21:49:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 22F02FBF8; Sun, 2 Sep 2018 21:49:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1535924946110960" MIME-Version: 1.0 Date: Sun, 2 Sep 2018 21:49:06 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/net/wireshark To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20180902214906.22F02FBF8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1535924946110960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" 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 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1535924946110960 Content-Disposition: inline Content-Length: 2955 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/wireshark/Makefile diff -u pkgsrc/net/wireshark/Makefile:1.195 pkgsrc/net/wireshark/Makefile:1.196 --- pkgsrc/net/wireshark/Makefile:1.195 Wed Aug 22 09:46:09 2018 +++ pkgsrc/net/wireshark/Makefile Sun Sep 2 21:49:05 2018 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.195 2018/08/22 09:46:09 wiz Exp $ +# $NetBSD: Makefile,v 1.196 2018/09/02 21:49:05 wiz Exp $ -DISTNAME= wireshark-2.6.2 -PKGREVISION= 1 +DISTNAME= wireshark-2.6.3 CATEGORIES= net MASTER_SITES= https://www.wireshark.org/download/src/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/net/wireshark/distinfo diff -u pkgsrc/net/wireshark/distinfo:1.113 pkgsrc/net/wireshark/distinfo:1.114 --- pkgsrc/net/wireshark/distinfo:1.113 Thu Aug 16 13:20:32 2018 +++ pkgsrc/net/wireshark/distinfo Sun Sep 2 21:49:05 2018 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.113 2018/08/16 13:20:32 wiz Exp $ +$NetBSD: distinfo,v 1.114 2018/09/02 21:49:05 wiz Exp $ -SHA1 (wireshark-2.6.2.tar.xz) = 52517c30926211b0b718815b51a3f06a18d8f5da -RMD160 (wireshark-2.6.2.tar.xz) = e9b782d49d9a063ba556320e9f2c08dea079967d -SHA512 (wireshark-2.6.2.tar.xz) = e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2 -Size (wireshark-2.6.2.tar.xz) = 28392140 bytes +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 Index: pkgsrc/net/wireshark/options.mk diff -u pkgsrc/net/wireshark/options.mk:1.19 pkgsrc/net/wireshark/options.mk:1.20 --- pkgsrc/net/wireshark/options.mk:1.19 Thu Jun 21 12:22:10 2018 +++ pkgsrc/net/wireshark/options.mk Sun Sep 2 21:49:05 2018 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.19 2018/06/21 12:22:10 adam Exp $ +# $NetBSD: options.mk,v 1.20 2018/09/02 21:49:05 wiz 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 --_----------=_1535924946110960--