Mon Nov 28 15:30:35 2016 UTC ()
Updated wireshark to 2.2.2.

  Bug Fixes

   The following vulnerabilities have been fixed:
     * [1]wnpa-sec-2016-58
       Profinet I/O long loop. ([2]Bug 12851)
     * [3]wnpa-sec-2016-59
       AllJoyn crash. ([4]Bug 12953)
     * [5]wnpa-sec-2016-60
       OpenFlow crash. ([6]Bug 13071)
     * [7]wnpa-sec-2016-61
       DCERPC crash. ([8]Bug 13072)
     * [9]wnpa-sec-2016-62
       DTN infinite loop. ([10]Bug 13097)

   The Windows PortableApps packages were susceptible to a [11]DLL
   hijacking flaw.

   The following bugs have been fixed:
     * TCP: nextseq incorrect if TCP_MAX_UNACKED_SEGMENTS exceeded & FIN
       true. ([12]Bug 12579)
     * SMPP schedule_delivery_time displayed wrong in Wireshark 2.1.0.
       ([13]Bug 12632)
     * Upgrading to latest version uninstalls Microsoft Visual C++
       redistributable. ([14]Bug 12712)
     * dmg for OS X does not install man pages. ([15]Bug 12746)
     * Fails to compile against Heimdal 1.5.3. ([16]Bug 12831)
     * TCP: Next sequence number off by one when sending payload in SYN
       packet (e.g. TFO). ([17]Bug 12838)
     * Follow TCP Stream shows duplicate stream data. ([18]Bug 12855)
     * Dissection engine falsely asserts that EIGRP packet's checksum is
       incorrect. ([19]Bug 12982)
     * IEEE 802.15.4 frames erroneously handed over to ZigBee dissector.
       ([20]Bug 12984)
     * Capture Filter Bookmark Inactive in Capture Options page. ([21]Bug
       12986)
     * CLNP dissector does not parse ER NPDU properly. ([22]Bug 12993)
     * SNMP trap bindings for NON scalar OIDs. ([23]Bug 13013)
     * BGP LS Link Protection Type TLV (1093) decoding. ([24]Bug 13021)
     * Application crash sorting column for tcp.window_size_scalefactor up
       and down. ([25]Bug 13023)
     * ZigBee Green Power add key during execution. ([26]Bug 13031)
     * Malformed AMPQ packets for session.expected and session.confirmed
       fields. ([27]Bug 13037)
     * Wireshark 2.2.1 crashes when attempting to merge pcap files.
       ([28]Bug 13060)
     * [IS-637A] SMS - Teleservice layer parameter --> IA5 encoded text is
       not correctly displayed. ([29]Bug 13065)
     *
     * Failure to dissect USB Audio feature unit descriptors missing the
       iFeature field. ([30]Bug 13085)
     * MSISDN not populated/decoded in JSON GTP-C decoding. ([31]Bug
       13086)
     * E212: 3 digits MNC are identified as 2 digits long if they end with
       a 0. ([32]Bug 13092)
     * Exception with last unknown Cisco AVP available in a SCCRQ message.
       ([33]Bug 13103)
     * TShark stalls on FreeBSD if androiddump is present. ([34]Bug 13104)
     * Dissector skips DICOM command. ([35]Bug 13110)
     * UUID (FT_GUID) filtering isn't working. ([36]Bug 13121)
     * Manufacturer name resolution fail. ([37]Bug 13126)
     * packet-sdp.c allocates transport_info->encoding_name from wrong
       memory pool. ([38]Bug 13127)
     * Payload type name for dynamic payload is wrong for reverse RTP
       channels. ([39]Bug 13132)

  Updated Protocol Support

   6LoWPAN, AllJoyn, AMPQ, ANSI IS-637 A, BGP, CLNP, DCERPC, DICOM, DTN,
   E.212, EIGRP, ERF, GVSP, IEEE 802.11, IEEE 802.15.4, IP, ISO-8583,
   Kerberos, L2TP, LACP, MAC LTE, OpenFlow, Profinet I/O, RTPS, SCTP, SDP,
   Skype, SMPP, SNA, SNMP, SPNEGO, TCP, USB Audio, XML, and ZigBee


