Pullup ticket 2248 - requested by tron

security update for wireshark

- pkgsrc/net/wireshark/Makefile				1.13
- pkgsrc/net/wireshark/PLIST				1.7
- pkgsrc/net/wireshark/distinfo				1.9

   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Sat Dec 15 13:53:27 UTC 2007

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

   Log Message:
   Update "wireshark" package to version 0.99.7pre2. Changes since
   version 0.99.6:
   - Fixes for the security problems reported in "wnpa-sec-2007-03"
   - Most of the capture code has been moved out of the GUI, which means
     that Wireshark no longer needs to be run as root.
   - Many display filter names have been cleaned up. If your favorite
     display filter just went missing, please consult the display filter
     reference to find out where it ended up.
   - You can now filter directly on SNMP OIDs.
   - IO graphs have more display options, and you can now export graphs.
   - You can now follow UDP streams in addition to TCP and SSL streams.
   - You can now disable coloring rules without deleting them.
   - Main window toolbar buttons are now available even when the window is
     small.
   - Optimizations have been applied in some places to make Wireshark start up
     and run faster.
   - New Protocol Support
     ANSI TCAP, application/xcap-error (MIME type), CFM, DPNSS, EtherCAT,
     ETSI e2/e4, H.282, H.460, H.501, IEEE 802.1ad and 802.1ah,
     IMF (RFC 2822), RSL, SABP, T.125, TNEF, TPNCP, UNISTIM, Wake on LAN,
     WiMAX ASN Control Plane, X.224
   - Updated Protocol Support
     3Com XNS, 3G A11, ACN, ACP123, ACSE, AIM, ANSI IS-637-A, ANSI MAP,
     Armagetronad, BACapp, BACnet, BER, BFD, BGP, Bluetooth, CAMEL, CDT,
     CFM, CIP, Cisco ERSPAN, CLNP, CMIP, CMS, COPS, CTDB, DCCP, DCERPC
     ATSVC, DCERPC PNIO, DCERPC SAMR, DCERPC, DCOM CBA-ACCO, DCP ETSI,
     DEC DNA, DFS, DHCP/BOOTP, DHCPv6, DIAMETER, DISP, DMP, DNP, DNS,
     DOP, DTLS, DUA, eDonkey, ELSM, ESL, Ethernet, FC ELS, FC, FCOE,
     FTAM, FTP, GDSDB, GIOP, GPRS-LLC, GSM A, GSM MAP, GTP, HSRP, HTTP,
     IAX2, ICMPv6, IEEE 802.11, INAP, IP, IPMI, IPv6, ISAKMP, ISIS, iSNS,
     ISUP, IUUP, JXTA, K12, Kerberos, L2TP, LAPD, LDAP, LINX, LPD, LWAPP,
     MEGACO, MIKEY, MIME Multipart, MMS, MP2T, MPEG PES, MPEG, MTP2,
     MySQL, NBAP, NetFlow, nettl, NFS, NSIP, OSPF, P_MUL, PANA, PER,
     PKCS#12, PMIPv6, PN-PTCP, PN-RT, PPI, PPPoE, PRES, PROFINET, PTP,
     Q.932 ROS, Q.932, QSIG, Radiotap, RADIUS, RANAP, RNSAP, ROS, RTCP,
     RTP, RTSE, RTSP, SCCP, SCTP, SDP, SIGCOMP, SIP, Slow Protocols, SMB,
     SMPP, SMTP, SNDCP, SNMP, SRP, SSL, STANAG 4406, STUN2, TCAP, TCP,
     text/media, TIPC, ULP, UMA, UMTS FP, V5UA, VNC, WiMAX M2M, WiMAX,
     WLCCP, X.411, X.420, X.509 SAT, XML
   - New and Updated Capture File Support
     Catapult DCT 2000, Endace ERF, Juniper NetScreen snoop, Visual Networks,
     Windows Sniffer (NetXRay)

3 files changed, 24 insertions, 12 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 7bb825769df..133c65f0ab3 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2007/10/08 12:44:33 ghen Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2007/12/17 16:27:26 ghen Exp $
 
-DISTNAME=		wireshark-0.99.6
+DISTNAME=		wireshark-0.99.7pre2
 CATEGORIES=		net
