Wed Dec 18 11:52:26 2013 UTC ()
Update "wireshark" package to version 1.10.4. Changes since version 1.10.3:
- Bug Fixes
   The following vulnerabilities have been fixed.
     * wnpa-sec-2013-66
       The SIP dissector could go into an infinite loop.
       Discovered by Alain Botti. (Bug 9388)
       Versions affected: 1.10.0 to 1.10.3, 1.8.0 to 1.8.11
       CVE-2013-7112
     * wnpa-sec-2013-67
       The BSSGP dissector could crash. Discovered by Laurent
       Butti. (Bug 9488)
       Versions affected: 1.10.0 to 1.10.3
       CVE-2013-7113
     * wnpa-sec-2013-68
       The NTLMSSP v2 dissector could crash. Discovered by Garming
       Sam.
       Versions affected: 1.10.0 to 1.10.3, 1.8.0 to 1.8.11
       CVE-2013-7114
   The following bugs have been fixed:
     * "On-the-wire" packet lengths are limited to 65535 bytes.
       (Bug 8808, ws-buglink:9390)
     * Tx MCS set is not interpreted properly in WLAN beacon
       frame. (Bug 8894)
     * VoIP Graph Analysis window - some calls are black. (Bug
       8966)
     * Wireshark fails to decode single-line, multiple Contact:
       URIs in SIP responses. (Bug 9031)
     * epan/follow.c - Incorrect "bytes missing in capture file"
       in "check_fragments" due to an unsigned int wraparound?.
       (Bug 9112)
     * gsm_map doesn't decode MAPv3 reportSM-DeliveryStatus
       result. (Bug 9382)
     * Incorrect NFSv4 FATTR4_SECURITY_LABEL value. (Bug 9383)
     * Timestamp decoded for Gigamon trailer is not padded
       correctly. (Bug 9433)
     * SEL Fast Message Bug-fix for Signed 16-bit Integer Fast
       Meter Messages. (Bug 9435)
     * DNP3 Bug Fix for Analog Data Sign Bit Handling. (Bug
       9442)
     * GSM SMS User Data header fill bits are wrong when using a 7
       bits ASCII / IA5 encoding. (Bug 9478)
     * WCDMA RLC dissector cannot assemble PDUs with SNs skipped
       and wrap-arounded. (Bug 9505)
     * DTLS: fix buffer overflow in mac check. (Bug 9512)
     *  Correct data length in SCSI_DATA_IN packets (within
       iSCSI). (Bug 9521)
     * GSM SMS UDH EMS control expects 4 octets instead of 3 with
       OPTIONAL 4th. (Bug 9550)
     * Fix "decode as ..." for packet-time.c. (Bug 9563)
- Updated Protocol Support
  ANSI IS-637-A, BSSGP, DNP3, DVB-BAT, DVB-CI, GSM MAP, GSM SMS,
  IEEE 802.11, iSCSI, NFSv4, NTLMSSP v2, RLC, SEL FM, SIP, and Time


(tron)
diff -r1.3 -r1.4 pkgsrc/net/wireshark/DESCR
diff -r1.111 -r1.112 pkgsrc/net/wireshark/Makefile
diff -r1.70 -r1.71 pkgsrc/net/wireshark/distinfo
diff -r1.12 -r1.13 pkgsrc/net/wireshark/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/net/wireshark/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/net/wireshark/patches/patch-ac
cvs diff -r1.3 -r1.4 pkgsrc/net/wireshark/DESCR (expand / switch to unified diff)