(wiz)
diff -r1.157 -r1.158 pkgsrc/net/wireshark/Makefile
diff -r1.96 -r1.97 pkgsrc/net/wireshark/distinfo
diff -r1.1 -r0 pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.c
diff -r1.1 -r0 pkgsrc/net/wireshark/patches/patch-epan_dissectors_packet-kerberos.h
cvs diff -r1.157 -r1.158 pkgsrc/net/wireshark/Makefile (switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2016/10/09 21:13:22 1.157
+++ pkgsrc/net/wireshark/Makefile 2016/11/28 15:30:35 1.158
@@ -1,86 +1,86 @@ @@ -1,86 +1,86 @@
1# $NetBSD: Makefile,v 1.157 2016/10/09 21:13:22 wiz Exp $ 1# $NetBSD: Makefile,v 1.158 2016/11/28 15:30:35 wiz Exp $
2 2
3DISTNAME= wireshark-2.2.1 3DISTNAME= wireshark-2.2.2
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= https://www.wireshark.org/download/src/ 5MASTER_SITES= https://www.wireshark.org/download/src/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.wireshark.org/ 9HOMEPAGE= http://www.wireshark.org/
10COMMENT= Network protocol analyzer 10COMMENT= Network protocol analyzer
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13CONFLICTS+= ethereal-[0-9]* 13CONFLICTS+= ethereal-[0-9]*
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= gmake perl pkg-config yacc lex 16USE_TOOLS+= gmake perl pkg-config yacc lex
17 17
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19SHLIBTOOL_OVERRIDE= # empty 19SHLIBTOOL_OVERRIDE= # empty
20CHECK_PORTABILITY_SKIP+=packaging/macosx/*/* 20CHECK_PORTABILITY_SKIP+=packaging/macosx/*/*
21 21
22PKGCONFIG_OVERRIDE+= wireshark.pc.in 22PKGCONFIG_OVERRIDE+= wireshark.pc.in
23 23
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25CONFIGURE_ARGS+= --enable-static=no 25CONFIGURE_ARGS+= --enable-static=no
26CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 26CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
27CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} 27CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap}
28CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 28CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
29CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc} 29CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc}
30CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} 30CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex}
31 31
32PTHREAD_OPTS+= require 32PTHREAD_OPTS+= require
33 33
34PYTHON_FOR_BUILD_ONLY= yes 34PYTHON_FOR_BUILD_ONLY= yes
35PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.10.5 35PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.10.5
36REPLACE_PYTHON+= help/faq.py 36REPLACE_PYTHON+= help/faq.py
37REPLACE_PYTHON+= tools/asn2deb 37REPLACE_PYTHON+= tools/asn2deb
38REPLACE_PYTHON+= tools/asn2wrs.py 38REPLACE_PYTHON+= tools/asn2wrs.py
39REPLACE_PYTHON+= tools/dfilter-test.py 39REPLACE_PYTHON+= tools/dfilter-test.py
40REPLACE_PYTHON+= tools/ftsanity.py 40REPLACE_PYTHON+= tools/ftsanity.py
41REPLACE_PYTHON+= tools/html2text.py 41REPLACE_PYTHON+= tools/html2text.py
42REPLACE_PYTHON+= tools/idl2deb 42REPLACE_PYTHON+= tools/idl2deb
43REPLACE_PYTHON+= tools/indexcap.py 43REPLACE_PYTHON+= tools/indexcap.py
44REPLACE_PYTHON+= tools/make-dissector-reg.py 44REPLACE_PYTHON+= tools/make-dissector-reg.py
45REPLACE_PYTHON+= tools/make-tap-reg.py 45REPLACE_PYTHON+= tools/make-tap-reg.py
46REPLACE_PYTHON+= tools/msnchat 46REPLACE_PYTHON+= tools/msnchat
47REPLACE_PYTHON+= tools/ncp2222.py 47REPLACE_PYTHON+= tools/ncp2222.py
48REPLACE_PYTHON+= tools/netscreen2dump.py 48REPLACE_PYTHON+= tools/netscreen2dump.py
49REPLACE_PYTHON+= tools/pkt-from-core.py 49REPLACE_PYTHON+= tools/pkt-from-core.py
50REPLACE_PYTHON+= tools/rdps.py 50REPLACE_PYTHON+= tools/rdps.py
51 51
52.include "../../mk/bsd.prefs.mk" 52.include "../../mk/bsd.prefs.mk"
53.include "options.mk" 53.include "options.mk"
54 54
55.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*) 55.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*)
56USE_BUILTIN.libpcap= no 56USE_BUILTIN.libpcap= no
57.endif 57.endif
58 58
59CONFIGURE_ARGS.Darwin+= --disable-osx-deploy-target 59CONFIGURE_ARGS.Darwin+= --disable-osx-deploy-target
60 60
61# Extra post install targets are in options.mk 61# Extra post install targets are in options.mk
62post-install: ${POST_INSTALL_TARGETS} 62post-install: ${POST_INSTALL_TARGETS}
63 63
64# wireshark no longer builds with NetBSD 3.x provided zlib 64# wireshark no longer builds with NetBSD 3.x provided zlib
65BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1 65BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
66 66
67# wireshark uses gdk_pixbuf_new_from_inline which is deprecated, but asks 67# wireshark uses gdk_pixbuf_new_from_inline which is deprecated, but asks
68# to hide deprecated prototypes. This leads to pointer truncation. 68# to hide deprecated prototypes. This leads to pointer truncation.
69# gui_utils.c:514:12: warning: incompatible integer to pointer conversion 69# gui_utils.c:514:12: warning: incompatible integer to pointer conversion
70# assigning to 'GdkPixbuf *' (aka 'struct _GdkPixbuf *') from 'int' 70# assigning to 'GdkPixbuf *' (aka 'struct _GdkPixbuf *') from 'int'
71# [-Wint-conversion] 71# [-Wint-conversion]
72BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED 72BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
73 73
74.include "../../devel/glib2/buildlink3.mk" 74.include "../../devel/glib2/buildlink3.mk"
75.include "../../devel/pcre/buildlink3.mk" 75.include "../../devel/pcre/buildlink3.mk"
76.include "../../devel/zlib/buildlink3.mk" 76.include "../../devel/zlib/buildlink3.mk"
77.include "../../net/libpcap/buildlink3.mk" 77.include "../../net/libpcap/buildlink3.mk"
78.include "../../devel/libsmi/buildlink3.mk" 78.include "../../devel/libsmi/buildlink3.mk"
79.include "../../security/libgcrypt/buildlink3.mk" 79.include "../../security/libgcrypt/buildlink3.mk"
80.include "../../security/gnutls/buildlink3.mk" 80.include "../../security/gnutls/buildlink3.mk"
81.include "../../security/openssl/buildlink3.mk" 81.include "../../security/openssl/buildlink3.mk"
82 82
83.include "../../lang/python/application.mk" 83.include "../../lang/python/application.mk"
84.include "../../mk/krb5.buildlink3.mk" 84.include "../../mk/krb5.buildlink3.mk"
85.include "../../mk/pthread.buildlink3.mk" 85.include "../../mk/pthread.buildlink3.mk"
86.include "../../mk/bsd.pkg.mk" 86.include "../../mk/bsd.pkg.mk"
cvs diff -r1.96 -r1.97 pkgsrc/net/wireshark/distinfo (switch to unified diff)

