Wed Sep 23 12:47:14 2009 UTC ()
Pullup ticket 2899 - requested by tron
security update

Revisions pulled up:
- pkgsrc/net/wireshark/Makefile		by patch
- pkgsrc/net/wireshark/PLIST		by patch
- pkgsrc/net/wireshark/distinfo		by patch

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sat Sep 19 06:36:19 UTC 2009

   Modified Files:
   	pkgsrc/net/wireshark: Makefile PLIST distinfo

   Log Message:
   Update "wireshark" package to version 1.2.2. Changes since version 1.2.1:
   - The following vulnerabilities have been fixed. See the security
     advisory for details and a workaround.
     - The GSM A RR dissector could crash.
       Versions affected: 1.2.0 to 1.2.1
     - The OpcUa dissector could use excessive CPU and memory.
       Versions affected: 0.99.6 to 1.0.8, 1.2.0 to 1.2.1
     - The TLS dissector could crash on some platforms.
       Versions affected: 1.2.0 to 1.2.1
   - The following bugs have been fixed:
     - The "Capture->Interfaces" window can't be closed. (Bug 1740)
     - tshark-1.0.2 (dumpcap) signal abort core saved. (Bug 2767)
     - Memory leak fixes. (Bug 3330)
     - Display filter autocompletion doesn't work for some RADIUS and
       WiMAX ASNCP fields. (Bug 3538)
     - Wireshark Portable includes wrong WinPcap installer. (Bug
       3547)
     - Crash when loading a profile. (Bug 3640)
     - The proto,colinfo tap doesn't work if the INFO column isn't
       being printed. (Bug 3675)
     - Flow Graph adds too much unnecessary garbage. (Bug 3693)
     - The EAP Diameter dictionary file was missing in the
       distribution. (Bug 3761)
     - Graph analysis window is behind other window. (Bug 3773)
     - IKEv2 Cert Request payload dissection error. (Bug 3782)
     - DNS NAPTR RR (RFC 3403) replacement MUST be a fully qualified
       domain-name. (Bug 3792)
     - Malformed RTCP Packet error while sending Payload specific
       RTCP feedback packet( as per RFC 4585). (Bug 3800)
     - 802.11n Block Ack packet Bitmap field missing. (Bug 3806)
     - Wireshark doesn't decode WBXML/ActiveSync information
       correctly. (Bug 3811)
     - Malformed packet when IPv6 packet has Next Header =3D=3D 59. (Bug
       3820)
     - Wireshark could crash while reading an ERF file. (Bug 3849)
     - Minor errors in gsm rr dissectors. (Bug 3889)
     - WPA Decryption Issues. (Bug 3890)
     - GSM A RR sys info dissection problem. (Bug 3901)
     - GSM A RR inverts MEAS-VALID values. (Bug 3915)
     - PDML output leaks ~300 bytes / packet. (Bug 3913)
     - Incorrect station identifier parsing in Kingfisher dissector.
       (Bug 3946)
     - DHCPv6, Vendor-Specific Informantion, SubOption"Option
       Request" parser incorrect. (Bug 3987)
     - Wireshark could leak memory while analyzing SSL.
     - Wireshark could crash while updating menu items after reading
       a file in some cases.
     - The Mac OS X ChmodBPF script now works correctly under Snow
       Leopard.
   - Updated Protocol Support
     DCERPC, DHCPv6, DNS, E.212, GSM A RR, GTPv2, H.248, IEEE 802.11,
     IPMI, ISAKMP/IKE, ISUP, Kingfisher, LDAP, OpcUA, RTCP, SCTP, SIP,
     SSL, TCP, WBXML, ZRTP
   - Updated Capture File Support
     ERF

   To generate a diff of this commit:
   cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/wireshark/PLIST
   cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/wireshark/distinfo


(spz)
diff -r1.34.2.1 -r1.34.2.2 pkgsrc/net/wireshark/Makefile
diff -r1.13.2.1 -r1.13.2.2 pkgsrc/net/wireshark/PLIST
diff -r1.22.2.1 -r1.22.2.2 pkgsrc/net/wireshark/distinfo

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

--- pkgsrc/net/wireshark/Makefile 2009/07/22 06:56:55 1.34.2.1
+++ pkgsrc/net/wireshark/Makefile 2009/09/23 12:47:13 1.34.2.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.34.2.1 2009/07/22 06:56:55 spz Exp $ 1# $NetBSD: Makefile,v 1.34.2.2 2009/09/23 12:47:13 spz Exp $
2 2
3DISTNAME= wireshark-1.2.1 3DISTNAME= wireshark-1.2.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.13.2.1 -r1.13.2.2 pkgsrc/net/wireshark/PLIST (expand / switch to unified diff)

--- pkgsrc/net/wireshark/PLIST 2009/07/22 06:56:55 1.13.2.1
+++ pkgsrc/net/wireshark/PLIST 2009/09/23 12:47:13 1.13.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13.2.1 2009/07/22 06:56:55 spz Exp $ 1@comment $NetBSD: PLIST,v 1.13.2.2 2009/09/23 12:47:13 spz Exp $
2bin/capinfos 2bin/capinfos
3bin/dftest 3bin/dftest
4bin/dumpcap 4bin/dumpcap
5bin/editcap 5bin/editcap
6bin/idl2wrs 6bin/idl2wrs
7bin/mergecap 7bin/mergecap
8bin/randpkt 8bin/randpkt
9bin/rawshark 9bin/rawshark
10bin/text2pcap 10bin/text2pcap
11bin/tshark 11bin/tshark
12${PLIST.x11}bin/wireshark 12${PLIST.x11}bin/wireshark
13lib/libwireshark.la 13lib/libwireshark.la
14lib/libwiretap.la 14lib/libwiretap.la
@@ -44,26 +44,27 @@ man/man4/wireshark-filter.4 @@ -44,26 +44,27 @@ man/man4/wireshark-filter.4
44share/wireshark/AUTHORS-SHORT 44share/wireshark/AUTHORS-SHORT
45share/wireshark/COPYING 45share/wireshark/COPYING
46share/wireshark/capinfos.html 46share/wireshark/capinfos.html
47share/wireshark/cfilters 47share/wireshark/cfilters
48share/wireshark/colorfilters 48share/wireshark/colorfilters
49share/wireshark/dfilters 49share/wireshark/dfilters
50share/wireshark/diameter/Ericsson.xml 50share/wireshark/diameter/Ericsson.xml
51share/wireshark/diameter/TGPPGmb.xml 51share/wireshark/diameter/TGPPGmb.xml
52share/wireshark/diameter/TGPPRx.xml 52share/wireshark/diameter/TGPPRx.xml
53share/wireshark/diameter/TGPPSh.xml 53share/wireshark/diameter/TGPPSh.xml
54share/wireshark/diameter/chargecontrol.xml 54share/wireshark/diameter/chargecontrol.xml
55share/wireshark/diameter/dictionary.dtd 55share/wireshark/diameter/dictionary.dtd
56share/wireshark/diameter/dictionary.xml 56share/wireshark/diameter/dictionary.xml
 57share/wireshark/diameter/eap.xml
57share/wireshark/diameter/etsie2e4.xml 58share/wireshark/diameter/etsie2e4.xml
58share/wireshark/diameter/gqpolicy.xml 59share/wireshark/diameter/gqpolicy.xml
59share/wireshark/diameter/imscxdx.xml 60share/wireshark/diameter/imscxdx.xml
60share/wireshark/diameter/mobileipv4.xml 61share/wireshark/diameter/mobileipv4.xml
61share/wireshark/diameter/nasreq.xml 62share/wireshark/diameter/nasreq.xml
62share/wireshark/diameter/sip.xml 63share/wireshark/diameter/sip.xml
63share/wireshark/diameter/sunping.xml 64share/wireshark/diameter/sunping.xml
64share/wireshark/dtds/dc.dtd 65share/wireshark/dtds/dc.dtd
65share/wireshark/dtds/itunes.dtd 66share/wireshark/dtds/itunes.dtd
66share/wireshark/dtds/mscml.dtd 67share/wireshark/dtds/mscml.dtd
67share/wireshark/dtds/pocsettings.dtd 68share/wireshark/dtds/pocsettings.dtd
68share/wireshark/dtds/presence.dtd 69share/wireshark/dtds/presence.dtd
69share/wireshark/dtds/reginfo.dtd 70share/wireshark/dtds/reginfo.dtd

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

--- pkgsrc/net/wireshark/distinfo 2009/07/22 06:56:55 1.22.2.1
+++ pkgsrc/net/wireshark/distinfo 2009/09/23 12:47:13 1.22.2.2
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.22.2.1 2009/07/22 06:56:55 spz Exp $ 1$NetBSD: distinfo,v 1.22.2.2 2009/09/23 12:47:13 spz Exp $
2 2
3SHA1 (wireshark-1.2.1.tar.bz2) = ff565edd4b8c7b8d131060145dd35873c0dd8fa9 3SHA1 (wireshark-1.2.2.tar.bz2) = ad73bf93096344341cd7c99614816555bebdbf45
4RMD160 (wireshark-1.2.1.tar.bz2) = 335814f79b56805b2dc5c130b2b91ed9b33d1591 4RMD160 (wireshark-1.2.2.tar.bz2) = 6adbd80e3027a63b456b971edba0185411d30546
5Size (wireshark-1.2.1.tar.bz2) = 15129422 bytes 5Size (wireshark-1.2.2.tar.bz2) = 15186702 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) = fa293d23390d015d0863367033ab07a3472430de 9SHA1 (patch-ad) = fa293d23390d015d0863367033ab07a3472430de