-MASTER_SITES=		http://www.wireshark.org/download/src/ \
-			${MASTER_SITE_SOURCEFORGE:=wireshark/}
-EXTRACT_SUFX=		.tar.bz2
+#MASTER_SITES=		http://www.wireshark.org/download/src/ \
+#			${MASTER_SITE_SOURCEFORGE:=wireshark/}
+MASTER_SITES=		http://www.wireshark.org/download/prerelease/
+#EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tron@NetBSD.org
 HOMEPAGE=		http://www.wireshark.org/
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index 218776b32c5..96974cd3c23 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/07/06 17:58:09 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2007/12/17 16:27:26 ghen Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -19,13 +19,12 @@ lib/wireshark/plugins/${PKGVERSION}/coseventcomm.la
 lib/wireshark/plugins/${PKGVERSION}/cosnaming.la
 lib/wireshark/plugins/${PKGVERSION}/docsis.la
 lib/wireshark/plugins/${PKGVERSION}/enttec.la
+lib/wireshark/plugins/${PKGVERSION}/ethercat.la
 lib/wireshark/plugins/${PKGVERSION}/gryphon.la
-lib/wireshark/plugins/${PKGVERSION}/h223.la
 lib/wireshark/plugins/${PKGVERSION}/irda.la
 lib/wireshark/plugins/${PKGVERSION}/lwres.la
 lib/wireshark/plugins/${PKGVERSION}/m2m.la
 lib/wireshark/plugins/${PKGVERSION}/mate.la
-lib/wireshark/plugins/${PKGVERSION}/mgcp.la
 lib/wireshark/plugins/${PKGVERSION}/opcua.la
 lib/wireshark/plugins/${PKGVERSION}/opsi.la
 lib/wireshark/plugins/${PKGVERSION}/parlay.la
@@ -37,8 +36,10 @@ lib/wireshark/plugins/${PKGVERSION}/rudp.la
 lib/wireshark/plugins/${PKGVERSION}/sbus.la
 lib/wireshark/plugins/${PKGVERSION}/stats_tree.la
 lib/wireshark/plugins/${PKGVERSION}/tango.la
+lib/wireshark/plugins/${PKGVERSION}/unistim.la
 lib/wireshark/plugins/${PKGVERSION}/v5ua.la
 lib/wireshark/plugins/${PKGVERSION}/wimax.la
+lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la
 man/man1/capinfos.1
 man/man1/dumpcap.1
 man/man1/editcap.1
@@ -64,6 +65,8 @@ share/wireshark/diameter/mobileipv4.xml
 share/wireshark/diameter/nasreq.xml
 share/wireshark/diameter/sip.xml
 share/wireshark/diameter/sunping.xml
+share/wireshark/diameter/Ericsson.xml
+share/wireshark/diameter/etsie2e4.xml
 share/wireshark/dtds/dc.dtd
 share/wireshark/dtds/itunes.dtd
 share/wireshark/dtds/mscml.dtd
@@ -75,6 +78,7 @@ share/wireshark/dtds/rss.dtd
 share/wireshark/dtds/smil.dtd
 share/wireshark/dtds/watcherinfo.dtd
 share/wireshark/dtds/xcap-caps.dtd
+share/wireshark/dtds/xcap-error.dtd
 share/wireshark/dumpcap.html
 share/wireshark/editcap.html
 share/wireshark/help/capture_filters.txt
@@ -149,10 +153,17 @@ share/wireshark/radius/dictionary.valemount
 share/wireshark/radius/dictionary.versanet
 share/wireshark/radius/dictionary.wispr
 share/wireshark/radius/dictionary.xedia
+share/wireshark/services
+share/wireshark/smi_modules
 share/wireshark/text2pcap.html
+share/wireshark/tpncp/tpncp.dat
 share/wireshark/tshark.html
 share/wireshark/wireshark-filter.html
 share/wireshark/wireshark.html
+share/wireshark/wimaxasncp/dictionary.dtd
+share/wireshark/wimaxasncp/dictionary.xml
+@dirrm share/wireshark/wimaxasncp
+@dirrm share/wireshark/tpncp
 @dirrm share/wireshark/radius
 @dirrm share/wireshark/help
 @dirrm share/wireshark/dtds
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index baeb9f24b7b..31daec847e1 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2007/07/06 17:58:09 drochner Exp $
+$NetBSD: distinfo,v 1.8.2.1 2007/12/17 16:27:26 ghen Exp $
 
-SHA1 (wireshark-0.99.6.tar.bz2) = 91f57158a75adca36c79c35525eb3cf57b927075
-RMD160 (wireshark-0.99.6.tar.bz2) = 7c69e71e54d521d942bcbad9894547d9785f0948
-Size (wireshark-0.99.6.tar.bz2) = 11826043 bytes
+SHA1 (wireshark-0.99.7pre2.tar.gz) = 009906e9b0b93e7b3837850dbc999f9c8b222181
+RMD160 (wireshark-0.99.7pre2.tar.gz) = a3b759c830a0e6e5ae5a85342d895f76e5a2901b
+Size (wireshark-0.99.7pre2.tar.gz) = 16697044 bytes
 SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c