--- pkgsrc/net/wireshark/DESCR 2006/07/31 10:43:32 1.3
+++ pkgsrc/net/wireshark/DESCR 2013/12/18 11:52:25 1.4
@@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
1Wireshark (formerly known as Ethereal) is a free network protocol analyzer for 1Wireshark is a network traffic analyzer, or "sniffer", for Unix and
2Unix and Windows. It allows you to examine data from a live network or from a 2Unix-like operating systems. It uses GTK+, a graphical user interface
3capture file on disk. You can interactively browse the capture data, viewing 3library, and libpcap, a packet capture and filtering library.
4summary and detail information for each packet. Wireshark has several powerful 4
5features, including a rich display filter language and the ability to view the 5The Wireshark distribution also comes with TShark, which is a
6reconstructed stream of a TCP session. 6line-oriented sniffer (similar to Sun's snoop, or tcpdump) that uses the
 7same dissection, capture-file reading and writing, and packet filtering
 8code as Wireshark, and with editcap, which is a program to read capture
 9files and write the packets from that capture file, possibly in a
 10different capture file format, and with some packets possibly removed
 11from the capture.
cvs diff -r1.111 -r1.112 pkgsrc/net/wireshark/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2013/11/02 10:30:00 1.111
+++ pkgsrc/net/wireshark/Makefile 2013/12/18 11:52:25 1.112
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.111 2013/11/02 10:30:00 tron Exp $ 1# $NetBSD: Makefile,v 1.112 2013/12/18 11:52:25 tron Exp $
2 2
3DISTNAME= wireshark-1.10.3 3DISTNAME= wireshark-1.10.4
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://www.wireshark.org/download/src/ \ 5MASTER_SITES= http://www.wireshark.org/download/src/ \
6 ${MASTER_SITE_SOURCEFORGE:=wireshark/} 6 ${MASTER_SITE_SOURCEFORGE:=wireshark/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9OWNER= tron@NetBSD.org 9OWNER= tron@NetBSD.org
10HOMEPAGE= http://www.wireshark.org/ 10HOMEPAGE= http://www.wireshark.org/
11COMMENT= Network protocol analyzer 11COMMENT= Network protocol analyzer
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14CONFLICTS+= ethereal-[0-9]* 14CONFLICTS+= ethereal-[0-9]*
15 15
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
cvs diff -r1.70 -r1.71 pkgsrc/net/wireshark/distinfo (expand / switch to unified diff)

--- pkgsrc/net/wireshark/distinfo 2013/11/02 10:30:00 1.70
+++ pkgsrc/net/wireshark/distinfo 2013/12/18 11:52:25 1.71
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.70 2013/11/02 10:30:00 tron Exp $ 1$NetBSD: distinfo,v 1.71 2013/12/18 11:52:25 tron Exp $
2 2
3SHA1 (wireshark-1.10.3.tar.bz2) = 58b02d6c2f1ae086a6ec46289d1eea0cc4343309 3SHA1 (wireshark-1.10.4.tar.bz2) = da722f257968d5a8f8e7a6d7afb4b853d5e519b7
4RMD160 (wireshark-1.10.3.tar.bz2) = ba8fe7da97cae0d60c32735b7fbd78662fd693bd 4RMD160 (wireshark-1.10.4.tar.bz2) = 844bb0001ecc754b3eb99015e7127147375ebd10
5Size (wireshark-1.10.3.tar.bz2) = 26672853 bytes 5Size (wireshark-1.10.4.tar.bz2) = 26675167 bytes
6SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc 6SHA1 (patch-AUTHORS) = 2d4265d9b8b4df7e3ab438684637058fdcb391fc
7SHA1 (patch-aa) = 6d5eac302fbe506af25874d59758088e1759d72c 7SHA1 (patch-aa) = c4b7a3d20fac115020069588e74f35e2e77235e6
8SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c 8SHA1 (patch-ab) = c68adc187ec802b076d3b3c3d3b0f3bb01a8a2eb
9SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 9SHA1 (patch-ac) = 470a2a32a5577f16aef4ba3e638eb6b97c483ba3
10SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 10SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9
11SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352 11SHA1 (patch-bb) = 9379f67c2f5d1c63aa0b2c597ef789336db78352
12SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e 12SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e
13SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077 13SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077
cvs diff -r1.12 -r1.13 pkgsrc/net/wireshark/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/wireshark/patches/Attic/patch-aa 2013/07/04 21:33:14 1.12
+++ pkgsrc/net/wireshark/patches/Attic/patch-aa 2013/12/18 11:52:25 1.13
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.12 2013/07/04 21:33:14 adam Exp $ 1$NetBSD: patch-aa,v 1.13 2013/12/18 11:52:25 tron Exp $
 2
 3Fix build.
2 4
3--- ui/time_shift.c.orig 2013-07-04 20:20:31.000000000 +0000 5--- ui/time_shift.c.orig 2013-07-04 20:20:31.000000000 +0000
4+++ ui/time_shift.c 6+++ ui/time_shift.c
5@@ -29,6 +29,9 @@ 7@@ -29,6 +29,9 @@
6 #include <string.h> 8 #include <string.h>
7 #include <ctype.h> 9 #include <ctype.h>
8 #include <math.h> 10 #include <math.h>
9+#ifndef HAVE_FLOORL 11+#ifndef HAVE_FLOORL
10+#define floorl(a) floor((double)(a)) 12+#define floorl(a) floor((double)(a))
11+#endif 13+#endif
12  14
13 #include <glib.h> 15 #include <glib.h>
14  16
cvs diff -r1.3 -r1.4 pkgsrc/net/wireshark/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/wireshark/patches/Attic/patch-ab 2007/07/06 17:59:16 1.3
+++ pkgsrc/net/wireshark/patches/Attic/patch-ab 2013/12/18 11:52:25 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.3 2007/07/06 17:59:16 drochner Exp $ 1$NetBSD: patch-ab,v 1.4 2013/12/18 11:52:25 tron Exp $
 2
 3Fix compiler warning caused by improper use of toupper(3).
2 4
3--- wiretap/dbs-etherwatch.c.orig 2007-07-06 12:52:45.000000000 +0200 5--- wiretap/dbs-etherwatch.c.orig 2007-07-06 12:52:45.000000000 +0200
4+++ wiretap/dbs-etherwatch.c 6+++ wiretap/dbs-etherwatch.c
5@@ -624,13 +624,13 @@ parse_hex_dump(char* dump, guint8 *buf,  7@@ -624,13 +624,13 @@ parse_hex_dump(char* dump, guint8 *buf,
6 if(isdigit((guchar)dump[pos])) { 8 if(isdigit((guchar)dump[pos])) {
7 buf[count] = (dump[pos] - '0') << 4; 9 buf[count] = (dump[pos] - '0') << 4;
8 } else { 10 } else {
9- buf[count] = (toupper(dump[pos]) - 'A' + 10) << 4; 11- buf[count] = (toupper(dump[pos]) - 'A' + 10) << 4;
10+ buf[count] = (toupper((guchar)dump[pos]) - 'A' + 10) << 4; 12+ buf[count] = (toupper((guchar)dump[pos]) - 'A' + 10) << 4;
11 } 13 }
12 pos++; 14 pos++;
13 if(isdigit((guchar)dump[pos])) { 15 if(isdigit((guchar)dump[pos])) {
14 buf[count] += dump[pos] - '0'; 16 buf[count] += dump[pos] - '0';
cvs diff -r1.1 -r1.2 pkgsrc/net/wireshark/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/wireshark/patches/Attic/patch-ac 2008/10/26 14:06:52 1.1
+++ pkgsrc/net/wireshark/patches/Attic/patch-ac 2013/12/18 11:52:25 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ac,v 1.1 2008/10/26 14:06:52 tron Exp $ 1$NetBSD: patch-ac,v 1.2 2013/12/18 11:52:25 tron Exp $
 2
 3Fix build problem caused by name space polution.
2 4
3--- epan/dissectors/packet-mtp3.h.orig 2008-10-20 20:19:32.000000000 +0100 5--- epan/dissectors/packet-mtp3.h.orig 2008-10-20 20:19:32.000000000 +0100
4+++ epan/dissectors/packet-mtp3.h 2008-10-26 13:41:50.000000000 +0000 6+++ epan/dissectors/packet-mtp3.h 2008-10-26 13:41:50.000000000 +0000
5@@ -46,6 +46,10 @@ 7@@ -46,6 +46,10 @@
6 guint8 ni; 8 guint8 ni;
7 } mtp3_addr_pc_t; 9 } mtp3_addr_pc_t;
8  10
9+#if defined(__NetBSD__) && defined(si_code) 11+#if defined(__NetBSD__) && defined(si_code)
10+#undef si_code 12+#undef si_code
11+#endif 13+#endif
12+ 14+
13 typedef struct _mtp3_tap_rec_t { 15 typedef struct _mtp3_tap_rec_t {
14 mtp3_addr_pc_t addr_opc; 16 mtp3_addr_pc_t addr_opc;