Update "wireshark" package to version 0.99.4.

Changes since version 0.99.3:
- Bug fixes
  o The HTTP dissector could crash. (Bugs 1050 and 1079)
    Versions affected: 0.99.3.
    CVE-2006-5468
  o The LDAP dissector (and possibly others) could crash. (Bug 1054)
    Versions affected: 0.99.3.
  o The XOT dissector could attempt to allocate a large amount of
    memory and crash. (Bug 1133)
    Versions affected: 0.9.8 to 0.99.3.
    CVE-2006-4805
  o The WBXML dissector could crash. (Bug 1134)
    Versions affected: 0.10.11 to 0.99.3.
    CVE-2006-5469
  o The MIME Multipart dissector was susceptible to an off-by-one
    error. (Bug 1135)
    Versions affected: 0.10.1 to 0.99.3.
    CVE-2006-4574
  o If AirPcap support was enabled, parsing a WEP key could
    sometimes cause a crash.
    Versions affected: 0.99.3.
  o The file set dialog could grow excessively large. (Bug 331)
  o Trying to save flow data may crash Wireshark. (Bug 396)
  o The personal hosts configuration file wasn't being parsed
    correctly. (Bug 795)
  o "Save as" to an existing file wasn't allowed. (Bug 927)
  o The SNMP dissector was not handling 64-bit counters properly.
    (Bug 1047)
  o The HTTP content-length field was a string instead of an
    integer. (Bug 1109)
  o Invalid characters could show up in PDML output. (Bug 1110)
- New and Updated Features
     o AirPcap, support (which provides raw mode capture under
       Windows) has been enhanced to allow capturing on multiple
       AirPcap adapters simultaneously using the Multi-Channel
       Aggregator.
     o VoIP call playback has been enhanced. If Wireshark is linked
       with the PortAudio library, you can play back G.711
       conversations.
     o The capture interface dialog display has been enhanced.
     o The "Save" button has been removed from the "Ok" / "Apply" /
       "Cancel" button group in the following dialogs:
          o Edit/Preferences
          o View/Coloring Rules
          o Capture/Capture Filters
          o Analyze/Display Filters
          o Analyze/Enabled Protocols
       If you're fond of the "Save" button it can be resurrected in
       the User Interface preferences.
     o Expert analysis has been improved.
     o Wireshark now supports USB as a media type. If you're running
       a Linux distribution with version 2.6.11 of the kernel or
       greater and you have the usbmon module enabled and you have a
       recent CVS version of libpcap (post-0.9.5) installed you can
       also do live captures. More details can be found at the
       USB capture setup page on the wiki.
     o The number of WEP keys that the user can specify in the IEEE
       802.11 protocol preferences has been increased from 4 to 64.
- New Protocol Support
   Enea LINX, Ethernet Powerlink (v1 and v2), H.248 Q.1950 Annex A,
   Linux pktgen, MP2T, NEWMAIL, PNG, SCSI OSD, UDLD, UMTS FP, USB,
   WLCCP, WZCSVC
- Updated Protocol Support
   3Com NJACK, 802.11, ACSE, AH, ALCAP, ANSI MAP, ATM, ASN.1, BACapp,
   BER, BGP, BSSAP, Camel, Catapult DCT2000, CFlow, CLNP, Common
   Windows networking, DAP, DCERPC (DCERPC, ATSVC, DFS, EFS, EPM,
   EVENTLOG, INITSHUTDOWN, MAPI, NT, PIPE, SAMR, SPOOLSS, SRVSVC,
   SVCCTL, WINREG), DCOM (DCOM, CBA-ACCO, SYSACT), DIAMETER, DISP,
   DNS, DOP, DSP, ESP, Ethernet, FC, FCP, GSM A, GSM MAP, GSM SMS,
   GSSAPI, GTP, H.225, H.245, H.248, HTTP, ICQ, IKE, ISAKMP, iSCSI,
   ISUP, IUUP, Kerberos 4, LAP-D, LDAP, LLC, LogotypeCertExtn,
   MEGACO, MIME Multipart, MIP6, MMS, MSRP, MTP3, NCP, NDMP, NDPS,
   NFS, NTP, OSI, PER, PN-MRP, PPP, 19154Q.931, RADIUS, Redback, RPC,
   RTCP, RTP, SCCP, SCSI, SDP, SIP, SMB, SMRSE, SNMP, SSL, STANAG
   5066, STP, TCAP, TCP, TFTP, TIPC, UDP, UMA, VLAN, VNC, VRRP,
   X.509ce X11, YMSG, WTLS
- Removed Protocols
   The CISCOWL dissector has been superseded by WLCCP.
- New and Updated Capture File Support
   Catapult DCT2000, EyeSDN, iSeries

4 files changed, 21 insertions, 23 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 8ba64ada019..201c59ceb8e 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/09/01 19:53:47 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2006/11/01 12:59:42 tron Exp $
 
-DISTNAME=		wireshark-0.99.3
-PKGREVISION=		1
+DISTNAME=		wireshark-0.99.4
 CATEGORIES=		net
 MASTER_SITES=		http://www.wireshark.org/download/src/ \
 			${MASTER_SITE_SOURCEFORGE:=wireshark/}
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index 1524f93a2fd..8ef09c511e4 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/08/24 10:48:59 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/11/01 12:59:42 tron Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -31,7 +31,6 @@ lib/wireshark/plugins/${PKGVERSION}/opsi.la
 lib/wireshark/plugins/${PKGVERSION}/parlay.la
 lib/wireshark/plugins/${PKGVERSION}/pcli.la
 lib/wireshark/plugins/${PKGVERSION}/profinet.la
