Log message:
Pullup ticket #3316 - requested by tron
Security patch for wireshark

Revisions pulled up:
- pkgsrc/net/wireshark/Makefile			1.58
- pkgsrc/net/wireshark/distinfo			1.38
- pkgsrc/net/wireshark/patches/patch-SA42767	1.1

-------------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Tue Jan  4 15:39:34 UTC 2011

   Modified Files:
   	pkgsrc/net/wireshark: Makefile distinfo
   Added Files:
   	pkgsrc/net/wireshark/patches: patch-SA42767

   Log message:
   Add patch from the Wireshark SVN repository to fix the security
   vulnerability reported in SA42767 which affects the ENTTEC dissector.

Log message:
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