Tue Nov 23 21:01:36 2010 UTC ()
Pullup ticket 3277 - requested by tron
security update

Revisions pulled up:
- pkgsrc/net/wireshark/Makefile		1.55
- pkgsrc/net/wireshark/distinfo		1.37

-------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Sun Nov 21 22:54:55 UTC 2010

   Modified Files:
           pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   Update "wireshark" package to version 1.4.2. Changes since version 1.4.1:
   - The following vulnerabilities have been fixed. See the security
     advisory for details and a workaround.
     - Nephi Johnson of BreakingPoint discovered that the LDSS
       dissector could overflow a buffer. (Bug 5318)
       Versions affected: 1.2.0 to 1.2.12 and 1.4.0 to 1.4.1.
     - The ZigBee ZCL dissector could go into an infinite loop. (Bug 5303)
       Versions affected: 1.4.0 to 1.4.1.
   - The following bugs have been fixed:
     - File-Open Display Filter is overwritten by Save-As Filename. (Bug 3894)
     - Wireshark crashes with "Gtk-ERROR **: Byte index 6 is off the
       end of the line" if click on last PDU. (Bug 5285)
     - GTK-ERROR can occur in packets when there are multiple
       Netbios/SMB headers in a single frame. (Bug 5289)
     - "Tshark -G values" crashes on Windows. (Bug 5296)
     - PROFINET I&M0FilterData packet not fully decoded. (Bug 5299)
     - PROFINET MRP linkup/linkdown decoding incorrect. (Bug 5300)
     - [lua] Dumper:close() will cause a segfault due later GC of the
       Dumper. (Bug 5320)
     - Network Instruments' trace files sometimes cannot be read with
       an error message of "Observer: bad record: Invalid magic
       number". (Bug 5330)
     - IO Graph Time of Day times incorrect for filtered data. (Bug
       5340)
     - Wireshark tools do not detect and read some ERF files
       correctly. (Bug 5344)
     - "editcap -h" sends some lines to stderr and others to stdout.
       (Bug 5353)
     - IP Timestamp Option: "flag=3D3" variant (prespecified) not
       displayed correctly. (Bug 5357)
     - AgentX PDU Header 'hex field highlighting' incorrectly spans
       extra bytes. (Bug 5364)
     - AgentX dissector cannot handle null OID in Open-PDU. (Bug
       5368)
     - Crash with "Gtk-ERROR **: Byte index 6 is off the end of the
       line". (Bug 5374)
     - ANCP Portmanagment TLV wrong decoded. (Bug 5388)
     - Crash during startup because of Python SyntaxError in
       wspy_libws.py. (Bug 5389)
   - Updated Protocol Support
     AgentX, ANCP, DIAMETER, HTTP, IP, LDSS, MIME, NBNS, PROFINET, SIP,
     TCP, Telnet, ZigBee
   - New and Updated Capture File Support
     Endace ERF, Network Instruments Observer.

   To generate a diff of this commit:
   cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/wireshark/distinfo


(spz)
diff -r1.53 -r1.53.2.1 pkgsrc/net/wireshark/Makefile
diff -r1.36 -r1.36.2.1 pkgsrc/net/wireshark/distinfo

cvs diff -r1.53 -r1.53.2.1 pkgsrc/net/wireshark/Makefile (expand / switch to unified diff)

--- pkgsrc/net/wireshark/Makefile 2010/10/13 07:35:04 1.53
+++ pkgsrc/net/wireshark/Makefile 2010/11/23 21:01:35 1.53.2.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.53 2010/10/13 07:35:04 tron Exp $ 1# $NetBSD: Makefile,v 1.53.2.1 2010/11/23 21:01:35 spz Exp $
2 2
3DISTNAME= wireshark-1.4.1 3DISTNAME= wireshark-1.4.2
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
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16CONFLICTS+= ethereal-[0-9]* 16CONFLICTS+= ethereal-[0-9]*

cvs diff -r1.36 -r1.36.2.1 pkgsrc/net/wireshark/distinfo (expand / switch to unified diff)

--- pkgsrc/net/wireshark/distinfo 2010/10/13 07:35:04 1.36
+++ pkgsrc/net/wireshark/distinfo 2010/11/23 21:01:35 1.36.2.1
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.36 2010/10/13 07:35:04 tron Exp $ 1$NetBSD: distinfo,v 1.36.2.1 2010/11/23 21:01:35 spz Exp $
2 2
3SHA1 (wireshark-1.4.1.tar.bz2) = 8a3832b3a8cadbb0287fc4c1bcd22a75177df2fb 3SHA1 (wireshark-1.4.2.tar.bz2) = 03eb2bcd1de93fd0b45d6f1346e97d5f03a47c3e
4RMD160 (wireshark-1.4.1.tar.bz2) = 6908437ff93d62c970f1dc8149a253ffffcb8479 4RMD160 (wireshark-1.4.2.tar.bz2) = 5f0c1a9c52347782fcdcd6c11e24d21cfe89f7e2
5Size (wireshark-1.4.1.tar.bz2) = 20208926 bytes 5Size (wireshark-1.4.2.tar.bz2) = 20208792 bytes
6SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9 6SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9
7SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c 7SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
8SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 8SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
9SHA1 (patch-ad) = a09b5ac9e836ef01fbd6ba103de00d08c0af2800 9SHA1 (patch-ad) = a09b5ac9e836ef01fbd6ba103de00d08c0af2800
10SHA1 (patch-ba) = 49825d82605a665f54a5cdb6ccb364e55c0e0ffa 10SHA1 (patch-ba) = 49825d82605a665f54a5cdb6ccb364e55c0e0ffa
11SHA1 (patch-bb) = 1e16337d1894f196f61b233423d729246dea33b5 11SHA1 (patch-bb) = 1e16337d1894f196f61b233423d729246dea33b5
12SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e 12SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e