--- pkgsrc/net/wireshark/distinfo 2016/10/09 21:17:32 1.96
+++ pkgsrc/net/wireshark/distinfo 2016/11/28 15:30:35 1.97
@@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
1$NetBSD: distinfo,v 1.96 2016/10/09 21:17:32 wiz Exp $ 1$NetBSD: distinfo,v 1.97 2016/11/28 15:30:35 wiz Exp $
2 2
3SHA1 (wireshark-2.2.1.tar.bz2) = fe07ab3582f39111ce5c78f5de6f44a8667000ac 3SHA1 (wireshark-2.2.2.tar.bz2) = b92a292b95e2ea010014364ff513d86afdc8e5a6
4RMD160 (wireshark-2.2.1.tar.bz2) = 46214dad4b4ac3b9f1f3f8fc95192d0cc1e3377d 4RMD160 (wireshark-2.2.2.tar.bz2) = 8aafc482c9ee55f18a0c57e7afaabeccc35a9551
5SHA512 (wireshark-2.2.1.tar.bz2) = 11f09853f5640cdd9003f2f0f309346cf76366edec2e4c24b5493dfc198a0f3e8918d21a38cf50ee5a1516bfdae853d364cda53338baef58f50cde0a929deae6 5SHA512 (wireshark-2.2.2.tar.bz2) = 7db446438ee4dbcc5d5764d09eee0ed641d3a26063d6dd9dd863e26fc974c8eafcc8220ba918c1545594cf2f954cf0b08e3fd9db6d20f3aeb7da68b3a68c97e0
6Size (wireshark-2.2.1.tar.bz2) = 32154087 bytes 6Size (wireshark-2.2.2.tar.bz2) = 32230208 bytes
7SHA1 (patch-epan_dissectors_packet-kerberos.c) = 8069e9cdf997b1e32c149e3351ec39e400c3c81b 
8SHA1 (patch-epan_dissectors_packet-kerberos.h) = ef0d17c9d7b7f49677abd32b87f3767b5c194a9a 
File Deleted: pkgsrc/net/wireshark/patches/Attic/patch-epan_dissectors_packet-kerberos.c
File Deleted: pkgsrc/net/wireshark/patches/Attic/patch-epan_dissectors_packet-kerberos.h