-lib/wireshark/plugins/${PKGVERSION}/rdm.la
 lib/wireshark/plugins/${PKGVERSION}/rlm.la
 lib/wireshark/plugins/${PKGVERSION}/rtnet.la
 lib/wireshark/plugins/${PKGVERSION}/rudp.la
@@ -49,6 +48,7 @@ man/man1/tshark.1
 man/man1/wireshark.1
 man/man4/wireshark-filter.4
 share/wireshark/AUTHORS-SHORT
+share/wireshark/COPYING
 share/wireshark/capinfos.html
 share/wireshark/cfilters
 share/wireshark/colorfilters
@@ -66,6 +66,7 @@ share/wireshark/dtds/itunes.dtd
 share/wireshark/dtds/pocsettings.dtd
 share/wireshark/dtds/presence.dtd
 share/wireshark/dtds/reginfo.dtd
+share/wireshark/dtds/rlmi.dtd
 share/wireshark/dtds/rss.dtd
 share/wireshark/dtds/smil.dtd
 share/wireshark/dtds/watcherinfo.dtd
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index e8324f077ea..f2ab6699bb1 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/08/24 10:48:59 tron Exp $
+$NetBSD: distinfo,v 1.4 2006/11/01 12:59:42 tron Exp $
 
-SHA1 (wireshark-0.99.3.tar.bz2) = e037c64ef95153fe06c0439ee5d0f54de4d12d78
-RMD160 (wireshark-0.99.3.tar.bz2) = 60a094b6b2c8d3d289cb7cbc1c01b84d378f9443
-Size (wireshark-0.99.3.tar.bz2) = 10036646 bytes
-SHA1 (patch-aa) = 358b0b7615b72da15452a51f90d3886a2ce1b0b5
+SHA1 (wireshark-0.99.4.tar.bz2) = 696216d794b418da3cb0a1829281ef65bf3e64ff
+RMD160 (wireshark-0.99.4.tar.bz2) = 6bf940af951ddfcf66157a8cb299e6342dd3f955
+Size (wireshark-0.99.4.tar.bz2) = 10472441 bytes
+SHA1 (patch-aa) = b7fe7dac7bf4cf663f59cf0f5ae69bb8fdaf088f
diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa
index 67e2b0d4521..535dba276c5 100644
--- a/net/wireshark/patches/patch-aa
+++ b/net/wireshark/patches/patch-aa
@@ -1,22 +1,20 @@
-$NetBSD: patch-aa,v 1.3 2006/08/24 10:48:59 tron Exp $
+$NetBSD: patch-aa,v 1.4 2006/11/01 12:59:42 tron Exp $
 
---- epan/dissectors/packet-radiotap.c.orig	2006-08-23 23:26:24.000000000 +0100
-+++ epan/dissectors/packet-radiotap.c	2006-08-24 10:19:28.000000000 +0100
-@@ -397,7 +397,12 @@
+--- epan/dissectors/packet-radiotap.c.orig	2006-10-31 17:59:09.000000000 +0000
++++ epan/dissectors/packet-radiotap.c	2006-11-01 11:44:20.000000000 +0000
+@@ -531,6 +531,11 @@
      guint8 db, rflags;
      guint32 present, next_present;
      int bit;
--	gboolean has_fcs = FALSE;
-+    gboolean has_fcs = FALSE;
 +    gint8 align;
 +#define RTALIGN(size) \
-+      align = ((offset + ((size) - 1)) & ~((size) - 1)) - offset; \
-+      offset += align; \
-+      length_remaining -= align
++	align = ((offset + ((size) - 1)) & ~((size) - 1)) - offset; \
++	offset += align; \
++	length_remaining -= align
  
      if(check_col(pinfo->cinfo, COL_PROTOCOL))
  	col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN");
-@@ -569,6 +574,7 @@
+@@ -745,6 +750,7 @@
  	    length_remaining--;
  	    break;
  	case IEEE80211_RADIOTAP_CHANNEL:
@@ -24,7 +22,7 @@ $NetBSD: patch-aa,v 1.3 2006/08/24 10:48:59 tron Exp $
  	    if (length_remaining < 4)
  		break;
  	    if (tree) {
-@@ -586,6 +592,7 @@
+@@ -762,6 +768,7 @@
  	case IEEE80211_RADIOTAP_FHSS:
  	case IEEE80211_RADIOTAP_TX_ATTENUATION:
  	case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
@@ -32,7 +30,7 @@ $NetBSD: patch-aa,v 1.3 2006/08/24 10:48:59 tron Exp $
  	    if (length_remaining < 2)
  		break;
  #if 0
-@@ -595,6 +602,9 @@
+@@ -771,6 +778,9 @@
  	    length_remaining-=2;
  	    break;
  	case IEEE80211_RADIOTAP_TSFT:
@@ -42,7 +40,7 @@ $NetBSD: patch-aa,v 1.3 2006/08/24 10:48:59 tron Exp $
  	    if (length_remaining < 8)
  		break;
  	    if (tree) {
-@@ -605,6 +615,7 @@
+@@ -781,6 +791,7 @@
  	    length_remaining-=8;
  	    break;
  	case IEEE80211_RADIOTAP_LOCK_QUALITY: